inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-19 17:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

migrate to nx 16 (#3465)

Browse Source 
* migrate to nx 16

* lock file
This commit is contained in:
Denys Vuika 2023-10-05 17:12:54 +01:00 committed by GitHub
parent f2d09e8b1a
commit 18542ebf8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 4079 additions and 3864 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
.eslintrc.json
View File

@ -1,9 +1,7 @@
{ {
"root": true, "root": true,
"ignorePatterns": [ "ignorePatterns": ["projects/**/*"],
"projects/**/*" "plugins": ["@nx"],
],
"plugins": ["@nrwl/nx"],
"overrides": [ "overrides": [
{ {
"files": ["*.ts"], "files": ["*.ts"],
@ -15,17 +13,11 @@
} }
}, },
{ {
"files": [ "files": ["*.ts"],
"*.ts"
],
"parserOptions": { "parserOptions": {
"createDefaultProgram": true "createDefaultProgram": true
}, },
"extends": [ "extends": ["plugin:@nx/typescript", "plugin:@nx/angular", "plugin:@cspell/recommended"],
"plugin:@nrwl/nx/typescript",
"plugin:@nrwl/nx/angular",
"plugin:@cspell/recommended"
],
"plugins": [ "plugins": [
"rxjs", "rxjs",
"unicorn", "unicorn",
@ -42,13 +34,34 @@
"rules": { "rules": {
"ban/ban": [ "ban/ban": [
"error", "error",
{ "name": "eval", "message": "Calls to eval is not allowed." }, {
{ "name": "fdescribe", "message": "Calls to fdescribe is not allowed" }, "name": "eval",
{ "name": "fit", "message": "Calls to fit is not allowed" }, "message": "Calls to eval 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": "fdescribe",
{ "name": ["describe", "only"], "message": "Calls to describe.only is not allowed" } "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": [ "license-header/header": [
"error", "error",
@ -85,11 +98,7 @@
"error", "error",
{ {
"type": "element", "type": "element",
"prefix": [ "prefix": ["app", "aca", "adf"],
"app",
"aca",
"adf"
],
"style": "kebab-case" "style": "kebab-case"
} }
], ],
@ -154,9 +163,7 @@
"error", "error",
{ {
"selector": "enum", "selector": "enum",
"format": [ "format": ["PascalCase"]
"PascalCase"
]
} }
], ],
"@typescript-eslint/no-inferrable-types": [ "@typescript-eslint/no-inferrable-types": [
@ -174,10 +181,7 @@
} }
], ],
"@typescript-eslint/type-annotation-spacing": "error", "@typescript-eslint/type-annotation-spacing": "error",
"arrow-parents": [ "arrow-parents": ["off", "always"],
"off",
"always"
],
"brace-style": [ "brace-style": [
"error", "error",
"1tbs", "1tbs",
@ -282,22 +286,12 @@
"rxjs/no-unsafe-switchmap": [ "rxjs/no-unsafe-switchmap": [
"error", "error",
{ {
"disallow": [ "disallow": ["add", "create", "delete", "post", "put", "remove", "set", "update"],
"add",
"create",
"delete",
"post",
"put",
"remove",
"set",
"update"
],
"observable": "action(s|\\$)?" "observable": "action(s|\\$)?"
} }
], ],
"semi": "error", "semi": "error",
"use-isnan": "error", "use-isnan": "error",
"spaced-comment": [ "spaced-comment": [
"error", "error",
"always", "always",
@ -307,23 +301,18 @@
} }
], ],
"space-before-function-paren": "off", "space-before-function-paren": "off",
"space-in-parens": [ "space-in-parens": ["off", "never"],
"off",
"never"
],
"unicorn/filename-case": "error" "unicorn/filename-case": "error"
} }
}, },
{ {
"files": ["*.js"], "files": ["*.js"],
"extends": ["plugin:@nrwl/nx/javascript"], "extends": ["plugin:@nx/javascript"],
"rules": {} "rules": {}
}, },
{ {
"files": [ "files": ["*.html"],
"*.html" "extends": ["plugin:@nx/angular-template", "plugin:@angular-eslint/template/accessibility"],
],
"extends": ["plugin:@nrwl/nx/angular-template", "plugin:@angular-eslint/template/accessibility"],
"parser": "@angular-eslint/template-parser", "parser": "@angular-eslint/template-parser",
"rules": { "rules": {
"@angular-eslint/template/no-negated-async": "off", "@angular-eslint/template/no-negated-async": "off",

16
app/.eslintrc.json
View File

@ -1,22 +1,14 @@
{ {
"extends": "../.eslintrc.json", "extends": "../.eslintrc.json",
"ignorePatterns": [ "ignorePatterns": ["!**/*"],
"!**/*"
],
"overrides": [ "overrides": [
{ {
"files": [ "files": ["*.ts"],
"*.ts"
],
"parserOptions": { "parserOptions": {
"project": [ "project": ["app/tsconfig.app.json", "app/tsconfig.spec.json"],
"app/tsconfig.app.json",
"app/tsconfig.spec.json"
],
"createDefaultProgram": true "createDefaultProgram": true
}, },
"rules": { "rules": {}
}
} }
] ]
} }

24
app/project.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "../node_modules/nx/schemas/project-schema.json",
"name": "content-ce", "name": "content-ce",
"$schema": "../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "app/src", "sourceRoot": "app/src",
"projectType": "application", "projectType": "application",
"targets": { "targets": {
@ -12,17 +12,9 @@
"main": "app/src/main.ts", "main": "app/src/main.ts",
"tsConfig": "app/tsconfig.app.json", "tsConfig": "app/tsconfig.app.json",
"polyfills": "app/src/polyfills.ts", "polyfills": "app/src/polyfills.ts",
"allowedCommonJsDependencies": [ "allowedCommonJsDependencies": ["moment-es6", "minimatch", "moment", "cropperjs"],
"moment-es6",
"minimatch",
"moment",
"cropperjs"
],
"stylePreprocessorOptions": { "stylePreprocessorOptions": {
"includePaths": [ "includePaths": ["projects/aca-content/src/lib/ui", "node_modules"]
"projects/aca-content/src/lib/ui",
"node_modules"
]
}, },
"assets": [ "assets": [
{ {
@ -99,11 +91,7 @@
"projects/aca-content/src/lib/ui/application.scss", "projects/aca-content/src/lib/ui/application.scss",
"app/src/styles.scss" "app/src/styles.scss"
], ],
"scripts": [ "scripts": ["node_modules/pdfjs-dist/build/pdf.js", "node_modules/pdfjs-dist/web/pdf_viewer.js", "node_modules/moment/min/moment.min.js"],
"node_modules/pdfjs-dist/build/pdf.js",
"node_modules/pdfjs-dist/web/pdf_viewer.js",
"node_modules/moment/min/moment.min.js"
],
"vendorChunk": true, "vendorChunk": true,
"extractLicenses": false, "extractLicenses": false,
"buildOptimizer": false, "buildOptimizer": false,
@ -195,9 +183,7 @@
} }
}, },
"defaultConfiguration": "", "defaultConfiguration": "",
"outputs": [ "outputs": ["{options.outputPath}"]
"{options.outputPath}"
]
}, },
"serve": { "serve": {
"executor": "@angular-devkit/build-angular:dev-server", "executor": "@angular-devkit/build-angular:dev-server",

6
e2e/playwright/actions/project.json
View File

@ -1,15 +1,13 @@
{ {
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"name": "actions-e2e", "name": "actions-e2e",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "e2e/playwright/actions/src", "sourceRoot": "e2e/playwright/actions/src",
"projectType": "application", "projectType": "application",
"targets": { "targets": {
"e2e": { "e2e": {
"executor": "nx:run-commands", "executor": "nx:run-commands",
"options": { "options": {
"commands": [ "commands": ["npx playwright test --config=e2e/playwright/actions/playwright.config.ts"]
"npx playwright test --config=e2e/playwright/actions/playwright.config.ts"
]
}, },
"configurations": { "configurations": {
"production": { "production": {

6
e2e/playwright/authentication/project.json
View File

@ -1,15 +1,13 @@
{ {
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"name": "authentication-e2e", "name": "authentication-e2e",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "e2e/playwright/authentication/src", "sourceRoot": "e2e/playwright/authentication/src",
"projectType": "application", "projectType": "application",
"targets": { "targets": {
"e2e": { "e2e": {
"executor": "nx:run-commands", "executor": "nx:run-commands",
"options": { "options": {
"commands": [ "commands": ["npx playwright test --config=e2e/playwright/authentication/playwright.config.ts"]
"npx playwright test --config=e2e/playwright/authentication/playwright.config.ts"
]
}, },
"configurations": { "configurations": {
"production": { "production": {

6
e2e/playwright/folder-rules/project.json
View File

@ -1,15 +1,13 @@
{ {
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"name": "folder-rules-e2e", "name": "folder-rules-e2e",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "e2e/playwright/folder-rules/src", "sourceRoot": "e2e/playwright/folder-rules/src",
"projectType": "application", "projectType": "application",
"targets": { "targets": {
"e2e": { "e2e": {
"executor": "nx:run-commands", "executor": "nx:run-commands",
"options": { "options": {
"commands": [ "commands": ["npx playwright test --config=e2e/playwright/folder-rules/playwright.config.ts"]
"npx playwright test --config=e2e/playwright/folder-rules/playwright.config.ts"
]
}, },
"configurations": { "configurations": {
"production": { "production": {

6
e2e/playwright/navigation/project.json
View File

@ -1,15 +1,13 @@
{ {
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"name": "navigation-e2e", "name": "navigation-e2e",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "e2e/playwright/navigation/src", "sourceRoot": "e2e/playwright/navigation/src",
"projectType": "application", "projectType": "application",
"targets": { "targets": {
"e2e": { "e2e": {
"executor": "nx:run-commands", "executor": "nx:run-commands",
"options": { "options": {
"commands": [ "commands": ["npx playwright test --config=e2e/playwright/navigation/playwright.config.ts"]
"npx playwright test --config=e2e/playwright/navigation/playwright.config.ts"
]
}, },
"configurations": { "configurations": {
"production": { "production": {

6
e2e/playwright/viewer/project.json
View File

@ -1,15 +1,13 @@
{ {
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"name": "viewer-e2e", "name": "viewer-e2e",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "e2e/playwright/viewer/src", "sourceRoot": "e2e/playwright/viewer/src",
"projectType": "application", "projectType": "application",
"targets": { "targets": {
"e2e": { "e2e": {
"executor": "nx:run-commands", "executor": "nx:run-commands",
"options": { "options": {
"commands": [ "commands": ["npx playwright test --config=e2e/playwright/viewer/playwright.config.ts"]
"npx playwright test --config=e2e/playwright/viewer/playwright.config.ts"
]
}, },
"configurations": { "configurations": {
"production": { "production": {

2
e2e/protractor/project.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"name": "app-e2e", "name": "app-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "e2e", "sourceRoot": "e2e",
"projectType": "application", "projectType": "application",
"targets": { "targets": {

4
nx.json
View File

@ -49,7 +49,9 @@
}, },
"lint": { "lint": {
"executor": "@angular-eslint/builder:lint", "executor": "@angular-eslint/builder:lint",
"outputs": ["{options.outputFile}"], "outputs": [
"{options.outputFile}"
],
"options": { "options": {
"lintFilePatterns": [ "lintFilePatterns": [
"{projectRoot}/**/*.ts", "{projectRoot}/**/*.ts",

7574
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
package.json
View File

@ -83,9 +83,6 @@
"@angular/compiler-cli": "14.1.3", "@angular/compiler-cli": "14.1.3",
"@angular/language-service": "14.1.3", "@angular/language-service": "14.1.3",
"@cspell/eslint-plugin": "^7.3.6", "@cspell/eslint-plugin": "^7.3.6",
"@nrwl/angular": "15.9.2",
"@nrwl/eslint-plugin-nx": "^15.9.2",
"@nrwl/workspace": "15.9.2",
"@playwright/test": "^1.37.1", "@playwright/test": "^1.37.1",
"@schematics/angular": "14.1.2", "@schematics/angular": "14.1.2",
"@types/event-emitter": "^0.3.3", "@types/event-emitter": "^0.3.3",
@ -121,7 +118,7 @@
"lint-staged": "^14.0.1", "lint-staged": "^14.0.1",
"ng-packagr": "^14.2.2", "ng-packagr": "^14.2.2",
"node-stream-zip": "^1.14.0", "node-stream-zip": "^1.14.0",
"nx": "15.9.2", "nx": "16.10.0",
"prettier": "2.8.8", "prettier": "2.8.8",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"protractor-retry-angular-cli": "^2.0.3", "protractor-retry-angular-cli": "^2.0.3",
@ -133,6 +130,9 @@
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"tsconfig-paths": "4.2.0", "tsconfig-paths": "4.2.0",
"typescript": "4.7.4", "typescript": "4.7.4",
"webdriver-manager": "12.1.8" "webdriver-manager": "12.1.8",
"@nx/workspace": "16.10.0",
"@nx/eslint-plugin": "16.10.0",
"@nx/angular": "16.10.0"
} }
} }

10
projects/aca-content/project.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"name": "aca-content", "name": "aca-content",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library", "projectType": "library",
"sourceRoot": "projects/aca-content", "sourceRoot": "projects/aca-content",
"prefix": "lib", "prefix": "lib",
@ -19,9 +19,7 @@
} }
}, },
"defaultConfiguration": "production", "defaultConfiguration": "production",
"outputs": [ "outputs": ["{workspaceRoot}/dist/@alfresco/aca-content"]
"{workspaceRoot}/dist/@alfresco/aca-content"
]
}, },
"test": { "test": {
"executor": "@angular-devkit/build-angular:karma", "executor": "@angular-devkit/build-angular:karma",
@ -30,9 +28,7 @@
"main": "projects/aca-content/test.ts", "main": "projects/aca-content/test.ts",
"tsConfig": "projects/aca-content/tsconfig.spec.json", "tsConfig": "projects/aca-content/tsconfig.spec.json",
"karmaConfig": "projects/aca-content/karma.conf.js", "karmaConfig": "projects/aca-content/karma.conf.js",
"styles": [ "styles": ["projects/aca-content/src/lib/ui/application.scss"]
"projects/aca-content/src/lib/ui/application.scss"
]
}, },
"configurations": { "configurations": {
"adfprod": { "adfprod": {

2
projects/aca-playwright-shared/project.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"name": "playwright-shared", "name": "playwright-shared",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "projects/aca-playwright-shared/src", "sourceRoot": "projects/aca-playwright-shared/src",
"projectType": "library", "projectType": "library",
"prefix": "lib" "prefix": "lib"

6
projects/aca-shared/project.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"name": "aca-shared", "name": "aca-shared",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "projects/aca-shared/src", "sourceRoot": "projects/aca-shared/src",
"projectType": "library", "projectType": "library",
"prefix": "lib", "prefix": "lib",
@ -17,9 +17,7 @@
} }
}, },
"defaultConfiguration": "production", "defaultConfiguration": "production",
"outputs": [ "outputs": ["{workspaceRoot}/dist/@alfresco/aca-shared"]
"{workspaceRoot}/dist/@alfresco/aca-shared"
]
}, },
"test": { "test": {
"executor": "@angular-devkit/build-angular:karma", "executor": "@angular-devkit/build-angular:karma",

2
projects/aca-testing-shared/project.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"name": "aca-testing-shared", "name": "aca-testing-shared",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "projects/aca-testing-shared/src", "sourceRoot": "projects/aca-testing-shared/src",
"projectType": "library", "projectType": "library",
"prefix": "lib" "prefix": "lib"

14
tsconfig.json
View File

@ -21,16 +21,16 @@
"typeRoots": ["node_modules/@types"], "typeRoots": ["node_modules/@types"],
"lib": ["es2019", "dom"], "lib": ["es2019", "dom"],
"paths": { "paths": {
"@alfresco/aca-shared": ["projects/aca-shared/src/public-api.ts"],
"@alfresco/aca-shared/store": ["projects/aca-shared/store/src/public-api.ts"],
"@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"],
"@alfresco/aca-content/ms-office": ["projects/aca-content/ms-office/src/public-api.ts"],
"@alfresco/aca-testing-shared": ["projects/aca-testing-shared/src/index.ts"],
"@alfresco/aca-content/folder-rules": ["projects/aca-content/folder-rules/src/public-api.ts"],
"@alfresco/aca-content": ["projects/aca-content/src/public-api.ts"], "@alfresco/aca-content": ["projects/aca-content/src/public-api.ts"],
"@alfresco/aca-content/about": ["projects/aca-content/about/src/public-api.ts"], "@alfresco/aca-content/about": ["projects/aca-content/about/src/public-api.ts"],
"@alfresco/aca-content/viewer": ["projects/aca-content/viewer/src/public-api.ts"], "@alfresco/aca-content/folder-rules": ["projects/aca-content/folder-rules/src/public-api.ts"],
"@alfresco/aca-content/ms-office": ["projects/aca-content/ms-office/src/public-api.ts"],
"@alfresco/aca-content/preview": ["projects/aca-content/preview/src/public-api.ts"], "@alfresco/aca-content/preview": ["projects/aca-content/preview/src/public-api.ts"],
"@alfresco/aca-content/viewer": ["projects/aca-content/viewer/src/public-api.ts"],
"@alfresco/aca-shared": ["projects/aca-shared/src/public-api.ts"],
"@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"],
"@alfresco/aca-shared/store": ["projects/aca-shared/store/src/public-api.ts"],
"@alfresco/aca-testing-shared": ["projects/aca-testing-shared/src/index.ts"],
"@alfresco/playwright-shared": ["projects/aca-playwright-shared/src/index.ts"], "@alfresco/playwright-shared": ["projects/aca-playwright-shared/src/index.ts"],
"package.json": ["package.json"] "package.json": ["package.json"]
} }