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-05-07 18:47:47 +03:00
parent 0c7f450301
commit 430712881e
9 changed files with 2309 additions and 1430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
angular.json
View File

@ -59,7 +59,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
@ -79,7 +78,8 @@
"serviceWorker": true,
"ngswConfigPath": "apps/red-ui/ngsw-config.json"
}
}
},
"outputs": ["{options.outputPath}"]
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
@ -110,7 +110,8 @@
"options": {
"jestConfig": "apps/red-ui/jest.config.js",
"passWithNoTests": true
}
},
"outputs": ["coverage/apps/red-ui"]
}
}
},
@ -121,7 +122,7 @@
"prefix": "redaction",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "libs/red-ui-http/tsconfig.lib.json",
"project": "libs/red-ui-http/ng-package.json"
@ -139,7 +140,8 @@
"options": {
"jestConfig": "libs/red-ui-http/jest.config.js",
"passWithNoTests": true
}
},
"outputs": ["coverage/libs/red-ui-http"]
}
},
"schematics": {
@ -166,7 +168,8 @@
"options": {
"jestConfig": "libs/red-cache/jest.config.js",
"passWithNoTests": true
}
},
"outputs": ["coverage/libs/red-cache"]
}
},
"schematics": {

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

@ -1,21 +1,19 @@
module.exports = {
name: 'red-ui',
preset: '../../jest.config.js',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
astTransformers: [
'jest-preset-angular/build/InlineFilesTransformer',
'jest-preset-angular/build/StripStylesTransformer'
]
astTransformers: { before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer'] },
tsconfig: '<rootDir>/tsconfig.spec.json'
}
},
coverageDirectory: '../../coverage/apps/red-ui',
displayName: 'red-ui',
snapshotSerializers: [
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
'jest-preset-angular/build/AngularSnapshotSerializer.js',
'jest-preset-angular/build/HTMLCommentSerializer.js'
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment'
]
};

2
apps/red-ui/src/test-setup.ts
View File

@ -1 +1 @@
import 'jest-preset-angular';
import 'jest-preset-angular/setup-jest';

8
jest.config.js
View File

@ -1,9 +1,3 @@
module.exports = {
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
transform: {
'^.+\\.(ts|js|html)$': 'ts-jest'
},
resolver: '@nrwl/jest/plugins/resolver',
moduleFileExtensions: ['ts', 'js', 'html'],
coverageReporters: ['html']
projects: ['<rootDir>/apps/red-ui', '<rootDir>/libs/red-ui-http', '<rootDir>/libs/red-cache']
};

11
jest.preset.js Normal file
View File

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

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

@ -1,18 +1,19 @@
module.exports = {
name: 'red-cache',
preset: '../../jest.config.js',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
astTransformers: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer']
astTransformers: { before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer'] },
tsconfig: '<rootDir>/tsconfig.spec.json'
}
},
coverageDirectory: '../../coverage/libs/red-cache',
displayName: 'red-cache',
snapshotSerializers: [
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
'jest-preset-angular/build/AngularSnapshotSerializer.js',
'jest-preset-angular/build/HTMLCommentSerializer.js'
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment'
]
};

19
libs/red-ui-http/jest.config.js Normal file
View File

@ -0,0 +1,19 @@
module.exports = {
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
stringifyContentPathRegex: '\\.(html|svg)$',
astTransformers: { before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer'] },
tsconfig: '<rootDir>/tsconfig.spec.json'
}
},
coverageDirectory: '../../coverage/libs/red-ui-http',
displayName: 'red-ui-http',
snapshotSerializers: [
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment'
]
};

208
package.json
View File

@ -1,107 +1,107 @@
{
"name": "redaction",
"version": "2.26.0",
"private": true,
"license": "MIT",
"scripts": {
"affected": "nx affected",
"affected:apps": "nx affected:apps",
"affected:build": "nx affected:build",
"affected:dep-graph": "nx affected:dep-graph",
"affected:e2e": "nx affected:e2e",
"affected:libs": "nx affected:libs",
"affected:lint": "nx affected:lint",
"affected:test": "nx affected:test",
"build": "nx build",
"build-lint-all": "ng lint --project=red-ui-http --fix && ng build --project=red-ui-http && ng lint --project=red-ui --fix && ng build --project=red-ui --prod",
"dep-graph": "nx dep-graph",
"e2e": "nx e2e",
"format": "nx format:write",
"format:check": "nx format:check",
"format:write": "nx format:write",
"help": "nx help",
"postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
"lint": "nx workspace-lint && nx lint",
"nx": "nx",
"start": "nx serve",
"test": "nx test",
"update": "nx migrate latest",
"workspace-schematic": "nx workspace-schematic"
},
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged && ng lint --project=red-ui-http && ng lint --project=red-ui --fix"
"name": "redaction",
"version": "2.25.0",
"private": true,
"license": "MIT",
"scripts": {
"affected": "nx affected",
"affected:apps": "nx affected:apps",
"affected:build": "nx affected:build",
"affected:dep-graph": "nx affected:dep-graph",
"affected:e2e": "nx affected:e2e",
"affected:libs": "nx affected:libs",
"affected:lint": "nx affected:lint",
"affected:test": "nx affected:test",
"build": "nx build",
"build-lint-all": "ng lint --project=red-ui-http --fix && ng build --project=red-ui-http && ng lint --project=red-ui --fix && ng build --project=red-ui --prod",
"dep-graph": "nx dep-graph",
"e2e": "nx e2e",
"format": "nx format:write",
"format:check": "nx format:check",
"format:write": "nx format:write",
"help": "nx help",
"postinstall": "ngcc --properties es2015 browser module main",
"lint": "nx workspace-lint && nx lint",
"nx": "nx",
"start": "nx serve",
"test": "nx test",
"update": "nx migrate latest",
"workspace-generator": "nx workspace-generator"
},
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged && ng lint --project=red-ui-http && ng lint --project=red-ui --fix"
}
},
"dependencies": {
"@angular/animations": "11.2.13",
"@angular/cdk": "~11.2.12",
"@angular/common": "11.2.13",
"@angular/compiler": "11.2.13",
"@angular/core": "11.2.13",
"@angular/forms": "11.2.13",
"@angular/material": "~11.2.12",
"@angular/material-moment-adapter": "^11.2.12",
"@angular/platform-browser": "11.2.13",
"@angular/platform-browser-dynamic": "11.2.13",
"@angular/router": "11.2.13",
"@angular/service-worker": "11.2.13",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"@nrwl/angular": "12.1.1",
"@pdftron/webviewer": "7.3.0-20210223",
"@swimlane/ngx-charts": "^17.0.0",
"file-saver": "^2.0.2",
"jwt-decode": "^3.0.0",
"keycloak-angular": "^8.0.1",
"keycloak-js": "10.0.2",
"lint-staged": "^10.5.0",
"ng2-ace-editor": "^0.3.9",
"ngx-color-picker": "^10.1.0",
"ngx-toastr": "^13.0.0",
"papaparse": "^5.3.0",
"rxjs": "~6.6.0",
"scroll-into-view-if-needed": "^2.2.26",
"streamsaver": "^2.0.5",
"tslib": "^2.0.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1102.12",
"@angular/cli": "11.2.12",
"@angular/compiler-cli": "11.2.13",
"@angular/language-service": "11.2.13",
"@nrwl/cli": "12.1.1",
"@nrwl/cypress": "12.1.1",
"@nrwl/jest": "12.1.1",
"@nrwl/tao": "12.1.1",
"@nrwl/workspace": "12.1.1",
"@types/cypress": "^1.1.3",
"@types/jasmine": "3.6.11",
"@types/jest": "26.0.8",
"@types/node": "14.14.33",
"codelyzer": "6.0.2",
"cypress": "^5.6.0",
"cypress-file-upload": "^4.1.1",
"cypress-keycloak": "^1.5.0",
"cypress-keycloak-commands": "^1.2.0",
"cypress-localstorage-commands": "^1.2.4",
"dotenv": "8.2.0",
"eslint": "6.8.0",
"google-translate-api-browser": "^1.1.71",
"husky": "^4.3.0",
"jest": "26.2.2",
"jest-preset-angular": "8.4.0",
"lodash": "^4.17.20",
"moment": "^2.29.1",
"ng-packagr": "11.2.4",
"prettier": "2.2.1",
"pretty-quick": "^3.1.0",
"superagent": "^6.1.0",
"superagent-promise": "^1.1.0",
"ts-jest": "26.5.5",
"ts-node": "9.1.1",
"tslint": "6.1.3",
"typescript": "4.1.4"
}
},
"dependencies": {
"@angular/animations": "~11.0.1",
"@angular/cdk": "~11.0.1",
"@angular/common": "~11.0.1",
"@angular/compiler": "~11.0.1",
"@angular/core": "~11.0.1",
"@angular/forms": "~11.0.1",
"@angular/material": "~11.0.1",
"@angular/material-moment-adapter": "^11.0.2",
"@angular/platform-browser": "~11.0.1",
"@angular/platform-browser-dynamic": "~11.0.1",
"@angular/router": "~11.0.1",
"@angular/service-worker": "~11.0.1",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"@nrwl/angular": "^10.2.0",
"@pdftron/webviewer": "7.3.0-20210223",
"@swimlane/ngx-charts": "^17.0.0",
"file-saver": "^2.0.2",
"jwt-decode": "^3.0.0",
"keycloak-angular": "^8.0.1",
"keycloak-js": "10.0.2",
"lint-staged": "^10.5.0",
"ng2-ace-editor": "^0.3.9",
"ngx-color-picker": "^10.1.0",
"ngx-toastr": "^13.0.0",
"papaparse": "^5.3.0",
"rxjs": "~6.6.0",
"scroll-into-view-if-needed": "^2.2.26",
"streamsaver": "^2.0.5",
"tslib": "^2.0.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1100.2",
"@angular-devkit/build-ng-packagr": "~0.1002.0",
"@angular/cli": "~11.0.2",
"@angular/compiler": "~11.0.1",
"@angular/compiler-cli": "~11.0.1",
"@angular/language-service": "~11.0.2",
"@nrwl/cypress": "10.2.0",
"@nrwl/jest": "10.2.0",
"@nrwl/workspace": "10.2.0",
"@types/cypress": "^1.1.3",
"@types/jasmine": "~3.6.0",
"@types/jest": "26.0.8",
"@types/node": "^12.11.1",
"codelyzer": "^6.0.0",
"cypress": "^5.6.0",
"cypress-file-upload": "^4.1.1",
"cypress-keycloak": "^1.5.0",
"cypress-keycloak-commands": "^1.2.0",
"cypress-localstorage-commands": "^1.2.4",
"dotenv": "6.2.0",
"eslint": "6.8.0",
"google-translate-api-browser": "^1.1.71",
"husky": "^4.3.0",
"jest": "26.2.2",
"jest-preset-angular": "8.2.1",
"lodash": "^4.17.20",
"moment": "^2.29.1",
"ng-packagr": "^10.1.2",
"prettier": "2.0.4",
"pretty-quick": "^3.1.0",
"superagent": "^6.1.0",
"superagent-promise": "^1.1.0",
"ts-jest": "26.1.4",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~4.0.2"
}
}

3443
yarn.lock
View File

File diff suppressed because it is too large Load Diff