Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate to nx 16 #3465

Merged
merged 2 commits into from
Oct 5, 2023
Merged

migrate to nx 16 #3465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82e8a88
migrate to nx 16
DenysVuika Oct 5, 2023
8c77200
lock file
DenysVuika Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
191 changes: 90 additions & 101 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"plugins": ["@nrwl/nx"],
"ignorePatterns": ["projects/**/*"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts"],
Expand All @@ -15,17 +13,11 @@
}
},
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"parserOptions": {
"createDefaultProgram": true
},
"extends": [
"plugin:@nrwl/nx/typescript",
"plugin:@nrwl/nx/angular",
"plugin:@cspell/recommended"
],
"extends": ["plugin:@nx/typescript", "plugin:@nx/angular", "plugin:@cspell/recommended"],
"plugins": [
"rxjs",
"unicorn",
Expand All @@ -42,13 +34,34 @@
"rules": {
"ban/ban": [
"error",
{ "name": "eval", "message": "Calls to eval is not allowed." },
{ "name": "fdescribe", "message": "Calls to fdescribe is not allowed" },
{ "name": "fit", "message": "Calls to fit is not allowed" },
{ "name": "xit", "message": "Calls to xit is not allowed" },
{ "name": "xdescribe", "message": "Calls to xdescribe is not allowed" },
{ "name": ["test", "only"], "message": "Calls to test.only is not allowed" },
{ "name": ["describe", "only"], "message": "Calls to describe.only is not allowed" }
{
"name": "eval",
"message": "Calls to eval is not allowed."
},
{
"name": "fdescribe",
"message": "Calls to fdescribe is not allowed"
},
{
"name": "fit",
"message": "Calls to fit is not allowed"
},
{
"name": "xit",
"message": "Calls to xit is not allowed"
},
{
"name": "xdescribe",
"message": "Calls to xdescribe is not allowed"
},
{
"name": ["test", "only"],
"message": "Calls to test.only is not allowed"
},
{
"name": ["describe", "only"],
"message": "Calls to describe.only is not allowed"
}
],
"license-header/header": [
"error",
Expand Down Expand Up @@ -85,11 +98,7 @@
"error",
{
"type": "element",
"prefix": [
"app",
"aca",
"adf"
],
"prefix": ["app", "aca", "adf"],
"style": "kebab-case"
}
],
Expand Down Expand Up @@ -154,35 +163,30 @@
"error",
{
"selector": "enum",
"format": [
"PascalCase"
]
"format": ["PascalCase"]
}
],
"@typescript-eslint/no-inferrable-types": [
"error",
{
"ignoreParameters": true
"ignoreParameters": true
}
],
"@typescript-eslint/quotes": [
"error",
"single",
{
"avoidEscape": true,
"allowTemplateLiterals": true
"avoidEscape": true,
"allowTemplateLiterals": true
}
],
"@typescript-eslint/type-annotation-spacing": "error",
"arrow-parents": [
"off",
"always"
],
"arrow-parents": ["off", "always"],
"brace-style": [
"error",
"1tbs",
{
"allowSingleLine": true
"allowSingleLine": true
}
],
"constructor-super": "error",
Expand All @@ -202,10 +206,10 @@
"prefer-spread": "error",
"import/order": "off",
"max-len": [
"error",
{
"code": 180
}
"error",
{
"code": 180
}
],
"no-duplicate-imports": "error",
"no-extra-semi": "off",
Expand All @@ -223,29 +227,29 @@
"no-global-assign": "error",
"no-cond-assign": "error",
"no-console": [
"error",
{
"allow": [
"warn",
"dir",
"timeLog",
"assert",
"clear",
"count",
"countReset",
"group",
"groupEnd",
"table",
"dirxml",
"error",
"groupCollapsed",
"Console",
"profile",
"profileEnd",
"timeStamp",
"context"
]
}
"error",
{
"allow": [
"warn",
"dir",
"timeLog",
"assert",
"clear",
"count",
"countReset",
"group",
"groupEnd",
"table",
"dirxml",
"error",
"groupCollapsed",
"Console",
"profile",
"profileEnd",
"timeStamp",
"context"
]
}
],
"no-case-declarations": "error",
"no-debugger": "error",
Expand Down Expand Up @@ -274,56 +278,41 @@
"rxjs/ban-operators": "error",
"rxjs/no-ignored-subscribe": "error",
"rxjs/no-unsafe-catch": [
"error",
{
"observable": "action(s|\\$)?"
}
"error",
{
"observable": "action(s|\\$)?"
}
],
"rxjs/no-unsafe-switchmap": [
"error",
{
"disallow": [
"add",
"create",
"delete",
"post",
"put",
"remove",
"set",
"update"
],
"observable": "action(s|\\$)?"
}
"error",
{
"disallow": ["add", "create", "delete", "post", "put", "remove", "set", "update"],
"observable": "action(s|\\$)?"
}
],
"semi": "error",
"use-isnan": "error",

"spaced-comment": [
"error",
"always",
{
"markers": ["/"],
"exceptions": ["!", "*"]
}
"error",
"always",
{
"markers": ["/"],
"exceptions": ["!", "*"]
}
],
"space-before-function-paren": "off",
"space-in-parens": [
"off",
"never"
],
"space-in-parens": ["off", "never"],
"unicorn/filename-case": "error"
}
},
{
"files": ["*.js"],
"extends": ["plugin:@nrwl/nx/javascript"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
},
{
"files": [
"*.html"
],
"extends": ["plugin:@nrwl/nx/angular-template", "plugin:@angular-eslint/template/accessibility"],
"files": ["*.html"],
"extends": ["plugin:@nx/angular-template", "plugin:@angular-eslint/template/accessibility"],
"parser": "@angular-eslint/template-parser",
"rules": {
"@angular-eslint/template/no-negated-async": "off",
Expand All @@ -333,11 +322,11 @@
}
},
{
"files": ["*.spec.ts", "*.test.ts"],
"rules": {
"@typescript-eslint/no-floating-promises": "off",
"max-lines": "off"
}
"files": ["*.spec.ts", "*.test.ts"],
"rules": {
"@typescript-eslint/no-floating-promises": "off",
"max-lines": "off"
}
}
]
}
16 changes: 4 additions & 12 deletions app/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
{
"extends": "../.eslintrc.json",
"ignorePatterns": [
"!**/*"
],
"ignorePatterns": ["!**/*"],
"overrides": [
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"parserOptions": {
"project": [
"app/tsconfig.app.json",
"app/tsconfig.spec.json"
],
"project": ["app/tsconfig.app.json", "app/tsconfig.spec.json"],
"createDefaultProgram": true
},
"rules": {
}
"rules": {}
}
]
}
24 changes: 5 additions & 19 deletions app/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "../node_modules/nx/schemas/project-schema.json",
"name": "content-ce",
"$schema": "../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "app/src",
"projectType": "application",
"targets": {
Expand All @@ -12,17 +12,9 @@
"main": "app/src/main.ts",
"tsConfig": "app/tsconfig.app.json",
"polyfills": "app/src/polyfills.ts",
"allowedCommonJsDependencies": [
"moment-es6",
"minimatch",
"moment",
"cropperjs"
],
"allowedCommonJsDependencies": ["moment-es6", "minimatch", "moment", "cropperjs"],
"stylePreprocessorOptions": {
"includePaths": [
"projects/aca-content/src/lib/ui",
"node_modules"
]
"includePaths": ["projects/aca-content/src/lib/ui", "node_modules"]
},
"assets": [
{
Expand Down Expand Up @@ -99,11 +91,7 @@
"projects/aca-content/src/lib/ui/application.scss",
"app/src/styles.scss"
],
"scripts": [
"node_modules/pdfjs-dist/build/pdf.js",
"node_modules/pdfjs-dist/web/pdf_viewer.js",
"node_modules/moment/min/moment.min.js"
],
"scripts": ["node_modules/pdfjs-dist/build/pdf.js", "node_modules/pdfjs-dist/web/pdf_viewer.js", "node_modules/moment/min/moment.min.js"],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
Expand Down Expand Up @@ -195,9 +183,7 @@
}
},
"defaultConfiguration": "",
"outputs": [
"{options.outputPath}"
]
"outputs": ["{options.outputPath}"]
},
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
Expand Down
6 changes: 2 additions & 4 deletions e2e/playwright/actions/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"name": "actions-e2e",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "e2e/playwright/actions/src",
"projectType": "application",
"targets": {
"e2e": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx playwright test --config=e2e/playwright/actions/playwright.config.ts"
]
"commands": ["npx playwright test --config=e2e/playwright/actions/playwright.config.ts"]
},
"configurations": {
"production": {
Expand Down
Loading
Loading