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 2022-05-25 19:01:47 +03:00
parent 4ef935b699
commit dc6e32f844
16 changed files with 753 additions and 628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
angular.json
View File

@ -11,7 +11,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/common-ui"],
"options": {
"jestConfig": "libs/common-ui/jest.config.js",
"jestConfig": "libs/common-ui/jest.config.ts",
"passWithNoTests": true
}
},
@ -41,7 +41,7 @@
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/red-cache/jest.config.js",
"jestConfig": "libs/red-cache/jest.config.ts",
"passWithNoTests": true
},
"outputs": ["coverage/libs/red-cache"]
@ -64,7 +64,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/red-domain"],
"options": {
"jestConfig": "libs/red-domain/jest.config.js",
"jestConfig": "libs/red-domain/jest.config.ts",
"passWithNoTests": true
}
},
@ -200,7 +200,7 @@
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "apps/red-ui/jest.config.js",
"jestConfig": "apps/red-ui/jest.config.ts",
"passWithNoTests": true
},
"outputs": ["coverage/apps/red-ui"]

3
apps/red-ui/jest.config.js → apps/red-ui/jest.config.ts
View File

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {

3
apps/red-ui/tsconfig.app.json
View File

@ -4,5 +4,6 @@
"outDir": "../../dist/out-tsc",
"allowSyntheticDefaultImports": true
},
"files": ["src/main.ts", "src/polyfills.ts"]
"files": ["src/main.ts", "src/polyfills.ts"],
"exclude": ["jest.config.ts"]
}

2
apps/red-ui/tsconfig.spec.json
View File

@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

2
jest.config.js → jest.config.ts
View File

@ -1,3 +1,3 @@
const { getJestProjects } = require('@nrwl/jest');
module.exports = { projects: getJestProjects() };
export default { projects: getJestProjects() };

6
jest.preset.js
View File

@ -1,11 +1,11 @@
const nxPreset = require('@nrwl/jest/preset');
const nxPreset = require('@nrwl/jest/preset').default;
module.exports = {
...nxPreset,
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
transform: {
'^.+\\.(ts|js|html)$': 'ts-jest'
'^.+\\.(ts|js|html)$': 'ts-jest',
},
resolver: '@nrwl/jest/plugins/resolver',
moduleFileExtensions: ['ts', 'js', 'html'],
coverageReporters: ['html']
coverageReporters: ['html'],
};

2
libs/common-ui

@ -1 +1 @@
Subproject commit 41af1ba194632a88c38162eec54e963b868b093f
Subproject commit c8b26771c217c82fdbc77c4f7b174ad4b348409e

3
libs/red-cache/jest.config.js → libs/red-cache/jest.config.ts
View File

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {

2
libs/red-cache/tsconfig.lib.json
View File

@ -14,6 +14,6 @@
"strictMetadataEmit": true,
"enableResourceInlining": true
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
libs/red-cache/tsconfig.spec.json
View File

@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
libs/red-domain/jest.config.js → libs/red-domain/jest.config.ts
View File

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'red-domain',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

2
libs/red-domain/tsconfig.lib.json
View File

@ -10,6 +10,6 @@
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
libs/red-domain/tsconfig.spec.json
View File

@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

2
nx.json
View File

@ -15,7 +15,7 @@
"npmScope": "redaction",
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "lint", "test", "e2e"],
"parallel": 1

56
package.json
View File

@ -24,23 +24,23 @@
}
},
"dependencies": {
"@angular/animations": "13.3.0",
"@angular/cdk": "13.3.1",
"@angular/common": "13.3.0",
"@angular/compiler": "13.3.0",
"@angular/core": "13.3.0",
"@angular/forms": "13.3.0",
"@angular/material": "13.3.1",
"@angular/platform-browser": "13.3.0",
"@angular/platform-browser-dynamic": "13.3.0",
"@angular/router": "13.3.0",
"@angular/service-worker": "13.3.0",
"@angular/animations": "13.3.9",
"@angular/cdk": "13.3.7",
"@angular/common": "13.3.9",
"@angular/compiler": "13.3.9",
"@angular/core": "13.3.9",
"@angular/forms": "13.3.9",
"@angular/material": "13.3.7",
"@angular/platform-browser": "13.3.9",
"@angular/platform-browser-dynamic": "13.3.9",
"@angular/router": "13.3.9",
"@angular/service-worker": "13.3.9",
"@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
"@materia-ui/ngx-monaco-editor": "^6.0.0",
"@ngneat/until-destroy": "^9.0.1",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
"@nrwl/angular": "13.9.5",
"@nrwl/angular": "14.1.9",
"@pdftron/webviewer": "8.5.0",
"@tabuckner/material-dayjs-adapter": "2.0.0",
"angular-google-charts": "^2.2.2",
@ -66,26 +66,26 @@
"zone.js": "0.11.5"
},
"devDependencies": {
"@angular-devkit/build-angular": "13.3.0",
"@angular-devkit/build-angular": "13.3.6",
"@angular-eslint/eslint-plugin": "13.1.0",
"@angular-eslint/eslint-plugin-template": "13.1.0",
"@angular-eslint/template-parser": "13.1.0",
"@angular/cli": "13.3.0",
"@angular/compiler-cli": "13.3.0",
"@angular/language-service": "13.3.0",
"@angular/cli": "13.3.6",
"@angular/compiler-cli": "13.3.9",
"@angular/language-service": "13.3.9",
"@bartholomej/ngx-translate-extract": "^8.0.2",
"@nrwl/cli": "13.9.5",
"@nrwl/eslint-plugin-nx": "13.9.5",
"@nrwl/jest": "13.9.5",
"@nrwl/linter": "13.9.5",
"@nrwl/workspace": "13.9.5",
"@nrwl/eslint-plugin-nx": "14.1.9",
"@nrwl/jest": "14.1.9",
"@nrwl/linter": "14.1.9",
"@nrwl/workspace": "14.1.9",
"@types/google.visualization": "^0.0.68",
"@types/jest": "27.4.1",
"@types/lodash-es": "^4.17.6",
"@types/node": "17.0.23",
"@types/puppeteer": "^5.4.4",
"@typescript-eslint/eslint-plugin": "5.10.2",
"@typescript-eslint/parser": "5.10.2",
"@typescript-eslint/eslint-plugin": "5.18.0",
"@typescript-eslint/parser": "5.18.0",
"axios": "^0.26.1",
"dotenv": "16.0.0",
"eslint": "8.12.0",
@ -98,12 +98,12 @@
"husky": "4.3.8",
"jest": "27.5.1",
"jest-preset-angular": "11.1.1",
"ng-packagr": "13.3.0",
"nx": "13.9.5",
"ng-packagr": "13.3.1",
"nx": "14.1.9",
"postcss": "^8.4.12",
"postcss-import": "^14.1.0",
"postcss-preset-env": "^7.4.3",
"postcss-url": "^10.1.1",
"postcss-import": "14.1.0",
"postcss-preset-env": "~7.5.0",
"postcss-url": "10.1.3",
"prettier": "2.6.1",
"pretty-quick": "^3.1.3",
"sonarqube-scanner": "^2.8.1",
@ -111,7 +111,7 @@
"superagent-promise": "^1.1.0",
"ts-jest": "27.1.4",
"ts-node": "10.7.0",
"typescript": "4.6.3",
"typescript": "4.6.4",
"webpack": "^5.70.0",
"webpack-bundle-analyzer": "^4.5.0",
"xliff": "^6.0.0"

1283
yarn.lock
View File

File diff suppressed because it is too large Load Diff