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

nx updates

Browse Source
This commit is contained in:
Dan Percic 2021-09-11 20:03:13 +03:00
parent 82b40b10fc
commit 713c30bc31
11 changed files with 2623 additions and 2163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -41,3 +41,5 @@ Thumbs.db
version.properties
paligo-styles/style.css*
migrations.json

106
angular.json
View File

@ -19,6 +19,57 @@
"@nrwl/angular:component": {}
},
"projects": {
"common-ui": {
"projectType": "library",
"root": "libs/common-ui",
"sourceRoot": "libs/common-ui/src",
"prefix": "redaction",
"architect": {
"test": {
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/common-ui"],
"options": {
"jestConfig": "libs/common-ui/jest.config.js",
"passWithNoTests": true
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["libs/common-ui/src/**/*.ts", "libs/common-ui/src/**/*.html"]
},
"outputs": ["{options.outputFile}"]
}
}
},
"red-cache": {
"projectType": "library",
"root": "libs/red-cache",
"sourceRoot": "libs/red-cache/src",
"prefix": "redaction",
"architect": {
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["libs/red-cache/src/**/*.ts", "libs/red-cache/src/**/*.html"]
},
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/red-cache/jest.config.js",
"passWithNoTests": true
},
"outputs": ["coverage/libs/red-cache"]
}
},
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
}
},
"red-ui": {
"projectType": "application",
"schematics": {
@ -120,7 +171,8 @@
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["apps/red-ui/src/**/*.ts", "apps/red-ui/src/**/*.html"]
}
},
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
@ -149,7 +201,8 @@
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["libs/red-ui-http/src/**/*.ts", "libs/red-ui-http/src/**/*.html"]
}
},
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
@ -165,55 +218,6 @@
"style": "scss"
}
}
},
"red-cache": {
"projectType": "library",
"root": "libs/red-cache",
"sourceRoot": "libs/red-cache/src",
"prefix": "redaction",
"architect": {
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["libs/red-cache/src/**/*.ts", "libs/red-cache/src/**/*.html"]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/red-cache/jest.config.js",
"passWithNoTests": true
},
"outputs": ["coverage/libs/red-cache"]
}
},
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
}
},
"common-ui": {
"projectType": "library",
"root": "libs/common-ui",
"sourceRoot": "libs/common-ui/src",
"prefix": "redaction",
"architect": {
"test": {
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/common-ui"],
"options": {
"jestConfig": "libs/common-ui/jest.config.js",
"passWithNoTests": true
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["libs/common-ui/src/**/*.ts", "libs/common-ui/src/**/*.html"]
}
}
}
}
}
}

7
apps/red-ui/jest.config.js
View File

@ -4,9 +4,7 @@ module.exports = {
globals: {
'ts-jest': {
stringifyContentPathRegex: '\\.(html|svg)$',
astTransformers: {
before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer']
},
tsconfig: '<rootDir>/tsconfig.spec.json'
}
},
@ -17,5 +15,6 @@ module.exports = {
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment'
]
],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' }
};

6
jest.config.js
View File

@ -1,3 +1,3 @@
module.exports = {
projects: ['<rootDir>/apps/red-ui', '<rootDir>/libs/red-ui-http', '<rootDir>/libs/red-cache', '<rootDir>/libs/common-ui']
};
const { getJestProjects } = require('@nrwl/jest');
module.exports = { projects: getJestProjects() };

2
libs/common-ui

@ -1 +1 @@
Subproject commit 6c0f123bd97148f8696038f63c9951c241b71990
Subproject commit c7546078ec884dd9a051a965111c4093f2a2ae94

7
libs/red-cache/jest.config.js
View File

@ -4,9 +4,7 @@ module.exports = {
globals: {
'ts-jest': {
stringifyContentPathRegex: '\\.(html|svg)$',
astTransformers: {
before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer']
},
tsconfig: '<rootDir>/tsconfig.spec.json'
}
},
@ -17,5 +15,6 @@ module.exports = {
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment'
]
],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' }
};

7
libs/red-ui-http/jest.config.js
View File

@ -4,9 +4,7 @@ module.exports = {
globals: {
'ts-jest': {
stringifyContentPathRegex: '\\.(html|svg)$',
astTransformers: {
before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer']
},
tsconfig: '<rootDir>/tsconfig.spec.json'
}
},
@ -17,5 +15,6 @@ module.exports = {
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment'
]
],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' }
};

18
nx.json
View File

@ -22,17 +22,25 @@
}
},
"projects": {
"red-ui": {
"tags": []
},
"red-ui-http": {
"common-ui": {
"tags": []
},
"red-cache": {
"tags": []
},
"common-ui": {
"red-ui": {
"tags": []
},
"red-ui-http": {
"tags": []
}
},
"targetDependencies": {
"build": [
{
"target": "build",
"projects": "dependencies"
}
]
}
}

65
package.json
View File

@ -29,6 +29,7 @@
"start": "nx serve --base-href /ui/",
"test": "nx test",
"update": "nx migrate latest",
"migrate": "nx migrate --run-migrations",
"workspace-generator": "nx workspace-generator"
},
"husky": {
@ -37,23 +38,23 @@
}
},
"dependencies": {
"@angular/animations": "12.0.4",
"@angular/animations": "12.2.5",
"@angular/cdk": "~12.0.4",
"@angular/common": "12.0.4",
"@angular/compiler": "12.0.4",
"@angular/core": "12.0.4",
"@angular/forms": "12.0.4",
"@angular/material": "~12.0.4",
"@angular/common": "12.2.5",
"@angular/compiler": "12.2.5",
"@angular/core": "12.2.5",
"@angular/forms": "12.2.5",
"@angular/material": "12.2.5",
"@angular/material-moment-adapter": "^12.0.4",
"@angular/platform-browser": "12.0.4",
"@angular/platform-browser-dynamic": "12.0.4",
"@angular/router": "12.0.4",
"@angular/service-worker": "12.0.4",
"@angular/platform-browser": "12.2.5",
"@angular/platform-browser-dynamic": "12.2.5",
"@angular/router": "12.2.5",
"@angular/service-worker": "12.2.5",
"@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
"@materia-ui/ngx-monaco-editor": "^5.1.0",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"@nrwl/angular": "12.3.6",
"@nrwl/angular": "12.9.0",
"@pdftron/webviewer": "7.3.3",
"@swimlane/ngx-charts": "^17.0.1",
"file-saver": "^2.0.5",
@ -75,27 +76,27 @@
"zone.js": "0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "12.0.4",
"@angular-eslint/eslint-plugin": "12.1.0",
"@angular-eslint/eslint-plugin-template": "12.1.0",
"@angular-eslint/template-parser": "12.1.0",
"@angular/cli": "12.0.4",
"@angular/compiler-cli": "12.0.4",
"@angular/language-service": "12.0.4",
"@angular-devkit/build-angular": "12.2.5",
"@angular-eslint/eslint-plugin": "12.3.1",
"@angular-eslint/eslint-plugin-template": "12.3.1",
"@angular-eslint/template-parser": "12.3.1",
"@angular/cli": "12.2.5",
"@angular/compiler-cli": "12.2.5",
"@angular/language-service": "12.2.5",
"@biesbjerg/ngx-translate-extract": "^7.0.4",
"@nrwl/cli": "12.3.6",
"@nrwl/cypress": "12.3.6",
"@nrwl/eslint-plugin-nx": "12.3.6",
"@nrwl/jest": "12.3.6",
"@nrwl/linter": "12.3.6",
"@nrwl/tao": "12.3.6",
"@nrwl/workspace": "12.3.6",
"@nrwl/cli": "12.9.0",
"@nrwl/cypress": "12.9.0",
"@nrwl/eslint-plugin-nx": "12.9.0",
"@nrwl/jest": "12.9.0",
"@nrwl/linter": "12.9.0",
"@nrwl/tao": "12.9.0",
"@nrwl/workspace": "12.9.0",
"@types/cypress": "^1.1.3",
"@types/jest": "26.0.23",
"@types/lodash": "^4.14.172",
"@types/node": "15.12.2",
"@typescript-eslint/eslint-plugin": "4.26.1",
"@typescript-eslint/parser": "4.26.1",
"@typescript-eslint/eslint-plugin": "4.28.5",
"@typescript-eslint/parser": "4.28.5",
"cypress": "^6.9.1",
"cypress-file-upload": "^5.0.7",
"cypress-keycloak": "^1.7.0",
@ -109,16 +110,16 @@
"eslint-plugin-import": "2.23.4",
"google-translate-api-browser": "^1.1.71",
"husky": "4.3.8",
"jest": "27.0.4",
"jest-preset-angular": "9.0.3",
"ng-packagr": "12.0.5",
"prettier": "2.3.1",
"jest": "27.0.3",
"jest-preset-angular": "9.0.7",
"ng-packagr": "12.2.1",
"prettier": "2.4.0",
"pretty-quick": "^3.1.0",
"superagent": "^6.1.0",
"superagent-promise": "^1.1.0",
"ts-jest": "27.0.3",
"ts-node": "10.0.0",
"typescript": "4.2.4",
"typescript": "4.3.5",
"webpack": "^4.18.1"
}
}

16
tsconfig.base.json
View File

@ -17,20 +17,20 @@
"skipDefaultLibCheck": true,
"baseUrl": ".",
"paths": {
"@redaction/red-ui-http": ["libs/red-ui-http/src/index.ts"],
"@redaction/red-cache": ["libs/red-cache/src/index.ts"],
"@services/*": ["apps/red-ui/src/app/services/*"],
"@app-config/*": ["apps/red-ui/src/app/modules/app-config/*"],
"@components/*": ["apps/red-ui/src/app/components/*"],
"@environments/*": ["apps/red-ui/src/environments/*"],
"@guards/*": ["apps/red-ui/src/app/guards/*"],
"@i18n/*": ["apps/red-ui/src/app/i18n/*"],
"@state/*": ["apps/red-ui/src/app/state/*"],
"@utils/*": ["apps/red-ui/src/app/utils/*"],
"@iqser/common-ui": ["libs/common-ui/src/index.ts"],
"@models/*": ["apps/red-ui/src/app/models/*"],
"@environments/*": ["apps/red-ui/src/environments/*"],
"@redaction/red-cache": ["libs/red-cache/src/index.ts"],
"@redaction/red-ui-http": ["libs/red-ui-http/src/index.ts"],
"@services/*": ["apps/red-ui/src/app/services/*"],
"@shared/*": ["apps/red-ui/src/app/modules/shared/*"],
"@app-config/*": ["apps/red-ui/src/app/modules/app-config/*"],
"@state/*": ["apps/red-ui/src/app/state/*"],
"@upload-download/*": ["apps/red-ui/src/app/modules/upload-download/*"],
"@iqser/common-ui": ["libs/common-ui/src/index.ts"]
"@utils/*": ["apps/red-ui/src/app/utils/*"]
}
},
"exclude": ["node_modules", "tmp"],

4550
yarn.lock
View File

File diff suppressed because it is too large Load Diff