feat(repo): update to nx 10.3 (nrwl#3840)

.eslintrc → .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": []
 }

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-angular',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-bazel',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-cli',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-cypress',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-jest',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-linter',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-next',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-node',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-nx-plugin',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-react',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-storybook',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-web',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'e2e-workspace',
 };

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: [
+    '<rootDir>/packages/tao',
+    '<rootDir>/packages/workspace',
+    '<rootDir>/packages/web',
+    '<rootDir>/packages/cypress',
+    '<rootDir>/packages/jest',
+    '<rootDir>/packages/storybook',
+    '<rootDir>/packages/react',
+    '<rootDir>/packages/nx-plugin',
+    '<rootDir>/packages/node',
+    '<rootDir>/packages/next',
+    '<rootDir>/packages/nest',
+    '<rootDir>/packages/linter',
+    '<rootDir>/packages/express',
+    '<rootDir>/packages/eslint-plugin-nx',
+    '<rootDir>/packages/create-nx-workspace',
+    '<rootDir>/packages/create-nx-plugin',
+    '<rootDir>/packages/cli',
+    '<rootDir>/packages/bazel',
+    '<rootDir>/packages/angular',
+  ],
 };

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,
+};

nx.json

@@ -8,7 +8,8 @@
     },
     "tsconfig.base.json": "*",
     "tslint.json": "*",
-    "nx.json": "*"
+    "nx.json": "*",
+    ".eslintrc.json": "*"
   },
   "tasksRunnerOptions": {
     "default": {

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": {}
 }

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'angular',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'bazel',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'cli',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'create-nx-plugin',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'create-nx-workspace',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'cypress',
 };

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: '<rootDir>/tsconfig.spec.json' } },
+  displayName: 'eslint-plugin-nx',
 };