diff --git a/.eslintrc b/.eslintrc.json similarity index 75% rename from .eslintrc rename to .eslintrc.json index 55287f919d..e66bccaf9a 100644 --- a/.eslintrc +++ b/.eslintrc.json @@ -11,10 +11,9 @@ }, "ignorePatterns": ["**/*.ts"], "plugins": ["@typescript-eslint", "@nrwl/nx"], - "extends": [ - ], + "extends": [], "rules": { + "@typescript-eslint/explicit-module-boundary-types": "off" }, - "overrides": [ - ] + "overrides": [] } diff --git a/e2e/angular/jest.config.js b/e2e/angular/jest.config.js index 8236911c72..91f6b81505 100644 --- a/e2e/angular/jest.config.js +++ b/e2e/angular/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'angular', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-angular', }; diff --git a/e2e/bazel/jest.config.js b/e2e/bazel/jest.config.js index f9401b364f..5937e43cc7 100644 --- a/e2e/bazel/jest.config.js +++ b/e2e/bazel/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'bazel', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-bazel', }; diff --git a/e2e/cli/jest.config.js b/e2e/cli/jest.config.js index 471ba68cb7..80ea217aac 100644 --- a/e2e/cli/jest.config.js +++ b/e2e/cli/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'cli', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-cli', }; diff --git a/e2e/cypress/jest.config.js b/e2e/cypress/jest.config.js index 6c53951297..41b597b471 100644 --- a/e2e/cypress/jest.config.js +++ b/e2e/cypress/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'cypress', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-cypress', }; diff --git a/e2e/jest/jest.config.js b/e2e/jest/jest.config.js index 8432eb8b47..4ef73deb2b 100644 --- a/e2e/jest/jest.config.js +++ b/e2e/jest/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'jest', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-jest', }; diff --git a/e2e/linter/jest.config.js b/e2e/linter/jest.config.js index febb8395ff..816ca40333 100644 --- a/e2e/linter/jest.config.js +++ b/e2e/linter/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'linter', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-linter', }; diff --git a/e2e/next/jest.config.js b/e2e/next/jest.config.js index b412316757..20df9ab064 100644 --- a/e2e/next/jest.config.js +++ b/e2e/next/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'next', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-next', }; diff --git a/e2e/node/jest.config.js b/e2e/node/jest.config.js index 645e22f9b4..c938f163aa 100644 --- a/e2e/node/jest.config.js +++ b/e2e/node/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'node', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-node', }; diff --git a/e2e/nx-plugin/jest.config.js b/e2e/nx-plugin/jest.config.js index c08d112b09..95357dd492 100644 --- a/e2e/nx-plugin/jest.config.js +++ b/e2e/nx-plugin/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'nx-plugin', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-nx-plugin', }; diff --git a/e2e/react/jest.config.js b/e2e/react/jest.config.js index 852ddfbcde..d27fed803b 100644 --- a/e2e/react/jest.config.js +++ b/e2e/react/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'react', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-react', }; diff --git a/e2e/storybook/jest.config.js b/e2e/storybook/jest.config.js index 1cae026824..ebba572b5a 100644 --- a/e2e/storybook/jest.config.js +++ b/e2e/storybook/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'storybook', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-storybook', }; diff --git a/e2e/web/jest.config.js b/e2e/web/jest.config.js index 6a3635b4a2..4804f561c2 100644 --- a/e2e/web/jest.config.js +++ b/e2e/web/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'web', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-web', }; diff --git a/e2e/workspace/jest.config.js b/e2e/workspace/jest.config.js index 1a412dcb9e..717c548053 100644 --- a/e2e/workspace/jest.config.js +++ b/e2e/workspace/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'workspace', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], maxWorkers: 1, globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'e2e-workspace', }; diff --git a/jest.config.js b/jest.config.js index 2acbaf21bc..566ab60200 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,10 +1,23 @@ module.exports = { - testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'], - transform: { - '^.+\\.(ts|js|html)$': 'ts-jest', - }, - resolver: '../../scripts/patched-jest-resolver.js', - moduleFileExtensions: ['ts', 'js', 'html'], - coverageReporters: ['html'], - maxWorkers: 2, + projects: [ + '/packages/tao', + '/packages/workspace', + '/packages/web', + '/packages/cypress', + '/packages/jest', + '/packages/storybook', + '/packages/react', + '/packages/nx-plugin', + '/packages/node', + '/packages/next', + '/packages/nest', + '/packages/linter', + '/packages/express', + '/packages/eslint-plugin-nx', + '/packages/create-nx-workspace', + '/packages/create-nx-plugin', + '/packages/cli', + '/packages/bazel', + '/packages/angular', + ], }; diff --git a/jest.preset.js b/jest.preset.js new file mode 100644 index 0000000000..92e603ac2e --- /dev/null +++ b/jest.preset.js @@ -0,0 +1,12 @@ +const nxPreset = require('@nrwl/jest/preset'); +module.exports = { + ...nxPreset, + testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'], + transform: { + '^.+\\.(ts|js|html)$': 'ts-jest', + }, + resolver: '../../scripts/patched-jest-resolver.js', + moduleFileExtensions: ['ts', 'js', 'html'], + coverageReporters: ['html'], + maxWorkers: 2, +}; diff --git a/nx.json b/nx.json index 1060526d78..fcabe30363 100644 --- a/nx.json +++ b/nx.json @@ -8,7 +8,8 @@ }, "tsconfig.base.json": "*", "tslint.json": "*", - "nx.json": "*" + "nx.json": "*", + ".eslintrc.json": "*" }, "tasksRunnerOptions": { "default": { diff --git a/package.json b/package.json index c88570909a..d17f766ce7 100644 --- a/package.json +++ b/package.json @@ -64,11 +64,12 @@ "@ngrx/store": "9.1.0", "@ngrx/store-devtools": "9.1.0", "@ngtools/webpack": "~10.1.3", - "@nrwl/eslint-plugin-nx": "10.2.1-beta.1", - "@nrwl/jest": "10.2.1-beta.1", - "@nrwl/node": "10.2.1-beta.1", - "@nrwl/nx-cloud": "^10.1.6", - "@nrwl/workspace": "10.2.1-beta.1", + "@nrwl/cli": "10.3.0-rc.3", + "@nrwl/eslint-plugin-nx": "10.3.0-rc.3", + "@nrwl/jest": "10.3.0-rc.3", + "@nrwl/node": "10.3.0-rc.3", + "@nrwl/nx-cloud": "10.1.6", + "@nrwl/workspace": "10.3.0-rc.3", "@reduxjs/toolkit": "1.3.2", "@rollup/plugin-babel": "5.0.2", "@rollup/plugin-commonjs": "11.0.2", @@ -220,7 +221,7 @@ "terser-webpack-plugin": "2.3.1", "tmp": "0.0.33", "tree-kill": "1.2.2", - "ts-jest": "26.1.4", + "ts-jest": "26.4.0", "ts-loader": "5.4.5", "ts-node": "^8.0.2", "tsconfig-paths-webpack-plugin": "3.2.0", @@ -253,5 +254,6 @@ "hooks": { "pre-push": "yarn check-commit && yarn documentation && pretty-quick --check" } - } + }, + "dependencies": {} } diff --git a/packages/angular/.eslintrc b/packages/angular/.eslintrc.json similarity index 100% rename from packages/angular/.eslintrc rename to packages/angular/.eslintrc.json diff --git a/packages/angular/jest.config.js b/packages/angular/jest.config.js index 9b09f1c8ec..75d31a5263 100644 --- a/packages/angular/jest.config.js +++ b/packages/angular/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'angular', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'angular', }; diff --git a/packages/bazel/.eslintrc b/packages/bazel/.eslintrc.json similarity index 100% rename from packages/bazel/.eslintrc rename to packages/bazel/.eslintrc.json diff --git a/packages/bazel/jest.config.js b/packages/bazel/jest.config.js index af8300a1c1..7e05bfb4af 100644 --- a/packages/bazel/jest.config.js +++ b/packages/bazel/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'bazel', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'bazel', }; diff --git a/packages/cli/.eslintrc b/packages/cli/.eslintrc.json similarity index 100% rename from packages/cli/.eslintrc rename to packages/cli/.eslintrc.json diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js index 5d0990534a..cb958ede14 100644 --- a/packages/cli/jest.config.js +++ b/packages/cli/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'cli', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'cli', }; diff --git a/packages/create-nx-plugin/.eslintrc b/packages/create-nx-plugin/.eslintrc.json similarity index 100% rename from packages/create-nx-plugin/.eslintrc rename to packages/create-nx-plugin/.eslintrc.json diff --git a/packages/create-nx-plugin/jest.config.js b/packages/create-nx-plugin/jest.config.js index 4e746eeadb..1ec7225bf5 100644 --- a/packages/create-nx-plugin/jest.config.js +++ b/packages/create-nx-plugin/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'create-nx-plugin', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'create-nx-plugin', }; diff --git a/packages/create-nx-workspace/.eslintrc b/packages/create-nx-workspace/.eslintrc.json similarity index 100% rename from packages/create-nx-workspace/.eslintrc rename to packages/create-nx-workspace/.eslintrc.json diff --git a/packages/create-nx-workspace/jest.config.js b/packages/create-nx-workspace/jest.config.js index 7a000f30cb..79062ca720 100644 --- a/packages/create-nx-workspace/jest.config.js +++ b/packages/create-nx-workspace/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'create-nx-workspace', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'create-nx-workspace', }; diff --git a/packages/cypress/.eslintrc b/packages/cypress/.eslintrc.json similarity index 100% rename from packages/cypress/.eslintrc rename to packages/cypress/.eslintrc.json diff --git a/packages/cypress/jest.config.js b/packages/cypress/jest.config.js index 3a80259b46..13140ed28f 100644 --- a/packages/cypress/jest.config.js +++ b/packages/cypress/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'cypress', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'cypress', }; diff --git a/packages/eslint-plugin-nx/.eslintrc b/packages/eslint-plugin-nx/.eslintrc.json similarity index 100% rename from packages/eslint-plugin-nx/.eslintrc rename to packages/eslint-plugin-nx/.eslintrc.json diff --git a/packages/eslint-plugin-nx/jest.config.js b/packages/eslint-plugin-nx/jest.config.js index d46b94edc8..9801a3ddef 100644 --- a/packages/eslint-plugin-nx/jest.config.js +++ b/packages/eslint-plugin-nx/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'eslint-plugin-nx', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'eslint-plugin-nx', }; diff --git a/packages/eslint-plugin-nx/tests/test-helper.ts b/packages/eslint-plugin-nx/tests/test-helper.ts deleted file mode 100644 index cd5cd229b8..0000000000 --- a/packages/eslint-plugin-nx/tests/test-helper.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { TSESLint } from '@typescript-eslint/experimental-utils'; -import * as path from 'path'; - -const parser = '@typescript-eslint/parser'; - -type RuleTesterConfig = Exclude & { - parser: typeof parser; -}; - -export class RuleTester extends TSESLint.RuleTester { - private filename: string | undefined = undefined; - - // as of eslint 6 you have to provide an absolute path to the parser - // but that's not as clean to type, this saves us trying to manually enforce - // that contributors require.resolve everything - constructor(options: RuleTesterConfig) { - super({ - ...options, - parser: require.resolve(options.parser), - }); - - if (options.parserOptions && options.parserOptions.project) { - this.filename = path.join(getFixturesRootDir(), 'file.ts'); - } - } - - // as of eslint 6 you have to provide an absolute path to the parser - // If you don't do that at the test level, the test will fail somewhat cryptically... - // This is a lot more explicit - run>( - name: string, - rule: TSESLint.RuleModule, - tests: TSESLint.RunTests - ): void { - const errorMessage = `Do not set the parser at the test level unless you want to use a parser other than ${parser}`; - - if (this.filename) { - tests.valid = tests.valid.map((test) => { - if (typeof test === 'string') { - return { - code: test, - filename: this.filename, - }; - } - return test; - }); - } - - tests.valid.forEach((test) => { - if (typeof test !== 'string') { - if (test.parser === parser) { - throw new Error(errorMessage); - } - if (!test.filename) { - test.filename = this.filename; - } - } - }); - tests.invalid.forEach((test) => { - if (test.parser === parser) { - throw new Error(errorMessage); - } - if (!test.filename) { - test.filename = this.filename; - } - }); - - super.run(name, rule, tests); - } -} - -function getFixturesRootDir() { - return path.join(process.cwd(), 'tests/fixtures/'); -} diff --git a/packages/express/.eslintrc b/packages/express/.eslintrc.json similarity index 100% rename from packages/express/.eslintrc rename to packages/express/.eslintrc.json diff --git a/packages/express/jest.config.js b/packages/express/jest.config.js index 9780134abd..a6ab3486ab 100644 --- a/packages/express/jest.config.js +++ b/packages/express/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'express', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'express', }; diff --git a/packages/jest/.eslintrc b/packages/jest/.eslintrc.json similarity index 100% rename from packages/jest/.eslintrc rename to packages/jest/.eslintrc.json diff --git a/packages/jest/jest.config.js b/packages/jest/jest.config.js index 94a01f8b7e..bba87a4dd1 100644 --- a/packages/jest/jest.config.js +++ b/packages/jest/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'jest', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'jest', }; diff --git a/packages/linter/.eslintrc b/packages/linter/.eslintrc.json similarity index 100% rename from packages/linter/.eslintrc rename to packages/linter/.eslintrc.json diff --git a/packages/linter/jest.config.js b/packages/linter/jest.config.js index 47a2c32269..99d78bc409 100644 --- a/packages/linter/jest.config.js +++ b/packages/linter/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'linter', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'linter', }; diff --git a/packages/nest/.eslintrc b/packages/nest/.eslintrc.json similarity index 100% rename from packages/nest/.eslintrc rename to packages/nest/.eslintrc.json diff --git a/packages/nest/jest.config.js b/packages/nest/jest.config.js index fad76748f1..fb3fca9202 100644 --- a/packages/nest/jest.config.js +++ b/packages/nest/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'nest', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'nest', }; diff --git a/packages/next/.eslintrc b/packages/next/.eslintrc.json similarity index 100% rename from packages/next/.eslintrc rename to packages/next/.eslintrc.json diff --git a/packages/next/jest.config.js b/packages/next/jest.config.js index f93c1571b9..5045a99c96 100644 --- a/packages/next/jest.config.js +++ b/packages/next/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'next', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'next', }; diff --git a/packages/node/.eslintrc b/packages/node/.eslintrc.json similarity index 100% rename from packages/node/.eslintrc rename to packages/node/.eslintrc.json diff --git a/packages/node/jest.config.js b/packages/node/jest.config.js index 2c981629d5..a3236377a0 100644 --- a/packages/node/jest.config.js +++ b/packages/node/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'node', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'node', }; diff --git a/packages/nx-plugin/.eslintrc b/packages/nx-plugin/.eslintrc.json similarity index 100% rename from packages/nx-plugin/.eslintrc rename to packages/nx-plugin/.eslintrc.json diff --git a/packages/nx-plugin/jest.config.js b/packages/nx-plugin/jest.config.js index 05d0b90b8e..3aca9da12c 100644 --- a/packages/nx-plugin/jest.config.js +++ b/packages/nx-plugin/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'nx-plugin', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'nx-plugin', }; diff --git a/packages/nx/.eslintrc b/packages/nx/.eslintrc.json similarity index 100% rename from packages/nx/.eslintrc rename to packages/nx/.eslintrc.json diff --git a/packages/react/.eslintrc b/packages/react/.eslintrc.json similarity index 100% rename from packages/react/.eslintrc rename to packages/react/.eslintrc.json diff --git a/packages/react/jest.config.js b/packages/react/jest.config.js index 249c458ef5..6a1d703f67 100644 --- a/packages/react/jest.config.js +++ b/packages/react/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'react', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'react', }; diff --git a/packages/storybook/.eslintrc b/packages/storybook/.eslintrc.json similarity index 100% rename from packages/storybook/.eslintrc rename to packages/storybook/.eslintrc.json diff --git a/packages/storybook/jest.config.js b/packages/storybook/jest.config.js index 1086355ddf..cfe6ffa402 100644 --- a/packages/storybook/jest.config.js +++ b/packages/storybook/jest.config.js @@ -1,6 +1,5 @@ module.exports = { - name: 'storybook', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -8,4 +7,5 @@ module.exports = { globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' }, }, + displayName: 'storybook', }; diff --git a/packages/tao/.eslintrc b/packages/tao/.eslintrc.json similarity index 100% rename from packages/tao/.eslintrc rename to packages/tao/.eslintrc.json diff --git a/packages/tao/jest.config.js b/packages/tao/jest.config.js index 77b56eff8b..1031fc8c3a 100644 --- a/packages/tao/jest.config.js +++ b/packages/tao/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'tao', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'tao', }; diff --git a/packages/web/.eslintrc b/packages/web/.eslintrc.json similarity index 100% rename from packages/web/.eslintrc rename to packages/web/.eslintrc.json diff --git a/packages/web/jest.config.js b/packages/web/jest.config.js index d2e6f4fbbf..d22cd6ab6c 100644 --- a/packages/web/jest.config.js +++ b/packages/web/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'web', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'web', }; diff --git a/packages/workspace/.eslintrc b/packages/workspace/.eslintrc.json similarity index 100% rename from packages/workspace/.eslintrc rename to packages/workspace/.eslintrc.json diff --git a/packages/workspace/jest.config.js b/packages/workspace/jest.config.js index 626127c5a2..c92eb4a378 100644 --- a/packages/workspace/jest.config.js +++ b/packages/workspace/jest.config.js @@ -1,9 +1,9 @@ module.exports = { - name: 'workspace', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'workspace', }; diff --git a/workspace.json b/workspace.json index 7f2d7532a2..95bb9b8970 100644 --- a/workspace.json +++ b/workspace.json @@ -56,15 +56,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/nx/.eslintrc", - "tsConfig": [ - "packages/nx/tsconfig.lib.json", - "packages/nx/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/nx/**/*.ts", + "packages/nx/**/*.spec.ts", + "packages/nx/**/*_spec.ts", + "packages/nx/**/*.spec.tsx", + "packages/nx/**/*.spec.js", + "packages/nx/**/*.spec.jsx", + "packages/nx/**/*.d.ts" + ] } } } @@ -134,15 +136,16 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/tao/.eslintrc", - "tsConfig": [ - "packages/tao/tsconfig.lib.json", - "packages/tao/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/tao/**/*.ts", + "packages/tao/**/*.spec.ts", + "packages/tao/**/*.spec.tsx", + "packages/tao/**/*.spec.js", + "packages/tao/**/*.spec.jsx", + "packages/tao/**/*.d.ts" + ] } } } @@ -214,15 +217,16 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/workspace/.eslintrc", - "tsConfig": [ - "packages/workspace/tsconfig.lib.json", - "packages/workspace/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/workspace/**/*.ts", + "packages/workspace/**/*.spec.ts", + "packages/workspace/**/*.spec.tsx", + "packages/workspace/**/*.spec.js", + "packages/workspace/**/*.spec.jsx", + "packages/workspace/**/*.d.ts" + ] } } } @@ -294,15 +298,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/web/.eslintrc", - "tsConfig": [ - "packages/web/tsconfig.lib.json", - "packages/web/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/web/**/*.ts", + "packages/web/**/*.spec.ts", + "packages/web/**/*_spec.ts", + "packages/web/**/*.spec.tsx", + "packages/web/**/*.spec.js", + "packages/web/**/*.spec.jsx", + "packages/web/**/*.d.ts" + ] } } } @@ -369,15 +375,16 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/cypress/.eslintrc", - "tsConfig": [ - "packages/cypress/tsconfig.lib.json", - "packages/cypress/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/cypress/**/*.ts", + "packages/cypress/**/*.spec.ts", + "packages/cypress/**/*.spec.tsx", + "packages/cypress/**/*.spec.js", + "packages/cypress/**/*.spec.jsx", + "packages/cypress/**/*.d.ts" + ] } } } @@ -444,15 +451,16 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/jest/.eslintrc", - "tsConfig": [ - "packages/jest/tsconfig.lib.json", - "packages/jest/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/jest/**/*.ts", + "packages/jest/**/*.spec.ts", + "packages/jest/**/*.spec.tsx", + "packages/jest/**/*.spec.js", + "packages/jest/**/*.spec.jsx", + "packages/jest/**/*.d.ts" + ] } } } @@ -529,15 +537,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/storybook/.eslintrc", - "tsConfig": [ - "packages/storybook/tsconfig.lib.json", - "packages/storybook/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/storybook/**/*.ts", + "packages/storybook/**/*.spec.ts", + "packages/storybook/**/*_spec.ts", + "packages/storybook/**/*.spec.tsx", + "packages/storybook/**/*.spec.js", + "packages/storybook/**/*.spec.jsx", + "packages/storybook/**/*.d.ts" + ] } } } @@ -607,15 +617,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/react/.eslintrc", - "tsConfig": [ - "packages/react/tsconfig.lib.json", - "packages/react/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/react/**/*.ts", + "packages/react/**/*.spec.ts", + "packages/react/**/*_spec.ts", + "packages/react/**/*.spec.tsx", + "packages/react/**/*.spec.js", + "packages/react/**/*.spec.jsx", + "packages/react/**/*.d.ts" + ] } } } @@ -682,15 +694,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/nx-plugin/.eslintrc", - "tsConfig": [ - "packages/nx-plugin/tsconfig.lib.json", - "packages/nx-plugin/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/nx-plugin/**/*.ts", + "packages/nx-plugin/**/*.spec.ts", + "packages/nx-plugin/**/*_spec.ts", + "packages/nx-plugin/**/*.spec.tsx", + "packages/nx-plugin/**/*.spec.js", + "packages/nx-plugin/**/*.spec.jsx", + "packages/nx-plugin/**/*.d.ts" + ] } } } @@ -757,15 +771,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/node/.eslintrc", - "tsConfig": [ - "packages/node/tsconfig.lib.json", - "packages/node/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/node/**/*.ts", + "packages/node/**/*.spec.ts", + "packages/node/**/*_spec.ts", + "packages/node/**/*.spec.tsx", + "packages/node/**/*.spec.js", + "packages/node/**/*.spec.jsx", + "packages/node/**/*.d.ts" + ] } } } @@ -837,15 +853,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/next/.eslintrc", - "tsConfig": [ - "packages/next/tsconfig.lib.json", - "packages/next/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/next/**/*.ts", + "packages/next/**/*.spec.ts", + "packages/next/**/*_spec.ts", + "packages/next/**/*.spec.tsx", + "packages/next/**/*.spec.js", + "packages/next/**/*.spec.jsx", + "packages/next/**/*.d.ts" + ] } } } @@ -912,15 +930,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/nest/.eslintrc", - "tsConfig": [ - "packages/nest/tsconfig.lib.json", - "packages/nest/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/nest/**/*.ts", + "packages/nest/**/*.spec.ts", + "packages/nest/**/*_spec.ts", + "packages/nest/**/*.spec.tsx", + "packages/nest/**/*.spec.js", + "packages/nest/**/*.spec.jsx", + "packages/nest/**/*.d.ts" + ] } } } @@ -987,15 +1007,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/linter/.eslintrc", - "tsConfig": [ - "packages/linter/tsconfig.lib.json", - "packages/linter/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/linter/**/*.ts", + "packages/linter/**/*.spec.ts", + "packages/linter/**/*_spec.ts", + "packages/linter/**/*.spec.tsx", + "packages/linter/**/*.spec.js", + "packages/linter/**/*.spec.jsx", + "packages/linter/**/*.d.ts" + ] } } } @@ -1062,15 +1084,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/express/.eslintrc", - "tsConfig": [ - "packages/express/tsconfig.lib.json", - "packages/express/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/express/**/*.ts", + "packages/express/**/*.spec.ts", + "packages/express/**/*_spec.ts", + "packages/express/**/*.spec.tsx", + "packages/express/**/*.spec.js", + "packages/express/**/*.spec.jsx", + "packages/express/**/*.d.ts" + ] } } } @@ -1137,15 +1161,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/eslint-plugin-nx/.eslintrc", - "tsConfig": [ - "packages/eslint-plugin-nx/tsconfig.lib.json", - "packages/eslint-plugin-nx/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/eslint-plugin-nx/**/*.ts", + "packages/eslint-plugin-nx/**/*.spec.ts", + "packages/eslint-plugin-nx/**/*_spec.ts", + "packages/eslint-plugin-nx/**/*.spec.tsx", + "packages/eslint-plugin-nx/**/*.spec.js", + "packages/eslint-plugin-nx/**/*.spec.jsx", + "packages/eslint-plugin-nx/**/*.d.ts" + ] } } } @@ -1215,15 +1241,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/create-nx-workspace/.eslintrc", - "tsConfig": [ - "packages/create-nx-workspace/tsconfig.lib.json", - "packages/create-nx-workspace/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/create-nx-workspace/**/*.ts", + "packages/create-nx-workspace/**/*.spec.ts", + "packages/create-nx-workspace/**/*_spec.ts", + "packages/create-nx-workspace/**/*.spec.tsx", + "packages/create-nx-workspace/**/*.spec.js", + "packages/create-nx-workspace/**/*.spec.jsx", + "packages/create-nx-workspace/**/*.d.ts" + ] } } } @@ -1293,15 +1321,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/create-nx-plugin/.eslintrc", - "tsConfig": [ - "packages/create-nx-plugin/tsconfig.lib.json", - "packages/create-nx-plugin/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/create-nx-plugin/**/*.ts", + "packages/create-nx-plugin/**/*.spec.ts", + "packages/create-nx-plugin/**/*_spec.ts", + "packages/create-nx-plugin/**/*.spec.tsx", + "packages/create-nx-plugin/**/*.spec.js", + "packages/create-nx-plugin/**/*.spec.jsx", + "packages/create-nx-plugin/**/*.d.ts" + ] } } } @@ -1371,15 +1401,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/cli/.eslintrc", - "tsConfig": [ - "packages/cli/tsconfig.lib.json", - "packages/cli/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/cli/**/*.ts", + "packages/cli/**/*.spec.ts", + "packages/cli/**/*_spec.ts", + "packages/cli/**/*.spec.tsx", + "packages/cli/**/*.spec.js", + "packages/cli/**/*.spec.jsx", + "packages/cli/**/*.d.ts" + ] } } } @@ -1398,15 +1430,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/bazel/.eslintrc", - "tsConfig": [ - "packages/bazel/tsconfig.lib.json", - "packages/bazel/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/bazel/**/*.ts", + "packages/bazel/**/*.spec.ts", + "packages/bazel/**/*_spec.ts", + "packages/bazel/**/*.spec.tsx", + "packages/bazel/**/*.spec.js", + "packages/bazel/**/*.spec.jsx", + "packages/bazel/**/*.d.ts" + ] } } } @@ -1481,15 +1515,17 @@ } }, "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "config": "packages/angular/.eslintrc", - "tsConfig": [ - "packages/angular/tsconfig.lib.json", - "packages/angular/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "packages/angular/**/*.ts", + "packages/angular/**/*.spec.ts", + "packages/angular/**/*_spec.ts", + "packages/angular/**/*.spec.tsx", + "packages/angular/**/*.spec.js", + "packages/angular/**/*.spec.jsx", + "packages/angular/**/*.d.ts" + ] } } } diff --git a/yarn.lock b/yarn.lock index 27510208a4..fceb84b4b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -53,14 +53,6 @@ dependencies: cross-fetch "3.0.5" -"@angular-devkit/architect@0.1000.1", "@angular-devkit/architect@~0.1000.0": - version "0.1000.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1000.1.tgz#6ca8529d888b3f5fc1f28863bb744855b67b811e" - integrity sha512-GpoJ+p38feerxwfpJgrjwv/2c47qIX+TMdfKVqbswxLnzK21hXjd0zn6UfovAFwLeL1hRu2O00NDsmQn01gdoA== - dependencies: - "@angular-devkit/core" "10.0.1" - rxjs "6.5.5" - "@angular-devkit/architect@0.1001.3", "@angular-devkit/architect@~0.1001.3": version "0.1001.3" resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1001.3.tgz#168aa424be9d0dad90d1a03129c3999fbf76a1cc" @@ -168,26 +160,6 @@ "@angular-devkit/core" "10.1.3" rxjs "6.6.2" -"@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== - dependencies: - "@angular-devkit/architect" "0.1000.1" - "@angular-devkit/core" "10.0.1" - rxjs "6.5.5" - -"@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" - integrity sha512-AXsxN00zbixi/9HyzzsDGm6rtMferxKfhG8WPJfp/0TLeJrmiLs5wdNjk8LhfTZABSTYx/QxRgOI6OnBoXePgg== - dependencies: - ajv "6.12.2" - fast-json-stable-stringify "2.1.0" - magic-string "0.25.7" - rxjs "6.5.5" - source-map "0.7.3" - "@angular-devkit/core@10.1.3", "@angular-devkit/core@~10.1.3": version "10.1.3" resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.1.3.tgz#48776a87253b40f6005b14413e089a1fee6b7227" @@ -228,15 +200,6 @@ ora "4.0.3" rxjs "6.5.4" -"@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== - dependencies: - "@angular-devkit/core" "10.0.1" - ora "4.0.4" - rxjs "6.5.5" - "@angular/cli@~10.1.3": version "10.1.3" resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-10.1.3.tgz#188f99583814e97727787869065d228c1b1f4407" @@ -2445,6 +2408,17 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@jest/types@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71" + integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + "@jsdevtools/coverage-istanbul-loader@3.0.5": version "3.0.5" resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz#2a4bc65d0271df8d4435982db4af35d81754ee26" @@ -2656,70 +2630,70 @@ node-gyp "^6.1.0" read-package-json-fast "^1.1.3" -"@nrwl/cli@10.2.1-beta.1": - version "10.2.1-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-10.2.1-beta.1.tgz#6885b41fb16d1dcc1487f3146b35fc6868b1c718" - integrity sha512-BN4D1qh6yuF9Js+0dPxwOAkQZaNDsIYSm3Iw3CUjFR31KslwUZcAxgfRq9PdFIdXT2M4ZT9Sjr/mGCaw+ad/FA== +"@nrwl/cli@10.3.0-rc.3": + version "10.3.0-rc.3" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-10.3.0-rc.3.tgz#54cf7a2a8981b763aced39376645c5975bb5fbab" + integrity sha512-zgsUzlX1AuaSyfvNOB/yHzXxFEuCUmtGsiHSnUIYqIBBuxXbfaSG50aBwKh1q16R4CTgTk0PSv9VeClH8/diyw== dependencies: - "@nrwl/tao" "10.2.1-beta.1" + "@nrwl/tao" "10.3.0-rc.3" chalk "2.4.2" tmp "0.0.33" yargs "15.4.1" yargs-parser "20.0.0" -"@nrwl/eslint-plugin-nx@10.2.1-beta.1": - version "10.2.1-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-10.2.1-beta.1.tgz#b1ffa532a51b38100c51b55b5ad26d285acaa967" - integrity sha512-g893PisWTNb4PsnOtF7Inw7+KMoxJnEPG3Nt9LClTYpOBdDoWba82BfzJPG9JlciUFB5sqfJRZMQq9oDqq1X0Q== +"@nrwl/eslint-plugin-nx@10.3.0-rc.3": + version "10.3.0-rc.3" + resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-10.3.0-rc.3.tgz#d0826f23f97a76a96dc528f598c4a1d45cf4d01d" + integrity sha512-E/sDY/EGgvs/zejFQ0paTdY7RxYyCWOeAZs0SV7Dv4TC4wICcF8E+wHWbHok7+tF7CGV3EFQJA/Y36zKBrfs9Q== dependencies: - "@angular-devkit/core" "~10.0.0" - "@typescript-eslint/experimental-utils" "^2.19.2" + "@angular-devkit/core" "~10.1.3" + "@typescript-eslint/experimental-utils" "^4.3.0" -"@nrwl/jest@10.2.1-beta.1": - version "10.2.1-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-10.2.1-beta.1.tgz#514bba6510388603000d7ed987b18a52403e6c38" - integrity sha512-+GsdJhWRGAFJzhJHy5prboS8fFAVrqIC/2QyAVnoF56xVUMYhfnak0exStkyDOnJkyw+hifa+Ipal4luCiNoYg== +"@nrwl/jest@10.3.0-rc.3": + version "10.3.0-rc.3" + resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-10.3.0-rc.3.tgz#948858407c976bead242bbea125f9ad2e1bb1698" + integrity sha512-jSMRNCeMaajIhOVDAV5ZMbFeCvBwAzemDkN5h/zSsnpYDjfkU2YLbAJcPGiOhq97NFdl3m0wwVcXs5AYYSSAcQ== dependencies: - "@angular-devkit/architect" "~0.1000.0" - "@angular-devkit/core" "~10.0.0" - "@angular-devkit/schematics" "~10.0.0" + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" rxjs "^6.5.4" -"@nrwl/linter@10.2.1-beta.1": - version "10.2.1-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-10.2.1-beta.1.tgz#7c443b4dc316de3dde83b9cf694c52f45aca12e5" - integrity sha512-qXDslRtvGbgPjC4rDXC0uVy2uj/GXgOThsp9fgrcaM/DwB8N/49kp+svquXNhlKAPZ2mAA+oLU63a8wunOe8VQ== +"@nrwl/linter@10.3.0-rc.3": + version "10.3.0-rc.3" + resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-10.3.0-rc.3.tgz#476deb8b482b8291c1d7863cc8bc0a14cc66d6ee" + integrity sha512-F8BRp2hEt+vof+0okwIOFsYuZe++iUj5jylkN9/7ChjnDDEniu51z3WrdTomLhYIq2995qX+QZ1//agq9H0AFQ== dependencies: - "@angular-devkit/architect" "~0.1000.0" + "@angular-devkit/architect" "~0.1001.3" glob "7.1.4" minimatch "3.0.4" tslib "^1.9.3" -"@nrwl/node@10.2.1-beta.1": - version "10.2.1-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-10.2.1-beta.1.tgz#4fb6e417aec790106b42ff67e801c1ceb4b9af41" - integrity sha512-B1gK4jnbKyKfAhc+Dn46xJr77B2Mqp5CuvsNOghyLWuM14lvYuY554BFKndFGwbVmOHGIdbdvGB2MqkFJbAidw== +"@nrwl/node@10.3.0-rc.3": + version "10.3.0-rc.3" + resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-10.3.0-rc.3.tgz#101d2c8598b2849409d6515fbec92cb4309fb7a9" + integrity sha512-2EbjunOYW7jepHDtOID+w5pBFeJX3aWhnei0Jw5bykRSWxriVdiPAmx3xgBzDBo7/b0gtiFjmt5Y0ju3HjZReg== dependencies: - "@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.2.1-beta.1" - "@nrwl/linter" "10.2.1-beta.1" + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/build-webpack" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" + "@nrwl/jest" "10.3.0-rc.3" + "@nrwl/linter" "10.3.0-rc.3" circular-dependency-plugin "5.2.0" copy-webpack-plugin "6.0.3" fork-ts-checker-webpack-plugin "^3.1.1" license-webpack-plugin "2.1.2" - source-map-support "0.5.12" + source-map-support "0.5.16" tree-kill "1.2.2" ts-loader "5.4.5" tsconfig-paths-webpack-plugin "3.2.0" webpack "4.42.0" - webpack-dev-server "3.9.0" + webpack-dev-server "3.11.0" webpack-merge "4.2.1" webpack-node-externals "1.7.2" -"@nrwl/nx-cloud@^10.1.6": +"@nrwl/nx-cloud@10.1.6": version "10.1.6" resolved "https://registry.yarnpkg.com/@nrwl/nx-cloud/-/nx-cloud-10.1.6.tgz#117da97562b1c60c17a25765d718d8e2963cf9ce" integrity sha512-m/B3gBojAl7UI0L/HJeAR9mbUOEIzNPuIndL0yoBrla/mpd5RatSf4VUsKHUD0X+ST8RYnwbfkXIkKO3HVf7tQ== @@ -2730,14 +2704,14 @@ tar "5.0.5" uuid "^3.3.3" -"@nrwl/tao@10.2.1-beta.1": - version "10.2.1-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-10.2.1-beta.1.tgz#63497e559f97ea330fa4225866575a61f2b14fa8" - integrity sha512-LVrR5qZVolyyg4L57Vo3jvh5bsZDxPc7RpPdVYhUROkywvgcJa24D99+2RUdIW/w87bc296DeMZjrG4gpBeh7A== +"@nrwl/tao@10.3.0-rc.3": + version "10.3.0-rc.3" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-10.3.0-rc.3.tgz#41bb5355d3842e2698ba31bae247c1bbe3cecae5" + integrity sha512-SnAxgTFZRbaNG+sQ7Iu4hcshKpiFu6m/pyFkkiZUphyZJJyDcfNDvobxwhdw6sQAeR5omju0jlDhLfktF9zx5A== dependencies: - "@angular-devkit/architect" "~0.1000.0" - "@angular-devkit/core" "~10.0.0" - "@angular-devkit/schematics" "~10.0.0" + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" inquirer "^6.3.1" minimist "^1.2.0" semver "6.3.0" @@ -2746,29 +2720,29 @@ tslib "^1.9.3" yargs-parser "20.0.0" -"@nrwl/workspace@10.2.1-beta.1": - version "10.2.1-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-10.2.1-beta.1.tgz#e46b7870e9189bfc118f9507f4074c22a1ec69d7" - integrity sha512-oYe7AomIrOsrLsvlnZBNjApcZUzG0r6bUSnp/E1++36oWLdaS+OsabwlhyxEDKRKSFdwXshAQfP1Gpads1YMZQ== +"@nrwl/workspace@10.3.0-rc.3": + version "10.3.0-rc.3" + resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-10.3.0-rc.3.tgz#b21820bce0561c9eaa8dd98b58950872ef4544d2" + integrity sha512-xyWI9kDq7uHMHM+s6OdWjeeRkx8YvfFiaTuPvoCAP0GM3RNNWStnVABHpFly9ypWza+VZHKnqDyYpsqCt8xskA== dependencies: - "@angular-devkit/architect" "~0.1000.0" - "@angular-devkit/core" "~10.0.0" - "@angular-devkit/schematics" "~10.0.0" - "@nrwl/cli" "10.2.1-beta.1" + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" + "@nrwl/cli" "10.3.0-rc.3" axios "0.19.2" chalk "2.4.2" - cosmiconfig "4.0.0" - dotenv "8.2.0" + cosmiconfig "^4.0.0" + dotenv "6.2.0" flat "^5.0.2" - fs-extra "6.0.0" - ignore "5.0.4" + fs-extra "7.0.1" + ignore "^5.0.4" inquirer "^6.3.1" minimatch "3.0.4" - npm-run-all "4.1.5" + npm-run-all "^4.1.5" opn "^5.3.0" resolve "1.17.0" rxjs "^6.5.4" - semver "5.4.1" + semver "6.3.0" strip-json-comments "2.0.1" tmp "0.0.33" tslib "^1.9.3" @@ -3681,6 +3655,13 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" +"@types/istanbul-reports@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" + integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + dependencies: + "@types/istanbul-lib-report" "*" + "@types/jasmine@*": version "3.5.11" resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.5.11.tgz#ba8e80639dffbe277f49c708b45373a320d158e2" @@ -3706,6 +3687,14 @@ jest-diff "^25.2.1" pretty-format "^25.2.1" +"@types/jest@26.x": + version "26.0.14" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz#078695f8f65cb55c5a98450d65083b2b73e5a3f3" + integrity sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg== + dependencies: + jest-diff "^25.2.1" + pretty-format "^25.2.1" + "@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4": version "7.0.5" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd" @@ -4071,16 +4060,6 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/experimental-utils@^2.19.2": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f" - integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.34.0" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" - "@typescript-eslint/parser@^4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.3.0.tgz#684fc0be6551a2bfcb253991eec3c786a8c063a3" @@ -4104,19 +4083,6 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf" integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw== -"@typescript-eslint/typescript-estree@2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5" - integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg== - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8" @@ -4783,16 +4749,6 @@ ajv@6.12.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@6.12.2: - version "6.12.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" - integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - ajv@6.12.4, ajv@^6.12.0: version "6.12.4" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" @@ -7343,15 +7299,6 @@ clipboard@^2.0.0: select "^1.1.2" tiny-emitter "^2.0.0" -cliui@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" - integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== - dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi "^2.0.0" - cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -8099,7 +8046,7 @@ cors@2.8.5: object-assign "^4" vary "^1" -cosmiconfig@4.0.0, cosmiconfig@^4.0.0: +cosmiconfig@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc" integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ== @@ -9430,7 +9377,7 @@ dotenv@6.2.0, dotenv@^6.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w== -dotenv@8.2.0, dotenv@^8.0.0: +dotenv@^8.0.0: version "8.2.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== @@ -10854,15 +10801,6 @@ fs-extra@4.0.2: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.0.tgz#0f0afb290bb3deb87978da816fcd3c7797f3a817" - integrity sha512-lk2cUCo8QzbiEWEbt7Cw3m27WMiRG321xsssbcIpfMhpRjrlC08WBOVQqj1/nQYYNnPtyIhP1oqLO3QwT2tPCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@7.0.1, fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -11019,11 +10957,6 @@ gensync@^1.0.0-beta.1: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== -get-caller-file@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" - integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== - get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -11760,7 +11693,7 @@ html-encoding-sniffer@^2.0.1: dependencies: whatwg-encoding "^1.0.5" -html-entities@^1.2.0, html-entities@^1.2.1, html-entities@^1.3.1: +html-entities@^1.2.0, html-entities@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== @@ -12060,11 +11993,6 @@ ignore-walk@^3.0.1, ignore-walk@^3.0.3: dependencies: minimatch "^3.0.4" -ignore@5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.4.tgz#33168af4a21e99b00c5d41cbadb6a6cb49903a45" - integrity sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g== - ignore@^3.3.5, ignore@^3.3.7: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" @@ -12403,11 +12331,6 @@ invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -invert-kv@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" - integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== - ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -13501,6 +13424,18 @@ jest-util@26.x, jest-util@^26.2.0: is-ci "^2.0.0" micromatch "^4.0.2" +jest-util@^26.1.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e" + integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw== + dependencies: + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + micromatch "^4.0.2" + jest-validate@^26.2.0: version "26.2.0" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.2.0.tgz#97fedf3e7984b7608854cbf925b9ca6ebcbdb78a" @@ -14026,13 +13961,6 @@ lazy-universal-dotenv@^3.0.1: dotenv "^8.0.0" dotenv-expand "^5.1.0" -lcid@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" - integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== - dependencies: - invert-kv "^2.0.0" - less-loader@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e" @@ -14560,7 +14488,7 @@ log4js@^4.0.0: rfdc "^1.1.4" streamroller "^1.0.6" -loglevel@^1.6.4, loglevel@^1.6.8: +loglevel@^1.6.8: version "1.6.8" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== @@ -14763,13 +14691,6 @@ mamacro@^0.0.3: resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== -map-age-cleaner@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -14849,15 +14770,6 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" - integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== - dependencies: - map-age-cleaner "^0.1.1" - mimic-fn "^2.0.0" - p-is-promise "^2.0.0" - memfs@^3.0.1: version "3.2.0" resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.0.tgz#f9438e622b5acd1daa8a4ae160c496fdd1325b26" @@ -15087,7 +14999,7 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -mimic-fn@^2.0.0, mimic-fn@^2.1.0: +mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== @@ -15933,7 +15845,7 @@ npm-registry-fetch@^8.1.3: minizlib "^2.0.0" npm-package-arg "^8.0.0" -npm-run-all@4.1.5, npm-run-all@^4.1.5: +npm-run-all@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba" integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ== @@ -16270,20 +16182,6 @@ ora@4.0.3: strip-ansi "^6.0.0" wcwidth "^1.0.1" -ora@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.4.tgz#e8da697cc5b6a47266655bf68e0fb588d29a545d" - integrity sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww== - dependencies: - chalk "^3.0.0" - cli-cursor "^3.1.0" - cli-spinners "^2.2.0" - is-interactive "^1.0.0" - log-symbols "^3.0.0" - mute-stream "0.0.8" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - ora@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ora/-/ora-5.0.0.tgz#4f0b34f2994877b49b452a707245ab1e9f6afccb" @@ -16325,15 +16223,6 @@ os-homedir@^1.0.0: resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-locale@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" - integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== - dependencies: - execa "^1.0.0" - lcid "^2.0.0" - mem "^4.0.0" - os-name@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/os-name/-/os-name-2.0.1.tgz#b9a386361c17ae3a21736ef0599405c9a8c5dc5e" @@ -16378,11 +16267,6 @@ p-cancelable@^0.4.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0" integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ== -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= - p-each-series@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" @@ -16403,11 +16287,6 @@ p-is-promise@^1.1.0: resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= -p-is-promise@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" - integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== - p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" @@ -16986,7 +16865,7 @@ popper.js@^1.14.4, popper.js@^1.14.7: resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== -portfinder@^1.0.25, portfinder@^1.0.26: +portfinder@^1.0.26: version "1.0.26" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70" integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ== @@ -18810,11 +18689,6 @@ require-from-string@^2.0.1: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= - require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -19779,14 +19653,6 @@ sockjs-client@1.4.0: json3 "^3.3.2" url-parse "^1.4.3" -sockjs@0.3.19: - version "0.3.19" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d" - integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw== - dependencies: - faye-websocket "^0.10.0" - uuid "^3.0.1" - sockjs@0.3.20: version "0.3.20" resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" @@ -19891,14 +19757,6 @@ source-map-resolve@^0.6.0: atob "^2.1.2" decode-uri-component "^0.2.0" -source-map-support@0.5.12: - version "0.5.12" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" - integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - source-map-support@0.5.16: version "0.5.16" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" @@ -20011,7 +19869,7 @@ spdy-transport@^3.0.0: readable-stream "^3.0.6" wbuf "^1.7.3" -spdy@^4.0.1, spdy@^4.0.2: +spdy@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== @@ -21124,7 +20982,24 @@ ts-essentials@^2.0.3: resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745" integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w== -ts-jest@26.1.4, ts-jest@^26.0.0: +ts-jest@26.4.0: + version "26.4.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.0.tgz#903c7827f3d3bc33efc2f91be294b164400c32e3" + integrity sha512-ofBzoCqf6Nv/PoWb/ByV3VNKy2KJSikamOBxvR3E6eVdIw10GwAXoyvMWXXjZJK2s6S27ZE8fI+JBTnGaovl6Q== + dependencies: + "@types/jest" "26.x" + bs-logger "0.x" + buffer-from "1.x" + fast-json-stable-stringify "2.x" + jest-util "^26.1.0" + json5 "2.x" + lodash.memoize "4.x" + make-error "1.x" + mkdirp "1.x" + semver "7.x" + yargs-parser "20.x" + +ts-jest@^26.0.0: version "26.1.4" resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.1.4.tgz#87d41a96016a8efe4b8cc14501d3785459af6fa6" integrity sha512-Nd7diUX6NZWfWq6FYyvcIPR/c7GbEF75fH1R6coOp3fbNzbRJBZZAn0ueVS0r8r9ral1VcrpneAFAwB3TsVS1Q== @@ -21718,7 +21593,7 @@ uuid@8.3.0, uuid@^8.2.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea" integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ== -uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2, uuid@^3.3.3, uuid@^3.4.0: +uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2, uuid@^3.3.3, uuid@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== @@ -22058,45 +21933,6 @@ webpack-dev-server@3.11.0: ws "^6.2.1" yargs "^13.3.2" -webpack-dev-server@3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz#27c3b5d0f6b6677c4304465ac817623c8b27b89c" - integrity sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw== - dependencies: - ansi-html "0.0.7" - bonjour "^3.5.0" - chokidar "^2.1.8" - compression "^1.7.4" - connect-history-api-fallback "^1.6.0" - debug "^4.1.1" - del "^4.1.1" - express "^4.17.1" - html-entities "^1.2.1" - http-proxy-middleware "0.19.1" - import-local "^2.0.0" - internal-ip "^4.3.0" - ip "^1.1.5" - is-absolute-url "^3.0.3" - killable "^1.0.1" - loglevel "^1.6.4" - opn "^5.5.0" - p-retry "^3.0.1" - portfinder "^1.0.25" - schema-utils "^1.0.0" - selfsigned "^1.10.7" - semver "^6.3.0" - serve-index "^1.9.1" - sockjs "0.3.19" - sockjs-client "1.4.0" - spdy "^4.0.1" - strip-ansi "^3.0.1" - supports-color "^6.1.0" - url "^0.11.0" - webpack-dev-middleware "^3.7.2" - webpack-log "^2.0.0" - ws "^6.2.1" - yargs "12.0.5" - webpack-hot-middleware@^2.25.0: version "2.25.0" resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706" @@ -22421,14 +22257,6 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" @@ -22559,7 +22387,7 @@ xxhashjs@^0.2.1: dependencies: cuint "^0.2.2" -"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: +y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== @@ -22605,13 +22433,10 @@ yargs-parser@20.0.0: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.0.0.tgz#c65a1daaa977ad63cebdd52159147b789a4e19a9" integrity sha512-8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA== -yargs-parser@^11.1.1: - version "11.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" - integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" +yargs-parser@20.x: + version "20.2.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.1.tgz#28f3773c546cdd8a69ddae68116b48a5da328e77" + integrity sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA== yargs-parser@^13.1.2: version "13.1.2" @@ -22621,24 +22446,6 @@ yargs-parser@^13.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs@12.0.5: - version "12.0.5" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" - integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== - dependencies: - cliui "^4.0.0" - decamelize "^1.2.0" - find-up "^3.0.0" - get-caller-file "^1.0.1" - os-locale "^3.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1 || ^4.0.0" - yargs-parser "^11.1.1" - yargs@15.3.0: version "15.3.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976"