From 5d53661139756583abb5e8126202ed4e4be357c0 Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Thu, 16 Jul 2020 14:46:02 -0400 Subject: [PATCH] fix(repo): update the repo to nx 10 --- e2e/angular/jest.config.js | 1 + e2e/angular/tsconfig.json | 10 +- e2e/bazel/jest.config.js | 1 + e2e/bazel/tsconfig.json | 10 +- e2e/cli/jest.config.js | 1 + e2e/cli/tsconfig.json | 10 +- e2e/cypress/jest.config.js | 1 + e2e/cypress/tsconfig.json | 10 +- e2e/jest/jest.config.js | 1 + e2e/jest/tsconfig.json | 10 +- e2e/linter/jest.config.js | 1 + e2e/linter/tsconfig.json | 10 +- e2e/next/jest.config.js | 1 + e2e/next/tsconfig.json | 10 +- e2e/node/jest.config.js | 1 + e2e/node/tsconfig.json | 10 +- e2e/nx-plugin/jest.config.js | 1 + e2e/nx-plugin/tsconfig.json | 10 +- e2e/react/jest.config.js | 1 + e2e/react/tsconfig.json | 10 +- e2e/storybook/jest.config.js | 1 + e2e/storybook/tsconfig.json | 10 +- e2e/web/jest.config.js | 1 + e2e/web/tsconfig.json | 10 +- e2e/workspace/jest.config.js | 1 + e2e/workspace/tsconfig.json | 10 +- nx.json | 3 + package.json | 48 +-- packages/angular/jest.config.js | 3 +- packages/angular/tsconfig.json | 13 +- packages/bazel/jest.config.js | 3 +- packages/bazel/tsconfig.json | 13 +- packages/cli/jest.config.js | 3 +- packages/cli/tsconfig.json | 13 +- packages/create-nx-plugin/jest.config.js | 3 +- packages/create-nx-plugin/tsconfig.json | 13 +- packages/create-nx-workspace/jest.config.js | 3 +- packages/create-nx-workspace/tsconfig.json | 13 +- packages/cypress/jest.config.js | 3 +- packages/cypress/tsconfig.json | 13 +- packages/eslint-plugin-nx/jest.config.js | 3 +- packages/eslint-plugin-nx/tsconfig.json | 13 +- packages/express/jest.config.js | 3 +- packages/express/tsconfig.json | 13 +- packages/jest/jest.config.js | 3 +- packages/jest/tsconfig.json | 13 +- packages/linter/jest.config.js | 3 +- packages/linter/tsconfig.json | 13 +- packages/nest/jest.config.js | 3 +- packages/nest/tsconfig.json | 13 +- packages/next/jest.config.js | 3 +- packages/next/tsconfig.json | 13 +- packages/node/jest.config.js | 3 +- packages/node/tsconfig.json | 13 +- packages/nx-plugin/jest.config.js | 3 +- packages/nx-plugin/tsconfig.json | 13 +- packages/react/jest.config.js | 3 +- packages/react/tsconfig.json | 13 +- packages/storybook/jest.config.js | 3 +- packages/storybook/tsconfig.json | 13 +- packages/tao/jest.config.js | 1 + packages/tao/tsconfig.json | 13 +- packages/web/jest.config.js | 3 +- packages/web/tsconfig.json | 13 +- packages/workspace/jest.config.js | 1 + packages/workspace/tsconfig.json | 13 +- scripts/tsconfig.e2e.json | 2 +- scripts/tsconfig.scripts.json | 2 +- tsconfig.json => tsconfig.base.json | 0 workspace.json | 32 -- yarn.lock | 344 ++++++++++---------- 71 files changed, 563 insertions(+), 311 deletions(-) rename tsconfig.json => tsconfig.base.json (100%) diff --git a/e2e/angular/jest.config.js b/e2e/angular/jest.config.js index dbda9244ad..8236911c72 100644 --- a/e2e/angular/jest.config.js +++ b/e2e/angular/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/angular/tsconfig.json b/e2e/angular/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/angular/tsconfig.json +++ b/e2e/angular/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/bazel/jest.config.js b/e2e/bazel/jest.config.js index 91f237beeb..f9401b364f 100644 --- a/e2e/bazel/jest.config.js +++ b/e2e/bazel/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/bazel/tsconfig.json b/e2e/bazel/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/bazel/tsconfig.json +++ b/e2e/bazel/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/cli/jest.config.js b/e2e/cli/jest.config.js index 9cb84aa983..471ba68cb7 100644 --- a/e2e/cli/jest.config.js +++ b/e2e/cli/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/cli/tsconfig.json b/e2e/cli/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/cli/tsconfig.json +++ b/e2e/cli/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/cypress/jest.config.js b/e2e/cypress/jest.config.js index 5df5f35a57..6c53951297 100644 --- a/e2e/cypress/jest.config.js +++ b/e2e/cypress/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/cypress/tsconfig.json b/e2e/cypress/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/cypress/tsconfig.json +++ b/e2e/cypress/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/jest/jest.config.js b/e2e/jest/jest.config.js index f294612851..8432eb8b47 100644 --- a/e2e/jest/jest.config.js +++ b/e2e/jest/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/jest/tsconfig.json b/e2e/jest/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/jest/tsconfig.json +++ b/e2e/jest/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/linter/jest.config.js b/e2e/linter/jest.config.js index 15ef8709d1..febb8395ff 100644 --- a/e2e/linter/jest.config.js +++ b/e2e/linter/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/linter/tsconfig.json b/e2e/linter/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/linter/tsconfig.json +++ b/e2e/linter/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/next/jest.config.js b/e2e/next/jest.config.js index d4d80076b4..b412316757 100644 --- a/e2e/next/jest.config.js +++ b/e2e/next/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/next/tsconfig.json b/e2e/next/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/next/tsconfig.json +++ b/e2e/next/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/node/jest.config.js b/e2e/node/jest.config.js index ddab72480b..645e22f9b4 100644 --- a/e2e/node/jest.config.js +++ b/e2e/node/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/node/tsconfig.json b/e2e/node/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/node/tsconfig.json +++ b/e2e/node/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/nx-plugin/jest.config.js b/e2e/nx-plugin/jest.config.js index f6cef1508f..c08d112b09 100644 --- a/e2e/nx-plugin/jest.config.js +++ b/e2e/nx-plugin/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/nx-plugin/tsconfig.json b/e2e/nx-plugin/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/nx-plugin/tsconfig.json +++ b/e2e/nx-plugin/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/react/jest.config.js b/e2e/react/jest.config.js index 864bb10e2b..852ddfbcde 100644 --- a/e2e/react/jest.config.js +++ b/e2e/react/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/react/tsconfig.json b/e2e/react/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/react/tsconfig.json +++ b/e2e/react/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/storybook/jest.config.js b/e2e/storybook/jest.config.js index 32baa250d4..1cae026824 100644 --- a/e2e/storybook/jest.config.js +++ b/e2e/storybook/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/storybook/tsconfig.json b/e2e/storybook/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/storybook/tsconfig.json +++ b/e2e/storybook/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/web/jest.config.js b/e2e/web/jest.config.js index 2caca1f6ae..6a3635b4a2 100644 --- a/e2e/web/jest.config.js +++ b/e2e/web/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/web/tsconfig.json b/e2e/web/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/web/tsconfig.json +++ b/e2e/web/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/e2e/workspace/jest.config.js b/e2e/workspace/jest.config.js index b062c73f3b..1a412dcb9e 100644 --- a/e2e/workspace/jest.config.js +++ b/e2e/workspace/jest.config.js @@ -6,4 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/e2e/workspace/tsconfig.json b/e2e/workspace/tsconfig.json index e5decd5e2f..6d5abf8483 100644 --- a/e2e/workspace/tsconfig.json +++ b/e2e/workspace/tsconfig.json @@ -1,7 +1,13 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/nx.json b/nx.json index e73a721239..96a8a155a4 100644 --- a/nx.json +++ b/nx.json @@ -156,5 +156,8 @@ "tags": [], "implicitDependencies": ["workspace", "create-nx-workspace"] } + }, + "affected": { + "defaultBase": "master" } } diff --git a/package.json b/package.json index ce8a03ea93..03812dc791 100644 --- a/package.json +++ b/package.json @@ -22,24 +22,24 @@ "submit-plugin": "node ./scripts/submit-plugin.js" }, "devDependencies": { - "@angular-devkit/architect": "~0.1000.0", - "@angular-devkit/build-angular": "~0.1000.0", - "@angular-devkit/build-ng-packagr": "~0.1000.0", - "@angular-devkit/build-optimizer": "~0.1000.0", - "@angular-devkit/build-webpack": "~0.1000.0", - "@angular-devkit/core": "~10.0.0", - "@angular-devkit/schematics": "~10.0.0", - "@angular/cli": "~10.0.0", - "@angular/common": "^10.0.0", - "@angular/compiler": "^10.0.0", - "@angular/compiler-cli": "^10.0.0", - "@angular/core": "^10.0.0", - "@angular/forms": "^10.0.0", - "@angular/platform-browser": "^10.0.0", - "@angular/platform-browser-dynamic": "^10.0.0", - "@angular/router": "^10.0.0", - "@angular/service-worker": "^10.0.0", - "@angular/upgrade": "^10.0.0", + "@angular-devkit/architect": "0.1000.3", + "@angular-devkit/build-angular": "0.1000.3", + "@angular-devkit/build-ng-packagr": "0.1000.3", + "@angular-devkit/build-optimizer": "0.1000.3", + "@angular-devkit/build-webpack": "0.1000.3", + "@angular-devkit/core": "10.0.3", + "@angular-devkit/schematics": "10.0.3", + "@angular/cli": "10.0.3", + "@angular/common": "10.0.4", + "@angular/compiler": "10.0.4", + "@angular/compiler-cli": "10.0.4", + "@angular/core": "10.0.4", + "@angular/forms": "10.0.4", + "@angular/platform-browser": "10.0.4", + "@angular/platform-browser-dynamic": "10.0.4", + "@angular/router": "10.0.4", + "@angular/service-worker": "10.0.4", + "@angular/upgrade": "10.0.4", "@babel/core": "7.9.6", "@babel/plugin-proposal-class-properties": "7.8.3", "@babel/plugin-proposal-decorators": "7.8.3", @@ -62,16 +62,16 @@ "@ngrx/store": "9.1.0", "@ngrx/store-devtools": "9.1.0", "@ngtools/webpack": "~10.0.0", - "@nrwl/eslint-plugin-nx": "9.4.4", - "@nrwl/jest": "9.4.4", - "@nrwl/node": "9.4.4", - "@nrwl/workspace": "9.4.4", + "@nrwl/eslint-plugin-nx": "10.0.0-beta.4", + "@nrwl/jest": "10.0.0-beta.4", + "@nrwl/node": "10.0.0-beta.4", + "@nrwl/workspace": "10.0.0-beta.4", "@reduxjs/toolkit": "1.3.2", "@rollup/plugin-babel": "5.0.2", "@rollup/plugin-commonjs": "11.0.2", "@rollup/plugin-image": "2.0.4", "@rollup/plugin-node-resolve": "7.1.1", - "@schematics/angular": "~10.0.0", + "@schematics/angular": "10.0.3", "@storybook/addon-knobs": "5.3.9", "@storybook/angular": "5.3.9", "@storybook/core": "5.3.9", @@ -221,7 +221,7 @@ "tsickle": "^0.38.1", "tslib": "^1.9.3", "tslint": "6.0.0", - "typescript": "~3.9.3", + "typescript": "3.9.6", "url-loader": "^3.0.0", "verdaccio": "^4.4.2", "webpack": "4.42.0", diff --git a/packages/angular/jest.config.js b/packages/angular/jest.config.js index 17720d43c3..9b09f1c8ec 100644 --- a/packages/angular/jest.config.js +++ b/packages/angular/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'angular', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/angular/tsconfig.json b/packages/angular/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/angular/tsconfig.json +++ b/packages/angular/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/bazel/jest.config.js b/packages/bazel/jest.config.js index 17720d43c3..af8300a1c1 100644 --- a/packages/bazel/jest.config.js +++ b/packages/bazel/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'bazel', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/bazel/tsconfig.json b/packages/bazel/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/bazel/tsconfig.json +++ b/packages/bazel/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js index 17720d43c3..5d0990534a 100644 --- a/packages/cli/jest.config.js +++ b/packages/cli/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'cli', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/create-nx-plugin/jest.config.js b/packages/create-nx-plugin/jest.config.js index 17720d43c3..4e746eeadb 100644 --- a/packages/create-nx-plugin/jest.config.js +++ b/packages/create-nx-plugin/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'create-nx-plugin', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/create-nx-plugin/tsconfig.json b/packages/create-nx-plugin/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/create-nx-plugin/tsconfig.json +++ b/packages/create-nx-plugin/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/create-nx-workspace/jest.config.js b/packages/create-nx-workspace/jest.config.js index 17720d43c3..7a000f30cb 100644 --- a/packages/create-nx-workspace/jest.config.js +++ b/packages/create-nx-workspace/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'create-nx-workspace', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/create-nx-workspace/tsconfig.json b/packages/create-nx-workspace/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/create-nx-workspace/tsconfig.json +++ b/packages/create-nx-workspace/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/cypress/jest.config.js b/packages/cypress/jest.config.js index 17720d43c3..3a80259b46 100644 --- a/packages/cypress/jest.config.js +++ b/packages/cypress/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'cypress', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/cypress/tsconfig.json b/packages/cypress/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/cypress/tsconfig.json +++ b/packages/cypress/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/eslint-plugin-nx/jest.config.js b/packages/eslint-plugin-nx/jest.config.js index 17720d43c3..d46b94edc8 100644 --- a/packages/eslint-plugin-nx/jest.config.js +++ b/packages/eslint-plugin-nx/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'eslint-plugin-nx', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/eslint-plugin-nx/tsconfig.json b/packages/eslint-plugin-nx/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/eslint-plugin-nx/tsconfig.json +++ b/packages/eslint-plugin-nx/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/express/jest.config.js b/packages/express/jest.config.js index 17720d43c3..9780134abd 100644 --- a/packages/express/jest.config.js +++ b/packages/express/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'express', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/express/tsconfig.json b/packages/express/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/express/tsconfig.json +++ b/packages/express/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/jest/jest.config.js b/packages/jest/jest.config.js index 17720d43c3..94a01f8b7e 100644 --- a/packages/jest/jest.config.js +++ b/packages/jest/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'jest', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/jest/tsconfig.json b/packages/jest/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/jest/tsconfig.json +++ b/packages/jest/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/linter/jest.config.js b/packages/linter/jest.config.js index 17720d43c3..47a2c32269 100644 --- a/packages/linter/jest.config.js +++ b/packages/linter/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'linter', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/linter/tsconfig.json b/packages/linter/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/linter/tsconfig.json +++ b/packages/linter/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/nest/jest.config.js b/packages/nest/jest.config.js index 17720d43c3..fad76748f1 100644 --- a/packages/nest/jest.config.js +++ b/packages/nest/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'nest', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/nest/tsconfig.json b/packages/nest/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/nest/tsconfig.json +++ b/packages/nest/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/next/jest.config.js b/packages/next/jest.config.js index 17720d43c3..f93c1571b9 100644 --- a/packages/next/jest.config.js +++ b/packages/next/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'next', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/next/tsconfig.json b/packages/next/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/next/tsconfig.json +++ b/packages/next/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/node/jest.config.js b/packages/node/jest.config.js index 17720d43c3..2c981629d5 100644 --- a/packages/node/jest.config.js +++ b/packages/node/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'node', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/nx-plugin/jest.config.js b/packages/nx-plugin/jest.config.js index 17720d43c3..05d0b90b8e 100644 --- a/packages/nx-plugin/jest.config.js +++ b/packages/nx-plugin/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'nx-plugin', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/nx-plugin/tsconfig.json b/packages/nx-plugin/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/nx-plugin/tsconfig.json +++ b/packages/nx-plugin/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/react/jest.config.js b/packages/react/jest.config.js index 17720d43c3..249c458ef5 100644 --- a/packages/react/jest.config.js +++ b/packages/react/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'react', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/storybook/jest.config.js b/packages/storybook/jest.config.js index 17720d43c3..bc8d5ea827 100644 --- a/packages/storybook/jest.config.js +++ b/packages/storybook/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'storybook', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/storybook/tsconfig.json b/packages/storybook/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/storybook/tsconfig.json +++ b/packages/storybook/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/tao/jest.config.js b/packages/tao/jest.config.js index 17720d43c3..77b56eff8b 100644 --- a/packages/tao/jest.config.js +++ b/packages/tao/jest.config.js @@ -5,4 +5,5 @@ module.exports = { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/tao/tsconfig.json b/packages/tao/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/tao/tsconfig.json +++ b/packages/tao/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/web/jest.config.js b/packages/web/jest.config.js index 17720d43c3..d2e6f4fbbf 100644 --- a/packages/web/jest.config.js +++ b/packages/web/jest.config.js @@ -1,8 +1,9 @@ module.exports = { - name: 'tao', + name: 'web', preset: '../../jest.config.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/workspace/jest.config.js b/packages/workspace/jest.config.js index dd9aa067b2..626127c5a2 100644 --- a/packages/workspace/jest.config.js +++ b/packages/workspace/jest.config.js @@ -5,4 +5,5 @@ module.exports = { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, }; diff --git a/packages/workspace/tsconfig.json b/packages/workspace/tsconfig.json index e5decd5e2f..58bd2c97a6 100644 --- a/packages/workspace/tsconfig.json +++ b/packages/workspace/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"] }, - "include": ["**/*.ts"] + "include": [], + "files": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/scripts/tsconfig.e2e.json b/scripts/tsconfig.e2e.json index a62d6a42d7..dab6bb49d7 100644 --- a/scripts/tsconfig.e2e.json +++ b/scripts/tsconfig.e2e.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "outDir": "../build/e2e-out", "module": "commonjs", diff --git a/scripts/tsconfig.scripts.json b/scripts/tsconfig.scripts.json index 99e3a578db..522adc8e78 100644 --- a/scripts/tsconfig.scripts.json +++ b/scripts/tsconfig.scripts.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "outDir": "../scripts/tools-out", "module": "commonjs", diff --git a/tsconfig.json b/tsconfig.base.json similarity index 100% rename from tsconfig.json rename to tsconfig.base.json diff --git a/workspace.json b/workspace.json index d144a8271d..b697aebecd 100644 --- a/workspace.json +++ b/workspace.json @@ -11,7 +11,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/tao/jest.config.js", - "tsConfig": "packages/tao/tsconfig.spec.json", "passWithNoTests": true } }, @@ -90,7 +89,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/workspace/jest.config.js", - "tsConfig": "packages/workspace/tsconfig.spec.json", "passWithNoTests": true } }, @@ -159,7 +157,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/web/jest.config.js", - "tsConfig": "packages/web/tsconfig.spec.json", "passWithNoTests": true } }, @@ -228,7 +225,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/cypress/jest.config.js", - "tsConfig": "packages/cypress/tsconfig.spec.json", "passWithNoTests": true } }, @@ -292,7 +288,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/jest/jest.config.js", - "tsConfig": "packages/jest/tsconfig.spec.json", "passWithNoTests": true } }, @@ -356,7 +351,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/storybook/jest.config.js", - "tsConfig": "packages/storybook/tsconfig.spec.json", "passWithNoTests": true } }, @@ -420,7 +414,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/react/jest.config.js", - "tsConfig": "packages/react/tsconfig.spec.json", "passWithNoTests": true } }, @@ -487,7 +480,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/nx-plugin/jest.config.js", - "tsConfig": "packages/nx-plugin/tsconfig.spec.json", "passWithNoTests": true } }, @@ -551,7 +543,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/node/jest.config.js", - "tsConfig": "packages/node/tsconfig.spec.json", "passWithNoTests": true } }, @@ -615,7 +606,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/next/jest.config.js", - "tsConfig": "packages/next/tsconfig.spec.json", "passWithNoTests": true } }, @@ -684,7 +674,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/nest/jest.config.js", - "tsConfig": "packages/nest/tsconfig.spec.json", "passWithNoTests": true } }, @@ -748,7 +737,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/linter/jest.config.js", - "tsConfig": "packages/linter/tsconfig.spec.json", "passWithNoTests": true } }, @@ -812,7 +800,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/express/jest.config.js", - "tsConfig": "packages/express/tsconfig.spec.json", "passWithNoTests": true } }, @@ -876,7 +863,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/eslint-plugin-nx/jest.config.js", - "tsConfig": "packages/eslint-plugin-nx/tsconfig.spec.json", "passWithNoTests": true } }, @@ -940,7 +926,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/create-nx-workspace/jest.config.js", - "tsConfig": "packages/create-nx-workspace/tsconfig.spec.json", "passWithNoTests": true } }, @@ -1007,7 +992,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/create-nx-plugin/jest.config.js", - "tsConfig": "packages/create-nx-plugin/tsconfig.spec.json", "passWithNoTests": true } }, @@ -1074,7 +1058,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/cli/jest.config.js", - "tsConfig": "packages/cli/tsconfig.spec.json", "passWithNoTests": true } }, @@ -1141,7 +1124,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/bazel/jest.config.js", - "tsConfig": "packages/bazel/tsconfig.spec.json", "passWithNoTests": true } }, @@ -1205,7 +1187,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "packages/angular/jest.config.js", - "tsConfig": "packages/angular/tsconfig.spec.json", "passWithNoTests": true } }, @@ -1284,7 +1265,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/cli/jest.config.js", - "tsConfig": "e2e/cli/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1301,7 +1281,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/angular/jest.config.js", - "tsConfig": "e2e/angular/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1318,7 +1297,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/bazel/jest.config.js", - "tsConfig": "e2e/bazel/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1335,7 +1313,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/cypress/jest.config.js", - "tsConfig": "e2e/cypress/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1352,7 +1329,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/jest/jest.config.js", - "tsConfig": "e2e/jest/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1369,7 +1345,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/linter/jest.config.js", - "tsConfig": "e2e/linter/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1386,7 +1361,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/next/jest.config.js", - "tsConfig": "e2e/next/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1403,7 +1377,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/node/jest.config.js", - "tsConfig": "e2e/node/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1420,7 +1393,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/react/jest.config.js", - "tsConfig": "e2e/react/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1437,7 +1409,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/storybook/jest.config.js", - "tsConfig": "e2e/storybook/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1454,7 +1425,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/web/jest.config.js", - "tsConfig": "e2e/web/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1471,7 +1441,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/workspace/jest.config.js", - "tsConfig": "e2e/workspace/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } @@ -1488,7 +1457,6 @@ "builder": "@nrwl/jest:jest", "options": { "jestConfig": "e2e/nx-plugin/jest.config.js", - "tsConfig": "e2e/nx-plugin/tsconfig.spec.json", "passWithNoTests": true, "runInBand": true } diff --git a/yarn.lock b/yarn.lock index 626447f97b..66ab033ddf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -53,23 +53,23 @@ "@angular-devkit/core" "10.0.1" rxjs "6.5.5" -"@angular-devkit/architect@0.901.10", "@angular-devkit/architect@~0.901.0": - version "0.901.10" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.901.10.tgz#46d896124bed90df71e06d04d610d9d1d9c4f249" - integrity sha512-JRYT5wBLe0zb1VoQIVV/Q6RmwW1whYMb4wx9LwEFvux6qzaHit/xaWV2xCIarZzM/LR3fOwk2bQjkRrS4/yJfg== +"@angular-devkit/architect@0.1000.3": + version "0.1000.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1000.3.tgz#f23ea9d370edac8b0dd979d2574b12aa9923c3d4" + integrity sha512-8ZszTAkRvGGMXERFvyLT6SJPfJXjNNfHamA76uDPTBXy+EijJ1XVTUr1+SYEe73E4ovtxqxAnsApEFxS7/Ni5w== dependencies: - "@angular-devkit/core" "9.1.10" - rxjs "6.5.4" + "@angular-devkit/core" "10.0.3" + rxjs "6.5.5" -"@angular-devkit/build-angular@~0.1000.0": - version "0.1000.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1000.1.tgz#8073c8826763b6e0d2e5f2dcb21d55be11ce6937" - integrity sha512-rRYtHzy27BM3XjPVqlpQOs+RXAgtiT1Qr6EiLiMcb8Twg4aWHzKF+IITLQL9CSYkpOnY40vHjWZuEVu0qIhEPQ== +"@angular-devkit/build-angular@0.1000.3": + version "0.1000.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1000.3.tgz#c5af97a1868adb2d0be9cb97e5d8b3c3c8428d4d" + integrity sha512-r3KJj39AwkYYzbixSM095l4fOGvhyByr0XvmAEu0l5dGGdL4tNXywvgXkNhEVRDo0jZYpTMegiTqzOik/9YCDw== dependencies: - "@angular-devkit/architect" "0.1000.1" - "@angular-devkit/build-optimizer" "0.1000.1" - "@angular-devkit/build-webpack" "0.1000.1" - "@angular-devkit/core" "10.0.1" + "@angular-devkit/architect" "0.1000.3" + "@angular-devkit/build-optimizer" "0.1000.3" + "@angular-devkit/build-webpack" "0.1000.3" + "@angular-devkit/core" "10.0.3" "@babel/core" "7.9.6" "@babel/generator" "7.9.6" "@babel/plugin-transform-runtime" "7.9.6" @@ -77,7 +77,7 @@ "@babel/runtime" "7.9.6" "@babel/template" "7.8.6" "@jsdevtools/coverage-istanbul-loader" "3.0.3" - "@ngtools/webpack" "10.0.1" + "@ngtools/webpack" "10.0.3" ajv "6.12.2" autoprefixer "9.8.0" babel-loader "8.1.0" @@ -132,25 +132,34 @@ webpack-subresource-integrity "1.4.1" worker-plugin "4.0.3" -"@angular-devkit/build-ng-packagr@~0.1000.0": - version "0.1000.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.1000.1.tgz#60e1143866ca000d3e7a9e46d3bcd3f918160276" - integrity sha512-y8w1DPtBp/mW12JJnKYx/56cMG8m4g7XHllsDvYuxHZ0XW3iqA967DKsE0xcyYBMn84yKybgqyibZVKZiXNTIA== +"@angular-devkit/build-ng-packagr@0.1000.3": + version "0.1000.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.1000.3.tgz#b9f10e6e1fcc821c7b35a07903f6f7e6e3f41f97" + integrity sha512-k5dEjx8g+ZLLwlViue7931PNxbAbePJ1NdAmXodg2U0W4l5g22egiUFG1DGsMm7p/3LlZGv3q9Kwdg8Ox1acVg== dependencies: - "@angular-devkit/architect" "0.1000.1" + "@angular-devkit/architect" "0.1000.3" rxjs "6.5.5" -"@angular-devkit/build-optimizer@0.1000.1", "@angular-devkit/build-optimizer@~0.1000.0": - version "0.1000.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.1.tgz#2cb46c7b8fc4361d06244d50545b23e91e866c15" - integrity sha512-Q60lxyetBcMKUiNMc1vGUExuJMashHB9CF8HVenX80R9ihaA/GHAUrD2PbKBpLVoC4T291uUhfcA8MB1fJNRfw== +"@angular-devkit/build-optimizer@0.1000.3": + version "0.1000.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.3.tgz#05f7a853a5907ad3381a598896a2e053e47e925d" + integrity sha512-6mFoubg08UCWC0fE2mGoawEt2R1VlGStvUNAP2PRCjoj1ZySa1NnVYoKk65cyAAA3K2o7vSoDZesNq1uABjZbg== dependencies: loader-utils "2.0.0" source-map "0.7.3" tslib "2.0.0" webpack-sources "1.4.3" -"@angular-devkit/build-webpack@0.1000.1", "@angular-devkit/build-webpack@~0.1000.0": +"@angular-devkit/build-webpack@0.1000.3": + version "0.1000.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1000.3.tgz#2709ccfc5201c2be9301551ef1d815c6aafedfbc" + integrity sha512-+vmn9d9THFubSWS28K1+nElUfOrhT576ptVZMd0a5S24momV8loW3J8iBOBfnGal/P86ZCAyP46kSirlAzH9Jg== + dependencies: + "@angular-devkit/architect" "0.1000.3" + "@angular-devkit/core" "10.0.3" + rxjs "6.5.5" + +"@angular-devkit/build-webpack@~0.1000.0": version "0.1000.1" resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1000.1.tgz#c0e8208dfa52ca1743955c6ae96fb1d7685103e1" integrity sha512-m+abxD38LYdHw+w53Rmc4MbuwDP7rfevAZ/1QR2WFYj0BI5QsTYGlpmieI2TXiwiwvTILn9UzYZAA16nKvmUwA== @@ -159,15 +168,6 @@ "@angular-devkit/core" "10.0.1" rxjs "6.5.5" -"@angular-devkit/build-webpack@~0.901.0": - version "0.901.10" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.901.10.tgz#e66d62d1e0c30848f5c2bfc1c0c12cb30c4fc7ca" - integrity sha512-7rMH7vehVCTlP1y1h0rAKCYAksnDOWTUIjJ2mdfCvVy3CHrqcBMk68748bv3AOvNY6jzppHh8XD/SyMSh2cmzQ== - dependencies: - "@angular-devkit/architect" "0.901.10" - "@angular-devkit/core" "9.1.10" - rxjs "6.5.4" - "@angular-devkit/core@10.0.1", "@angular-devkit/core@~10.0.0": version "10.0.1" resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.0.1.tgz#acc1c6a088507e7340964c8cbf85e91781e86686" @@ -179,15 +179,15 @@ rxjs "6.5.5" source-map "0.7.3" -"@angular-devkit/core@9.1.10", "@angular-devkit/core@~9.1.0": - version "9.1.10" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.1.10.tgz#4b2f1d3c9889dbe60e3936e54a070ce678893d36" - integrity sha512-HPY/ifVqNd0Muh2RG1wyWQAxPhLgscDyhE5rBty6LVr7i5VwqJpSD5F0NTOemV8SXAyZ5orn1MVWO/TmL6ktrw== +"@angular-devkit/core@10.0.3": + version "10.0.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.0.3.tgz#7654766c9f2d3c510beaad8bca3e2a71643c6b8e" + integrity sha512-m27ogjq44j80x64RnEswSvy8UewUqeCVJBbEuY6fzrWoaiCf12sgPlrSCwjwfhtQrLgl1e/i9zYA7U6ulGRXyg== dependencies: - ajv "6.12.0" + ajv "6.12.2" fast-json-stable-stringify "2.1.0" magic-string "0.25.7" - rxjs "6.5.4" + rxjs "6.5.5" source-map "0.7.3" "@angular-devkit/core@9.1.7": @@ -201,12 +201,12 @@ rxjs "6.5.4" source-map "0.7.3" -"@angular-devkit/schematics@10.0.1", "@angular-devkit/schematics@~10.0.0": - version "10.0.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.1.tgz#2631043e7459c5d1228ffeba18eb63aa1e45f40e" - integrity sha512-lG70f4KsZews/z1npzJC7ccJgz3RXyLetyg+wa5uGWV+Silpr7XX+3U65DjPwG/+921woifeqRMbOhK+zCCaVA== +"@angular-devkit/schematics@10.0.3": + version "10.0.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.3.tgz#84e1a337692ba36cbae145b5e678592878df722f" + integrity sha512-TjA2ZSPCgUK9l4FiRTIQY7DceXMAvNzOMWffy9o3kv2HPtxG9kuBrQXk++Z99zpylK0cAsugV7t/5ANpUkrIiA== dependencies: - "@angular-devkit/core" "10.0.1" + "@angular-devkit/core" "10.0.3" ora "4.0.4" rxjs "6.5.5" @@ -219,25 +219,25 @@ ora "4.0.3" rxjs "6.5.4" -"@angular-devkit/schematics@~9.1.0": - version "9.1.10" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.1.10.tgz#3f9206a76f41bc1ba7df501373af3046de782f6d" - integrity sha512-rMNK2/cWSWhTB35nu9oxPyr130qq/OGkRctAHHG8bGm4K6RH30bPTjbHNbo3L2dc3ZJLHoE9Y8uGMLrZ2XqtNQ== - dependencies: - "@angular-devkit/core" "9.1.10" - ora "4.0.3" - rxjs "6.5.4" - -"@angular/cli@~10.0.0": +"@angular-devkit/schematics@~10.0.0": version "10.0.1" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-10.0.1.tgz#23fd9e6495a89d7fe1bc756fdfb5af9c71bcaf26" - integrity sha512-6Ht3022UcaWTBDnQKgcvTHbOP4ITjzn1DcZWKN0+zKk4PNqOwWtOEF2CBokOG79gTQVdrp2p5YQo5uX6UG7KMQ== + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.1.tgz#2631043e7459c5d1228ffeba18eb63aa1e45f40e" + integrity sha512-lG70f4KsZews/z1npzJC7ccJgz3RXyLetyg+wa5uGWV+Silpr7XX+3U65DjPwG/+921woifeqRMbOhK+zCCaVA== dependencies: - "@angular-devkit/architect" "0.1000.1" "@angular-devkit/core" "10.0.1" - "@angular-devkit/schematics" "10.0.1" - "@schematics/angular" "10.0.1" - "@schematics/update" "0.1000.1" + ora "4.0.4" + rxjs "6.5.5" + +"@angular/cli@10.0.3": + version "10.0.3" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-10.0.3.tgz#0b8c5e263deaa63d05b6efda790a2000b8a24a85" + integrity sha512-ONK8YG20KuakQetY0lPKDAOA3uBoLurdpSfFspFkcECyDimwJYSEydi3FUnCxEexeoKvrQWcol+q+u9YPoHCyg== + dependencies: + "@angular-devkit/architect" "0.1000.3" + "@angular-devkit/core" "10.0.3" + "@angular-devkit/schematics" "10.0.3" + "@schematics/angular" "10.0.3" + "@schematics/update" "0.1000.3" "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.1" debug "4.1.1" @@ -254,17 +254,17 @@ universal-analytics "0.4.20" uuid "8.1.0" -"@angular/common@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-10.0.2.tgz#8d5422b3a3e1bc405606476b90b0caffc9c9155a" - integrity sha512-zpNB2XD6jinXZjfihoO5Q1Yg7urfpZTt/fitdmwFHCcQ/1qZ9T2BVh8+VqVRkh6Pjxmtvu0uPnJ1a/aZ5f9r9A== +"@angular/common@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-10.0.4.tgz#f585e0b1ef723bb96e54af831138184999490e3d" + integrity sha512-9DJMD8GgHz7i2fMz0f1IHZlDSIz83uE6fcH8SIq1iCSWT2dubRRpCX000VpIyhAgfkCgdNCYXQ7VGNsZceoagQ== dependencies: tslib "^2.0.0" -"@angular/compiler-cli@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-10.0.2.tgz#8f178a03989e0018890c52807df9e3e03faaf47a" - integrity sha512-LGX86k1hOyaw5aPCjFfoLuPhVLKMENOdCBeNBzZB+H2CUGHfv8OWFB1EzjZO1N07VGR7JoMx9ZWSP7ornhuS4Q== +"@angular/compiler-cli@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-10.0.4.tgz#b241f8d41ca01dfed67b5ed4928ab0f13e2879af" + integrity sha512-uZKk6Ab4Pw8qcaXhpORuEoCbPSHWx3TWcs9OXIKIhzOOoMMe9OSt2SzOkHCrySSaik1IhQODnHww7sGRw5mxwQ== dependencies: canonical-path "1.0.0" chokidar "^3.0.0" @@ -280,59 +280,59 @@ tslib "^2.0.0" yargs "15.3.0" -"@angular/compiler@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.0.2.tgz#1056af84ad76763f03228aa3a60b63a5cd775944" - integrity sha512-TNE5ESDlRCVneb/K62HOEgLpxuZZTlw8RcmOy5vt3SngEVc576OE/aYsEA6MCwTlqj16GLSS3jGm9HBJcBKUVw== +"@angular/compiler@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.0.4.tgz#786a5c1653a429233bee9f53614b5a82c62841ce" + integrity sha512-1rnEmSHJtrKC1QD+PyF36xwMnSqG4Slgi5+PYk3BxIa5vbWBibrYijtd/uCNhscfPSpfb06MVM2mRsrc+BmbQg== dependencies: tslib "^2.0.0" -"@angular/core@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.0.2.tgz#d2d2c2dd4a9e80dcccc63c274f13ab7397ee5a3b" - integrity sha512-r4M1D2NOdkmmFyvYLHRYSIBKTGNXQarZHDZcm5oEq2eTsRVe2u9MYIeOpHKeVQCQK7XKQVB13IZQP3XpUvljFg== +"@angular/core@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.0.4.tgz#700eda7711b50796298679d245e091cb54155071" + integrity sha512-lA8RDagJ/O0gUX95h00+nnUZs/1QmmhAVWVtHcuI12ueC836tJhLtPGnEx9ib9NXrgRyNwb8lO1xJPmmuQgdQQ== dependencies: tslib "^2.0.0" -"@angular/forms@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-10.0.2.tgz#fa443f73156640664a9e018aaeb42f85d6d20fcb" - integrity sha512-qnfApb5Q58SFdl8za8i6ijvP0UfVGxxTtIVnf8czVU5Jz5/KYDbPeChVw/aPl3hfXq8jt0Q6Yl99aAm/BNyhpQ== +"@angular/forms@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-10.0.4.tgz#d37fe47d5c91b0ef249066e904338905b2687847" + integrity sha512-SJSYZCfHua9fi/dks1q+ad9OGBblRUn3Q1V4B7r99fJYr39qRiIHcegikhY4h8H3Wk1bJRGJG7iXmxJhjWXK3Q== dependencies: tslib "^2.0.0" -"@angular/platform-browser-dynamic@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.2.tgz#b752e2110e5a4316087ce7922227b453e423c144" - integrity sha512-R1rt1/Ynm0DHgzMBcduCPoDg2y3MrYZVgT+N0DLobr2nCaVD74vGsJBVCRv7/m1sdCxyhPlOvq8Bm5sRauw2fw== +"@angular/platform-browser-dynamic@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.4.tgz#77844511154eeb5eec5e68566767c215654f34e8" + integrity sha512-RoUMqYhUwF6+Mvk/aH0IZQ1D0SDEi9k5EZlx9CJ3RvNuKygk7to+S4vMWVpGxFQlwdS3bytRLKi+Kki6f4nLkg== dependencies: tslib "^2.0.0" -"@angular/platform-browser@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-10.0.2.tgz#518db3bdff9692cc4ec0c871f3305218da66aebd" - integrity sha512-FLS3fYSuWvrDc7PiVCvs4joWZZxDe9+alJi90Sub1oBS/EnxmZpkS0Gr7zQv4MjAvVhNCVoTzL3CaV/SIoZqaw== +"@angular/platform-browser@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-10.0.4.tgz#58131215e414be7ee9d4024e47f61b4a02166b28" + integrity sha512-iaZ8pFS5XUgPCO6/C47TzSFPzlzgleayq099cVOOx9z0t/SwUCSKt4AdAVhyQ8RTnx6l1JmmwBgRaXpScZlqzg== dependencies: tslib "^2.0.0" -"@angular/router@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-10.0.2.tgz#6514540f4f3179d8be3fd23b1f4a0dd02801a314" - integrity sha512-IcA3W+r5T0NC8TM4J9F0VOxG0wr7nJOSef6Qek6utZd6ByLlXxOhBrPIC5Ou+QNZeg9OuI2FBt6coea9jgmNOA== +"@angular/router@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-10.0.4.tgz#d68c2711b53f3bdc1508d9b7e90b181b4e09f42c" + integrity sha512-iDLWdmltU5pZ6M/fBKC5Kg2o9Aqb1YJ+oHXFu186BQAl2RNeNCmMQ0VaCxjpMgD/MoSxpuRuGQ6rRrCSFCxtcQ== dependencies: tslib "^2.0.0" -"@angular/service-worker@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-10.0.2.tgz#1414f4b7721a45c97c9a3efc6b7516453643d55d" - integrity sha512-PXbh5k7yba+X18o2nNqST92Mcsq+5CXDaYIwUcUkYhx1omAMHhYF9W+FFJSY/EhW2yx5x4aRoh9ZmOqldsQB9A== +"@angular/service-worker@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-10.0.4.tgz#a244ab83da9207a7a147786bdfdc3ef8c35e82e6" + integrity sha512-KbjDiE49f/GRKm0Q162BRxfGaFLQSWmV+hCis5PNu4ag0kP/TYgPxabiSTc02R3Tom0mIRF3Q07DxNtnOkg0Hg== dependencies: tslib "^2.0.0" -"@angular/upgrade@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-10.0.2.tgz#c860a709628b4ef543d19ae25003e1c0e5c844a0" - integrity sha512-cz9M5t1oiB3j9rIKF+UynmWtjsBxj7edqQAgnOptgwne0gsQJ1LSxKV9J2D+BJFdh+ywo9OpABzVvPQ6zS9lkQ== +"@angular/upgrade@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-10.0.4.tgz#52f3f134f29e73ce57345dbfacb55dfdc6e998b1" + integrity sha512-+T0COdUcPFhDFLBSyJg6ceFqZyyCv74rPOtptWmiW+Ldx7Y79CwX+wTywrIg2pl9U/xyFBst0fOxVP5MpQunKQ== dependencies: tslib "^2.0.0" @@ -2215,7 +2215,17 @@ resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-9.1.0.tgz#1339716a34e2b389979d25464bb32b0dba799557" integrity sha512-Ah2nApPZXTvKl7ybaFMIFwEdMg8b7PvIKATigbDTUftAsFxked2+T7blNv6aCgSfEqbOVMBTYPk7OsLCYZoz4Q== -"@ngtools/webpack@10.0.1", "@ngtools/webpack@~10.0.0": +"@ngtools/webpack@10.0.3": + version "10.0.3" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-10.0.3.tgz#2f8b2674108f7c36ffcdfc9e9aa024abfe3c7e04" + integrity sha512-0TuvYMCLtsApLtCHXeDBYGEoAQXzsRLpgFxPM5W7CGcj0ecthZO4NYrMAt+J8ky//KmbxqQSFHWmss2cbirIPA== + dependencies: + "@angular-devkit/core" "10.0.3" + enhanced-resolve "4.1.1" + rxjs "6.5.5" + webpack-sources "1.4.3" + +"@ngtools/webpack@~10.0.0": version "10.0.1" resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-10.0.1.tgz#f3d5143f268cc1c3c8d94de0e048b970c95e6a27" integrity sha512-/uUTczGcH2WJoVovCLHXdPdTzN0yQZontcf5MkoDjlA0selUdRFntV9cnUWoray9SVxzgoHqjRxBANCTsiiuuw== @@ -2258,51 +2268,51 @@ dependencies: mkdirp "^1.0.4" -"@nrwl/cli@9.4.4": - version "9.4.4" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-9.4.4.tgz#831f0afa0c0407b0cf0bf74489c47ae8c4312a47" - integrity sha512-aZ5FgFwFgbSL36h+qUxJyDScG/x6bcvbm1nRe7Ck2u9LQt+lVQFXSU3r2sCQa4DuEaiVX8O1CmW2fTSynuhs/g== +"@nrwl/cli@10.0.0-beta.4": + version "10.0.0-beta.4" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-10.0.0-beta.4.tgz#1d9037ca17a4a11e869d028fcfa075e32ea8576c" + integrity sha512-fYDFtNEhSqD8qbereNAPxSJcJX9Hb8LZpptwW96AmnIfv3zGm0s3KPgC63EnyMAUTFvquWYzw7rCJYjBmbGkOw== dependencies: - "@nrwl/tao" "9.4.4" + "@nrwl/tao" "10.0.0-beta.4" chalk "2.4.2" tmp "0.0.33" yargs "^11.0.0" yargs-parser "10.0.0" -"@nrwl/eslint-plugin-nx@9.4.4": - version "9.4.4" - resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-9.4.4.tgz#8a16bcf5db2f093f9031fd6e8479f5faa0db94eb" - integrity sha512-MOqfVT9bhet/fD06pdfmkKs9599K4ZscWiD6ZsLyTfNF9Ltw9EDOQPDSm5L/rQUwCtXupLAVQc8kPZtW1o89Fg== +"@nrwl/eslint-plugin-nx@10.0.0-beta.4": + version "10.0.0-beta.4" + resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-10.0.0-beta.4.tgz#6beb99a3a5c46f4777b8cc6c89ce60d1de641e28" + integrity sha512-Y90UncTw6tjLNVqNin8vR6ulj3OYzn3YZcfy99+TNpg7TvIxSZWqk/IoC6R968apmXQPHxNbSYWyRUFCtakrBw== dependencies: "@typescript-eslint/experimental-utils" "^2.19.2" -"@nrwl/jest@9.4.4": - version "9.4.4" - resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-9.4.4.tgz#cf9f00231087a57a016600dd466c2dc4dad5b1c9" - integrity sha512-t3LEL/WMjUs8jo47Ze3ed3LG2+dpa5wB1wtIWD0diVSWdYLxrP9oKWjLwn1wtDOuyViD+QNx+Phc3K1T34CmYA== +"@nrwl/jest@10.0.0-beta.4": + version "10.0.0-beta.4" + resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-10.0.0-beta.4.tgz#8ea67c8ef577158e30d20df3e508222b11658799" + integrity sha512-yvhjHKO3WtephIqrZbbCsZgYxyugv2s7lCVg4+62vncexqk177RUUOkpw8pGa6PFCtG7YTbOgpRGGjdk1lmYTA== dependencies: - "@angular-devkit/architect" "~0.901.0" - "@angular-devkit/core" "~9.1.0" - "@angular-devkit/schematics" "~9.1.0" + "@angular-devkit/architect" "~0.1000.0" + "@angular-devkit/core" "~10.0.0" + "@angular-devkit/schematics" "~10.0.0" -"@nrwl/linter@9.4.4": - version "9.4.4" - resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-9.4.4.tgz#cd078157d74e2e1b08b31ccc55e54e236f59d574" - integrity sha512-ZcnDRUjw2WmwIl/Ff2nGq6XcQ9KEBC/ZSya+ZRj9V+/Xzegd6wbEH3Gf1XW2zzZZvrEyn3t2Vv/AGdXQEqTu+w== +"@nrwl/linter@10.0.0-beta.4": + version "10.0.0-beta.4" + resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-10.0.0-beta.4.tgz#6730a6bd33d2c6e61f6cb71985ce256bfc30daaa" + integrity sha512-qx27n78+pGGCp7XI6gE10u9KNxgear7BA1sdzkVphFs/lMMEa/SVfJ1PZNfOmMUcVGtkTR16ziivXCs/mpS5pQ== dependencies: - "@angular-devkit/architect" "~0.901.0" + "@angular-devkit/architect" "~0.1000.0" -"@nrwl/node@9.4.4": - version "9.4.4" - resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-9.4.4.tgz#c0c4a4dafbfb69d23424f392c698661cb14db314" - integrity sha512-2DCDGRfiiG6yCkpLtQNEPBkeE8hr09halP3vau81FvuRjuC3HDMwrm0CBXM20PW44qjfBdIuwqzdmY1mUcMzXw== +"@nrwl/node@10.0.0-beta.4": + version "10.0.0-beta.4" + resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-10.0.0-beta.4.tgz#1c4deacb02a83633fa728d97f56c681702be2c9a" + integrity sha512-CA8FHnAbhyrcxipGcP21PutEA1mAq3iRAlJ6rMqESXx4gyIwsakagHfkEJ4B4NIQv1HWL4lzdqcpRM/++Kj/Uw== dependencies: - "@angular-devkit/architect" "~0.901.0" - "@angular-devkit/build-webpack" "~0.901.0" - "@angular-devkit/core" "~9.1.0" - "@angular-devkit/schematics" "~9.1.0" - "@nrwl/jest" "9.4.4" - "@nrwl/linter" "9.4.4" + "@angular-devkit/architect" "~0.1000.0" + "@angular-devkit/build-webpack" "~0.1000.0" + "@angular-devkit/core" "~10.0.0" + "@angular-devkit/schematics" "~10.0.0" + "@nrwl/jest" "10.0.0-beta.4" + "@nrwl/linter" "10.0.0-beta.4" circular-dependency-plugin "5.2.0" copy-webpack-plugin "5.1.1" fork-ts-checker-webpack-plugin "^3.1.1" @@ -2325,33 +2335,31 @@ node-machine-id "^1.1.12" tar "5.0.5" -"@nrwl/tao@9.4.4": - version "9.4.4" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-9.4.4.tgz#505b7149e8aa120097b12d9184903604a6a84992" - integrity sha512-VNThg52ZKEwbVCxkXPZvSeNt9bxF4C8TH+QVhLYoExPjxsSOMBTk/N8iganpNhMlkwAvw0AIMhC99v7yQjyrMg== +"@nrwl/tao@10.0.0-beta.4": + version "10.0.0-beta.4" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-10.0.0-beta.4.tgz#a0b053abcebc5c391d7e928357e0fe8a65a5f87e" + integrity sha512-CBTTkzjwqQ/DoDHC/1YHtBbhYEbMBfKrKbDxvjSWniP6nImHbEd2xkAOo6t0ZH7SXZgdmJ7Ie2hwF7V9Q/mXbA== dependencies: - "@angular-devkit/architect" "~0.901.0" - "@angular-devkit/core" "~9.1.0" - "@angular-devkit/schematics" "~9.1.0" - fast-levenshtein "2.0.6" + "@angular-devkit/architect" "~0.1000.0" + "@angular-devkit/core" "~10.0.0" + "@angular-devkit/schematics" "~10.0.0" inquirer "^6.3.1" minimist "^1.2.0" strip-json-comments "2.0.1" -"@nrwl/workspace@9.4.4": - version "9.4.4" - resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-9.4.4.tgz#faf69b078f42078e62e2b20dcdc268b919d2e8c0" - integrity sha512-hyAicJKJU4P4gkhyj+6oLz3ih6QK2SHt4WesTg5VYcqK1Nzw3MNvh+79EwjJL5TRyzmwHKmH27q6qAVSGg5Mow== +"@nrwl/workspace@10.0.0-beta.4": + version "10.0.0-beta.4" + resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-10.0.0-beta.4.tgz#cd33a9dfd09fd33bd239c90ee24f0a98f459bdc5" + integrity sha512-dk3psrDyFm3pRko8k7cXVsn7jA65JmRtvRwOE2kR3TLdhqh/0xHFy8Eeh3eO+g6mdAGn0Y1tut/0lKztDab9qg== dependencies: - "@angular-devkit/core" "~9.1.0" - "@angular-devkit/schematics" "~9.1.0" - "@nrwl/cli" "9.4.4" + "@angular-devkit/core" "~10.0.0" + "@angular-devkit/schematics" "~10.0.0" + "@nrwl/cli" "10.0.0-beta.4" axios "0.19.2" chalk "2.4.2" cosmiconfig "4.0.0" dotenv "8.2.0" fs-extra "6.0.0" - hasha "5.1.0" ignore "5.0.4" npm-run-all "4.1.5" opn "^5.3.0" @@ -2491,21 +2499,21 @@ dependencies: any-observable "^0.3.0" -"@schematics/angular@10.0.1", "@schematics/angular@~10.0.0": - version "10.0.1" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-10.0.1.tgz#0660d5eb99169a67ecfc7a4c2946de1ea32320c0" - integrity sha512-SrWr2FzenwuofRpcaLhzJYNFVJmJwKxlKu32dWAVnclpteMO0Hnp/jVI/e70HIc6zoWzgJ4yArmwBTA+Q26yaA== +"@schematics/angular@10.0.3": + version "10.0.3" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-10.0.3.tgz#a4d54389918a7f9c82345d4f639d930f22b62c6b" + integrity sha512-Or2pCqjpPbAvmbxtfMosGwQbNbSL4xodK5Key7678ZAPGB+rcxrVkBI9yxEJ/qzF/LrmMoKqy0JCmVLK7Grpog== dependencies: - "@angular-devkit/core" "10.0.1" - "@angular-devkit/schematics" "10.0.1" + "@angular-devkit/core" "10.0.3" + "@angular-devkit/schematics" "10.0.3" -"@schematics/update@0.1000.1": - version "0.1000.1" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1000.1.tgz#bcccf6822eb2b145a0ac3d1b352ada2925a558bf" - integrity sha512-AiU3RiKMfzxquzxANgDMO88iTkk9pVKQ5fZV4UwiyZO5q/fUCW4FFx9h4Nc7e9adchM+VaCz/uEAWqrVdsPv9Q== +"@schematics/update@0.1000.3": + version "0.1000.3" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1000.3.tgz#d361f23ae49cd3ac9b547b6f4c2470d7ca86aabd" + integrity sha512-Nncdklmzi1tyzkoAh7GlSslxriRhftlmfqPVmFHrrPRttYACtT/QH5qcWsrPgTPpHGINYEHrPjpeljsMoMchBQ== dependencies: - "@angular-devkit/core" "10.0.1" - "@angular-devkit/schematics" "10.0.1" + "@angular-devkit/core" "10.0.3" + "@angular-devkit/schematics" "10.0.3" "@yarnpkg/lockfile" "1.1.0" ini "1.3.5" npm-package-arg "^8.0.0" @@ -9861,7 +9869,7 @@ fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@2.x, fast-json-stab resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@2.0.6, fast-levenshtein@~2.0.6: +fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -11111,14 +11119,6 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -hasha@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.1.0.tgz#dd05ccdfcfe7dab626247ce2a58efe461922f4ca" - integrity sha512-OFPDWmzPN1l7atOV1TgBVmNtBxaIysToK6Ve9DK+vT6pYuklw/nPNT+HJbZi0KDcI6vWB+9tgvZ5YD7fA3CXcA== - dependencies: - is-stream "^2.0.0" - type-fest "^0.8.0" - hast-util-parse-selector@^2.0.0: version "2.2.4" resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz#60c99d0b519e12ab4ed32e58f150ec3f61ed1974" @@ -20772,7 +20772,7 @@ type-fest@^0.6.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== -type-fest@^0.8.0, type-fest@^0.8.1: +type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== @@ -20812,7 +20812,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@~3.9.3: +typescript@3.9.6: version "3.9.6" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a" integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==