diff --git a/.browserslistrc b/.browserslistrc deleted file mode 100644 index fb92325c6e..0000000000 --- a/.browserslistrc +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. -# For additional information regarding the format and rule options, please see: -# https://github.com/browserslist/browserslist#queries - -# For the full list of supported browsers by the Angular framework, please see: -# https://angular.io/guide/browser-support - -# You can see what browsers were selected by your queries by running: -# npx browserslist - -last 1 Chrome version -last 1 Firefox version -last 2 Edge major versions -last 2 Safari major version -last 2 iOS major versions -Firefox ESR -not IE 9-11 # For IE 9-11 support, remove 'not'. diff --git a/.storybook/main.js b/.storybook/main.js index 51d3372dc5..801822372b 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -1,7 +1,5 @@ module.exports = { - stories: [], - addons: ['@storybook/addon-essentials'], framework: '@storybook/angular', - staticDirs: [ { from: '../../../demo-shell/src/app.config.json', to: 'app.config.json' } ], + staticDirs: [{ from: '../../../demo-shell/src/app.config.json', to: 'app.config.json' }], core: { builder: 'webpack5' } }; diff --git a/demo-shell/project.json b/demo-shell/project.json new file mode 100644 index 0000000000..344a052dd9 --- /dev/null +++ b/demo-shell/project.json @@ -0,0 +1,200 @@ +{ + "name": "demoshell", + "$schema": "../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "demo-shell/src", + "projectType": "application", + "targets": { + "build": { + "executor": "@angular-devkit/build-angular:browser", + "options": { + "allowedCommonJsDependencies": [ + "minimatch", + "minimatch-browser", + "superagent", + "event-emitter", + "brace-expansion", + "zen-observable", + "subscriptions-transport-ws", + "d", + "chart.js" + ], + "outputPath": "dist/demo-shell", + "index": "demo-shell/src/index.html", + "main": "demo-shell/src/main.ts", + "tsConfig": "tsconfig.dev.json", + "polyfills": "demo-shell/src/polyfills.ts", + "stylePreprocessorOptions": { + "includePaths": ["lib", "lib/core/src/lib"] + }, + "assets": [ + "demo-shell/src/assets", + "demo-shell/src/favicon-96x96.png", + "demo-shell/src/app.config.json", + { + "glob": "**/*", + "input": "demo-shell/src/assets", + "output": "/assets" + }, + { + "glob": "app.config.json", + "input": "demo-shell/src", + "output": "/" + }, + { + "glob": "**/*", + "input": "demo-shell/resources", + "output": "/resources" + }, + { + "glob": "**/*", + "input": "lib/core/src/lib/assets", + "output": "/assets" + }, + { + "glob": "**/*", + "input": "lib/process-services/src/lib/assets", + "output": "/assets" + }, + { + "glob": "**/*", + "input": "lib/process-services-cloud/src/lib/assets", + "output": "/assets" + }, + { + "glob": "**/*", + "input": "lib/content-services/src/lib/assets", + "output": "/assets" + }, + { + "glob": "**/*", + "input": "lib/core/src/lib/i18n", + "output": "/assets/adf-core/i18n" + }, + { + "glob": "**/*", + "input": "lib/content-services/src/lib/i18n", + "output": "/assets/adf-content-services/i18n" + }, + { + "glob": "**/*", + "input": "lib/process-services/src/lib/i18n", + "output": "/assets/adf-process-services/i18n" + }, + { + "glob": "**/*", + "input": "lib/process-services-cloud/src/lib/i18n", + "output": "/assets/adf-process-services-cloud/i18n" + }, + { + "glob": "**/*", + "input": "lib/insights/src/lib/i18n", + "output": "/assets/adf-insights/i18n" + }, + { + "glob": "pdf.worker.min.js", + "input": "node_modules/pdfjs-dist/build", + "output": "/" + }, + { + "glob": "**/*", + "input": "node_modules/monaco-editor", + "output": "/assets/monaco/" + } + ], + "styles": [ + "demo-shell/src/styles.scss", + "demo-shell/src/custom-style-dev.scss", + "node_modules/cropperjs/dist/cropper.min.css", + "node_modules/pdfjs-dist/web/pdf_viewer.css" + ], + "scripts": ["node_modules/pdfjs-dist/build/pdf.js", "node_modules/pdfjs-dist/web/pdf_viewer.js", "node_modules/raphael/raphael.min.js"], + "vendorChunk": true, + "extractLicenses": false, + "buildOptimizer": false, + "sourceMap": true, + "optimization": false, + "namedChunks": true + }, + "configurations": { + "production": { + "budgets": [ + { + "type": "anyComponentStyle", + "maximumWarning": "12kb" + } + ], + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "extractLicenses": true, + "buildOptimizer": true, + "verbose": false, + "fileReplacements": [ + { + "replace": "demo-shell/src/environments/environment.ts", + "with": "demo-shell/src/environments/environment.prod.ts" + } + ] + }, + "canary": { + "fileReplacements": [ + { + "replace": "demo-shell/src/environments/environment.ts", + "with": "demo-shell/src/environments/environment.canary.ts" + } + ] + }, + "e2e": { + "budgets": [ + { + "type": "anyComponentStyle", + "maximumWarning": "6kb" + } + ], + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "extractLicenses": true, + "buildOptimizer": true, + "verbose": false, + "fileReplacements": [ + { + "replace": "demo-shell/src/environments/environment.ts", + "with": "demo-shell/src/environments/environment.e2e.ts" + } + ] + } + }, + "defaultConfiguration": "" + }, + "serve": { + "executor": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "demoshell:build", + "host": "0.0.0.0", + "port": 3000, + "proxyConfig": "demo-shell/proxy.conf.js", + "disableHostCheck": true + }, + "configurations": { + "production": { + "browserTarget": "demoshell:build:production" + }, + "canary": { + "browserTarget": "demoshell:build:canary" + }, + "e2e": { + "browserTarget": "demoshell:build:e2e" + } + } + }, + "lint": { + "executor": "@nrwl/linter:eslint", + "options": { + "lintFilePatterns": ["demo-shell/**/*.ts", "demo-shell/**/*.html"] + } + } + } +} diff --git a/lib/cli/project.json b/lib/cli/project.json new file mode 100644 index 0000000000..2ed7642cc1 --- /dev/null +++ b/lib/cli/project.json @@ -0,0 +1,70 @@ +{ + "name": "cli", + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "lib/cli", + "projectType": "library", + "prefix": "adf", + "targets": { + "build": { + "executor": "nx:run-commands", + "options": { + "command": "cd lib/cli && npm i && npm run dist", + "stylePreprocessorOptions": { + "includePaths": ["lib", "lib/core/src/lib"] + } + }, + "configurations": { + "production": { + "tsConfig": "lib/cli/tsconfig.json" + } + }, + "defaultConfiguration": "production" + }, + "bundle": { + "executor": "nx:run-commands", + "options": { + "commands": [ + { + "command": "echo cli bundle created" + } + ] + }, + "dependsOn": ["copyToNodeModules"] + }, + "copyToNodeModules": { + "executor": "nx:run-commands", + "options": { + "commands": [ + { + "command": "rm -rf ./node_modules/@alfresco/adf-cli/ && mkdir -p ./node_modules/@alfresco/adf-cli/ && cp -R ./dist/libs/cli/* ./node_modules/@alfresco/adf-cli/" + } + ] + }, + "dependsOn": [ + { + "projects": "self", + "target": "build" + } + ] + }, + "lint": { + "executor": "@nrwl/linter:eslint", + "options": { + "lintFilePatterns": ["lib/cli/**/*.ts", "lib/cli/**/*.html"] + } + }, + "npm-publish": { + "executor": "nx:run-commands", + "dependsOn": ["build"], + "options": { + "cwd": "dist/libs/cli", + "commands": [ + { + "command": "npm publish --tag {args.tag}", + "forwardAllArgs": true + } + ] + } + } + } +} diff --git a/lib/content-services/.storybook/main.js b/lib/content-services/.storybook/main.js index dfbcb477ba..a96a8dc199 100644 --- a/lib/content-services/.storybook/main.js +++ b/lib/content-services/.storybook/main.js @@ -5,5 +5,5 @@ module.exports = { core: { ...rootMain.core, builder: 'webpack5' }, stories: [...rootMain.stories, '../**/*.stories.@(js|jsx|ts|tsx)'], staticDirs: [...rootMain.staticDirs, { from: __dirname + '/../src/lib/i18n', to: 'assets/adf-content-services/i18n' }], - addons: [...rootMain.addons] + addons: ['@storybook/addon-essentials', ...rootMain.addons] }; diff --git a/lib/content-services/project.json b/lib/content-services/project.json new file mode 100644 index 0000000000..f76d12a311 --- /dev/null +++ b/lib/content-services/project.json @@ -0,0 +1,111 @@ +{ + "name": "content-services", + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "lib/content-services/src", + "projectType": "library", + "prefix": "adf", + "targets": { + "build": { + "executor": "@angular-devkit/build-angular:ng-packagr", + "options": { + "tsConfig": "lib/content-services/tsconfig.lib.json", + "project": "lib/content-services/ng-package.json" + }, + "configurations": { + "production": { + "project": "lib/content-services/ng-package.json", + "tsConfig": "lib/content-services/tsconfig.lib.prod.json" + } + }, + "defaultConfiguration": "production" + }, + "test": { + "executor": "@angular-devkit/build-angular:karma", + "options": { + "main": "lib/content-services/src/test.ts", + "tsConfig": "lib/content-services/tsconfig.spec.json", + "karmaConfig": "lib/content-services/karma.conf.js", + "sourceMap": true, + "codeCoverage": true, + "stylePreprocessorOptions": { + "includePaths": ["lib", "lib/core/src/lib"] + } + } + }, + "lint": { + "executor": "@nrwl/linter:eslint", + "options": { + "lintFilePatterns": ["lib/content-services/**/*.ts", "lib/content-services/**/*.html"] + } + }, + "storybook": { + "executor": "@storybook/angular:start-storybook", + "options": { + "port": 4400, + "browserTarget": "content-services:storybook", + "configDir": "lib/content-services/.storybook", + "compodoc": false, + "styles": [ + "demo-shell/src/styles.scss", + "demo-shell/src/custom-style-dev.scss", + "node_modules/cropperjs/dist/cropper.min.css", + "node_modules/pdfjs-dist/web/pdf_viewer.css" + ], + "stylePreprocessorOptions": { + "includePaths": ["lib", "lib/core/src/lib"] + } + }, + "configurations": { + "ci": { + "quiet": true + } + } + }, + "build-storybook": { + "executor": "@storybook/angular:build-storybook", + "options": { + "browserTarget": "content-services:build-storybook", + "configDir": "lib/content-services/.storybook", + "outputDir": "dist/storybook/content-services", + "compodoc": false, + "styles": [ + "demo-shell/src/styles.scss", + "demo-shell/src/custom-style-dev.scss", + "node_modules/cropperjs/dist/cropper.min.css", + "node_modules/pdfjs-dist/web/pdf_viewer.css" + ], + "stylePreprocessorOptions": { + "includePaths": ["lib", "lib/core/src/lib"] + } + }, + "configurations": { + "ci": { + "quiet": true + } + } + }, + "stylelint": { + "executor": "nx:run-commands", + "options": { + "commands": [ + { + "command": "npx stylelint lib/content-services/**/*.scss --config stylelint-config.json" + } + ] + } + }, + "npm-publish": { + "executor": "nx:run-commands", + "dependsOn": ["build"], + "options": { + "cwd": "dist/libs/content-services", + "commands": [ + { + "command": "npm publish --tag {args.tag}", + "forwardAllArgs": true + } + ] + } + } + } +} diff --git a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts index 83cd323b54..819bc56923 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts @@ -21,7 +21,7 @@ import { RoleModel } from '../../models/role.model'; @Component({ selector: 'adf-user-role-column', template: ` - + 0) { const firstElement = this.listResultElement.first as MatListItem; // eslint-disable-next-line no-underscore-dangle - firstElement._getHostElement().focus(); + firstElement._hostElement.focus(); } } diff --git a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html index 166330f4f0..94b4043653 100644 --- a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html +++ b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html @@ -13,7 +13,6 @@ />