Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-3800: update nx

Browse Source
This commit is contained in:
Dan Percic 2023-05-17 00:08:41 +03:00
parent adafe39b53
commit bfedd0e607
11 changed files with 863 additions and 1190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.eslintrc.json
View File

@ -1,12 +1,12 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
@ -35,15 +35,14 @@
},
{
"files": ["*.ts"],
"extends": ["plugin:@nrwl/nx/typescript"]
"extends": ["plugin:@nx/typescript"]
},
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@nx/angular",
"eslint:recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/recommended--extra",
"plugin:@angular-eslint/template/process-inline-templates",
"plugin:prettier/recommended",
"plugin:rxjs/recommended"
@ -183,7 +182,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template", "plugin:@angular-eslint/template/recommended"]
"extends": ["plugin:@nx/angular-template", "plugin:@angular-eslint/template/recommended"]
},
{
// https://github.com/angular-eslint/angular-eslint#notes-for-eslint-plugin-prettier-users

144
angular.json
View File

@ -1,144 +0,0 @@
{
"version": 1,
"projects": {
"red-domain": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "libs/red-domain",
"sourceRoot": "libs/red-domain/src",
"prefix": "red"
},
"red-ui": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss",
"skipTests": true
},
"@schematics/angular:class": {
"skipTests": true
},
"@schematics/angular:directive": {
"skipTests": true
},
"@schematics/angular:guard": {
"skipTests": true
},
"@schematics/angular:pipe": {
"skipTests": true
},
"@schematics/angular:service": {
"skipTests": true
}
},
"root": "apps/red-ui",
"sourceRoot": "apps/red-ui/src",
"prefix": "redaction",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/apps/red-ui",
"index": "apps/red-ui/src/index.html",
"main": "apps/red-ui/src/main.ts",
"polyfills": "apps/red-ui/src/polyfills.ts",
"tsConfig": "apps/red-ui/tsconfig.json",
"baseHref": "/ui/",
"assets": [
"apps/red-ui/src/favicon.ico",
{
"glob": "**/*",
"input": "node_modules/@pdftron/webviewer/public/",
"output": "/assets/wv-resources/"
},
{
"glob": "**/*",
"input": "apps/red-ui/src/assets/",
"output": "/assets/"
},
{
"glob": "**/*",
"input": "libs/common-ui/src/assets/",
"output": "/assets/"
},
{
"glob": "**/*",
"input": "node_modules/monaco-editor",
"output": "/assets/monaco-editor/"
},
"apps/red-ui/src/manifest.webmanifest"
],
"styles": ["apps/red-ui/src/styles.scss", "libs/common-ui/src/assets/styles/common-styles.scss"],
"stylePreprocessorOptions": {
"includePaths": ["./apps/red-ui/src/assets/styles", "./libs/common-ui/src/assets/styles"]
},
"scripts": ["node_modules/@pdftron/webviewer/webviewer.min.js"],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "apps/red-ui/src/environments/environment.ts",
"with": "apps/red-ui/src/environments/environment.prod.ts"
}
],
"optimization": {
"scripts": true,
"styles": {
"minify": true,
"inlineCritical": false
},
"fonts": true
},
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "20kb"
}
],
"serviceWorker": true,
"ngswConfigPath": "apps/red-ui/ngsw-config.json"
}
},
"outputs": ["{options.outputPath}"]
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "red-ui:build"
},
"configurations": {
"production": {
"browserTarget": "red-ui:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "red-ui:build"
}
}
}
}
}
}

132
apps/red-ui/project.json Normal file
View File

@ -0,0 +1,132 @@
{
"name": "red-ui",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"generators": {
"@schematics/angular:component": {
"style": "scss",
"skipTests": true
},
"@schematics/angular:class": {
"skipTests": true
},
"@schematics/angular:directive": {
"skipTests": true
},
"@schematics/angular:guard": {
"skipTests": true
},
"@schematics/angular:pipe": {
"skipTests": true
},
"@schematics/angular:service": {
"skipTests": true
}
},
"sourceRoot": "apps/red-ui/src",
"prefix": "redaction",
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/apps/red-ui",
"index": "apps/red-ui/src/index.html",
"main": "apps/red-ui/src/main.ts",
"polyfills": "apps/red-ui/src/polyfills.ts",
"tsConfig": "apps/red-ui/tsconfig.json",
"baseHref": "/ui/",
"assets": [
"apps/red-ui/src/favicon.ico",
{
"glob": "**/*",
"input": "node_modules/@pdftron/webviewer/public/",
"output": "/assets/wv-resources/"
},
{
"glob": "**/*",
"input": "apps/red-ui/src/assets/",
"output": "/assets/"
},
{
"glob": "**/*",
"input": "libs/common-ui/src/assets/",
"output": "/assets/"
},
{
"glob": "**/*",
"input": "node_modules/monaco-editor",
"output": "/assets/monaco-editor/"
},
"apps/red-ui/src/manifest.webmanifest"
],
"styles": ["apps/red-ui/src/styles.scss", "libs/common-ui/src/assets/styles/common-styles.scss"],
"stylePreprocessorOptions": {
"includePaths": ["./apps/red-ui/src/assets/styles", "./libs/common-ui/src/assets/styles"]
},
"scripts": ["node_modules/@pdftron/webviewer/webviewer.min.js"],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "apps/red-ui/src/environments/environment.ts",
"with": "apps/red-ui/src/environments/environment.prod.ts"
}
],
"optimization": {
"scripts": true,
"styles": {
"minify": true,
"inlineCritical": false
},
"fonts": true
},
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "20kb"
}
],
"serviceWorker": true,
"ngswConfigPath": "apps/red-ui/ngsw-config.json"
}
},
"outputs": ["{options.outputPath}"]
},
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "red-ui:build"
},
"configurations": {
"production": {
"browserTarget": "red-ui:build:production"
}
}
},
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "red-ui:build"
}
}
}
}

2
jest.config.ts
View File

@ -1,4 +1,4 @@
import { getJestProjects } from '@nrwl/jest';
import { getJestProjects } from '@nx/jest';
export default {
projects: getJestProjects(),

2
jest.preset.js
View File

@ -1,3 +1,3 @@
const nxPreset = require('@nrwl/jest/preset').default;
const nxPreset = require('@nx/jest/preset').default;
module.exports = { ...nxPreset };

2
libs/common-ui

@ -1 +1 @@
Subproject commit 7bf0b845fcd26470147950c5a9bbf05feeea2027
Subproject commit e46649c656813bbe9252678295f4913bb705d937

7
libs/red-domain/project.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "red-domain",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"sourceRoot": "libs/red-domain/src",
"prefix": "red"
}

11
nx.json
View File

@ -5,10 +5,11 @@
"npmScope": "redaction",
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"runner": "nx-cloud",
"options": {
"cacheableOperations": ["build", "lint", "test", "e2e"],
"parallel": 1
"parallel": 1,
"accessToken": "MTQ2MmM5NDQtZjcyNS00YzUwLTkwYjEtMmZkNDg5MzAzMGE4fHJlYWQtd3JpdGU="
}
}
},
@ -19,15 +20,15 @@
},
"defaultProject": "red-ui",
"generators": {
"@nrwl/angular:application": {
"@nx/angular:application": {
"linter": "eslint",
"unitTestRunner": "jest"
},
"@nrwl/angular:library": {
"@nx/angular:library": {
"linter": "eslint",
"unitTestRunner": "jest"
},
"@nrwl/angular:component": {}
"@nx/angular:component": {}
},
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {

33
package.json
View File

@ -37,7 +37,6 @@
"@messageformat/core": "^3.1.0",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
"@nrwl/angular": "15.6.3",
"@pdftron/webviewer": "8.12.0",
"@swimlane/ngx-charts": "^20.0.1",
"dayjs": "^1.11.5",
@ -58,29 +57,32 @@
"scroll-into-view-if-needed": "^3.0.6",
"streamsaver": "^2.0.5",
"tslib": "^2.5.0",
"zone.js": "0.12.0"
"zone.js": "0.12.0",
"@nx/angular": "16.1.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "15.1.4",
"@angular-devkit/core": "15.1.4",
"@angular-devkit/schematics": "15.1.4",
"@angular-eslint/builder": "15.2.1",
"@angular-eslint/eslint-plugin": "15.2.1",
"@angular-eslint/eslint-plugin-template": "15.2.1",
"@angular-eslint/eslint-plugin": "16.0.1",
"@angular-eslint/eslint-plugin-template": "16.0.1",
"@angular-eslint/schematics": "15.2.1",
"@angular-eslint/template-parser": "15.2.1",
"@angular-eslint/template-parser": "16.0.1",
"@angular/cli": "~15.1.0",
"@angular/compiler-cli": "15.1.2",
"@angular/language-service": "15.1.2",
"@bartholomej/ngx-translate-extract": "^8.0.2",
"@nrwl/cli": "15.6.3",
"@nrwl/eslint-plugin-nx": "15.6.3",
"@nrwl/jest": "^15.8.7",
"@nrwl/linter": "15.6.3",
"@nrwl/workspace": "15.6.3",
"@nx/eslint-plugin": "16.1.4",
"@nx/jest": "16.1.4",
"@nx/linter": "16.1.4",
"@nx/workspace": "16.1.4",
"@schematics/angular": "15.1.4",
"@types/jest": "^29.4.0",
"@types/lodash-es": "^4.17.6",
"@types/node": "18.15.1",
"@typescript-eslint/eslint-plugin": "5.48.2",
"@typescript-eslint/parser": "5.48.2",
"@typescript-eslint/eslint-plugin": "5.59.6",
"@typescript-eslint/parser": "5.59.6",
"axios": "^1.3.4",
"dotenv": "16.0.3",
"eslint": "^8.33.0",
@ -92,9 +94,10 @@
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"jest-extended": "^3.2.4",
"jest-preset-angular": "13.0.0",
"jest-preset-angular": "13.1.1",
"lint-staged": "^13.2.0",
"nx": "15.6.3",
"nx": "16.1.4",
"nx-cloud": "16.0.5",
"postcss": "^8.4.21",
"postcss-import": "15.1.0",
"postcss-preset-env": "~8.0.1",
@ -104,7 +107,7 @@
"superagent": "^8.0.9",
"superagent-promise": "^1.1.0",
"ts-node": "10.9.1",
"typescript": "4.9.5",
"typescript": "5.0.4",
"webpack": "^5.76.1",
"webpack-bundle-analyzer": "^4.8.0",
"xliff": "^6.1.0"

4
tsconfig.json
View File

@ -17,6 +17,7 @@
"skipDefaultLibCheck": true,
"baseUrl": ".",
"paths": {
"@biesbjerg/ngx-translate-extract-marker": ["libs/common-ui/src/lib/translations/ngx-translate-extract-marker"],
"@components/*": ["apps/red-ui/src/app/components/*"],
"@environments/*": ["apps/red-ui/src/environments/*"],
"@guards/*": ["apps/red-ui/src/app/guards/*"],
@ -29,8 +30,7 @@
"@translations/*": ["apps/red-ui/src/app/translations/*"],
"@upload-download/*": ["apps/red-ui/src/app/modules/upload-download/*"],
"@users/*": ["apps/red-ui/src/app/users/*"],
"@utils/*": ["apps/red-ui/src/app/utils/*"],
"@biesbjerg/ngx-translate-extract-marker": ["libs/common-ui/src/lib/translations/ngx-translate-extract-marker"]
"@utils/*": ["apps/red-ui/src/app/utils/*"]
}
},
"exclude": ["node_modules", "tmp"],

1705
yarn.lock
View File

File diff suppressed because it is too large Load Diff