chore(repo): update to nx 12.10

This commit is contained in:
Victor Savkin 2021-09-17 11:50:44 -04:00 committed by Victor Savkin
parent d2c5161b9a
commit d79bba3630
46 changed files with 360 additions and 782 deletions

View File

@ -203,7 +203,7 @@ commands:
- run: - run:
name: Run E2E Tests name: Run E2E Tests
command: | command: |
npx nx affected --target=e2e --base=$NX_BASE npx nx affected --target=e2e --no-parallel --max-parallel=1 --base=$NX_BASE
no_output_timeout: 45m no_output_timeout: 45m
- unless: - unless:
condition: condition:

View File

@ -16,7 +16,5 @@ const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');
module.exports = (on, config) => { module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits // `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config // `config` is the resolved Cypress config
// Preprocess Typescript file using Nx helper // Preprocess Typescript file using Nx helper
on('file:preprocessor', preprocessTypescript(config));
}; };

View File

@ -7,7 +7,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/data-access-documents/**/*.ts"] "lintFilePatterns": ["nx-dev/data-access-documents/**/*.ts"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

View File

@ -7,7 +7,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/feature-analytics/**/*.{ts,tsx,js,jsx}"] "lintFilePatterns": ["nx-dev/feature-analytics/**/*.{ts,tsx,js,jsx}"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

View File

@ -8,7 +8,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/feature-conf/**/*.{ts,tsx,js,jsx}"] "lintFilePatterns": ["nx-dev/feature-conf/**/*.{ts,tsx,js,jsx}"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

View File

@ -7,7 +7,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/feature-doc-viewer/**/*.{ts,tsx,js,jsx}"] "lintFilePatterns": ["nx-dev/feature-doc-viewer/**/*.{ts,tsx,js,jsx}"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

View File

@ -7,7 +7,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/feature-search/**/*.{ts,tsx,js,jsx}"] "lintFilePatterns": ["nx-dev/feature-search/**/*.{ts,tsx,js,jsx}"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

View File

@ -20,7 +20,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/nx-dev-e2e/**/*.{js,ts}"] "lintFilePatterns": ["nx-dev/nx-dev-e2e/**/*.{js,ts}"]
} },
"outputs": ["{options.outputFile}"]
} }
}, },
"tags": ["scope:nx-dev", "type:e2e"], "tags": ["scope:nx-dev", "type:e2e"],

View File

@ -16,7 +16,5 @@ const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');
module.exports = (on, config) => { module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits // `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config // `config` is the resolved Cypress config
// Preprocess Typescript file using Nx helper // Preprocess Typescript file using Nx helper
on('file:preprocessor', preprocessTypescript(config));
}; };

View File

@ -68,7 +68,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/nx-dev/**/*.{ts,tsx,js,jsx}"] "lintFilePatterns": ["nx-dev/nx-dev/**/*.{ts,tsx,js,jsx}"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

View File

@ -7,7 +7,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/ui/common/**/*.{ts,tsx,js,jsx}"] "lintFilePatterns": ["nx-dev/ui/common/**/*.{ts,tsx,js,jsx}"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

View File

@ -8,7 +8,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/ui/member-card/**/*.{ts,tsx,js,jsx}"] "lintFilePatterns": ["nx-dev/ui/member-card/**/*.{ts,tsx,js,jsx}"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

View File

@ -8,7 +8,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["nx-dev/ui/sponsor-card/**/*.{ts,tsx,js,jsx}"] "lintFilePatterns": ["nx-dev/ui/sponsor-card/**/*.{ts,tsx,js,jsx}"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

View File

@ -61,18 +61,18 @@
"@ngrx/schematics": "12.4.0", "@ngrx/schematics": "12.4.0",
"@ngrx/store": "12.4.0", "@ngrx/store": "12.4.0",
"@ngrx/store-devtools": "12.4.0", "@ngrx/store-devtools": "12.4.0",
"@nrwl/cli": "12.7.0", "@nrwl/cli": "12.10.0-beta.1",
"@nrwl/cypress": "12.7.0", "@nrwl/cypress": "12.10.0-beta.1",
"@nrwl/eslint-plugin-nx": "12.7.0", "@nrwl/eslint-plugin-nx": "12.10.0-beta.1",
"@nrwl/jest": "12.7.0", "@nrwl/jest": "12.10.0-beta.1",
"@nrwl/linter": "12.7.0", "@nrwl/linter": "12.10.0-beta.1",
"@nrwl/next": "12.7.0", "@nrwl/next": "12.10.0-beta.1",
"@nrwl/node": "12.7.0", "@nrwl/node": "12.10.0-beta.1",
"@nrwl/nx-cloud": "12.3.8", "@nrwl/nx-cloud": "12.3.10",
"@nrwl/react": "12.7.0", "@nrwl/react": "12.10.0-beta.1",
"@nrwl/tao": "12.7.0", "@nrwl/tao": "12.10.0-beta.1",
"@nrwl/web": "12.7.0", "@nrwl/web": "12.10.0-beta.1",
"@nrwl/workspace": "12.7.0", "@nrwl/workspace": "12.10.0-beta.1",
"@phenomnomnominal/tsquery": "4.1.1", "@phenomnomnominal/tsquery": "4.1.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3", "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@popperjs/core": "^2.9.2", "@popperjs/core": "^2.9.2",
@ -134,7 +134,7 @@
"dotenv": "~10.0.0", "dotenv": "~10.0.0",
"ejs": "^3.1.5", "ejs": "^3.1.5",
"eslint": "7.10.0", "eslint": "7.10.0",
"eslint-config-next": "^11.1.0", "eslint-config-next": "11.1.0",
"eslint-config-prettier": "^8.1.0", "eslint-config-prettier": "^8.1.0",
"eslint-plugin-cypress": "^2.10.3", "eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-import": "2.22.1", "eslint-plugin-import": "2.22.1",
@ -179,7 +179,7 @@
"mime": "2.4.4", "mime": "2.4.4",
"mini-css-extract-plugin": "0.8.0", "mini-css-extract-plugin": "0.8.0",
"minimatch": "3.0.4", "minimatch": "3.0.4",
"next": "11.0.1", "next": "11.1.0",
"next-sitemap": "^1.6.108", "next-sitemap": "^1.6.108",
"ng-packagr": "~12.2.0", "ng-packagr": "~12.2.0",
"ngrx-store-freeze": "0.2.4", "ngrx-store-freeze": "0.2.4",
@ -283,4 +283,4 @@
"ng-packagr/rxjs": "6.6.7", "ng-packagr/rxjs": "6.6.7",
"**/xmlhttprequest-ssl": "~1.6.2" "**/xmlhttprequest-ssl": "~1.6.2"
} }
} }

View File

@ -83,7 +83,8 @@
"packages/angular/**/*.spec.jsx", "packages/angular/**/*.spec.jsx",
"packages/angular/**/*.d.ts" "packages/angular/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
}, },
"implicitDependencies": ["workspace", "cypress", "jest"] "implicitDependencies": ["workspace", "cypress", "jest"]

View File

@ -78,7 +78,8 @@
"packages/cli/**/*.spec.jsx", "packages/cli/**/*.spec.jsx",
"packages/cli/**/*.d.ts" "packages/cli/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
}, },
"implicitDependencies": ["workspace"] "implicitDependencies": ["workspace"]

View File

@ -78,7 +78,8 @@
"packages/create-nx-plugin/**/*.spec.jsx", "packages/create-nx-plugin/**/*.spec.jsx",
"packages/create-nx-plugin/**/*.d.ts" "packages/create-nx-plugin/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
}, },
"implicitDependencies": ["nx-plugin"] "implicitDependencies": ["nx-plugin"]

View File

@ -78,7 +78,8 @@
"packages/create-nx-workspace/**/*.spec.jsx", "packages/create-nx-workspace/**/*.spec.jsx",
"packages/create-nx-workspace/**/*.d.ts" "packages/create-nx-workspace/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
}, },
"implicitDependencies": ["workspace"] "implicitDependencies": ["workspace"]

View File

@ -69,7 +69,8 @@
"packages/cypress/**/*.spec.jsx", "packages/cypress/**/*.spec.jsx",
"packages/cypress/**/*.d.ts" "packages/cypress/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -1 +1,5 @@
{ "extends": "../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] } {
"extends": "../../.eslintrc",
"rules": {},
"ignorePatterns": ["!**/*"]
}

View File

@ -4,7 +4,7 @@
"projectType": "library", "projectType": "library",
"targets": { "targets": {
"lint": { "lint": {
"builder": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": [ "lintFilePatterns": [
"packages/detox/**/*.ts", "packages/detox/**/*.ts",
@ -14,10 +14,11 @@
"packages/detox/**/*.spec.jsx", "packages/detox/**/*.spec.jsx",
"packages/detox/**/*.d.ts" "packages/detox/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"builder": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",
"options": { "options": {
"jestConfig": "packages/detox/jest.config.js", "jestConfig": "packages/detox/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
@ -25,7 +26,7 @@
"outputs": ["coverage/packages/detox"] "outputs": ["coverage/packages/detox"]
}, },
"build-base": { "build-base": {
"builder": "@nrwl/node:package", "executor": "@nrwl/node:package",
"options": { "options": {
"outputPath": "build/packages/detox", "outputPath": "build/packages/detox",
"tsConfig": "packages/detox/tsconfig.lib.json", "tsConfig": "packages/detox/tsconfig.lib.json",

View File

@ -69,7 +69,8 @@
"packages/devkit/**/*.spec.jsx", "packages/devkit/**/*.spec.jsx",
"packages/devkit/**/*.d.ts" "packages/devkit/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -70,7 +70,8 @@
"packages/eslint-plugin-nx/**/*.spec.jsx", "packages/eslint-plugin-nx/**/*.spec.jsx",
"packages/eslint-plugin-nx/**/*.d.ts" "packages/eslint-plugin-nx/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -70,7 +70,8 @@
"packages/express/**/*.spec.jsx", "packages/express/**/*.spec.jsx",
"packages/express/**/*.d.ts" "packages/express/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
}, },
"implicitDependencies": ["node"] "implicitDependencies": ["node"]

View File

@ -80,7 +80,8 @@
"packages/gatsby/**/*.spec.jsx", "packages/gatsby/**/*.spec.jsx",
"packages/gatsby/**/*.d.ts" "packages/gatsby/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
}, },
"tags": [] "tags": []

View File

@ -69,7 +69,8 @@
"packages/jest/**/*.spec.jsx", "packages/jest/**/*.spec.jsx",
"packages/jest/**/*.d.ts" "packages/jest/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -70,7 +70,8 @@
"packages/linter/**/*.spec.jsx", "packages/linter/**/*.spec.jsx",
"packages/linter/**/*.d.ts" "packages/linter/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
}, },
"implicitDependencies": ["eslint-plugin-nx"] "implicitDependencies": ["eslint-plugin-nx"]

View File

@ -70,7 +70,8 @@
"packages/nest/**/*.spec.jsx", "packages/nest/**/*.spec.jsx",
"packages/nest/**/*.d.ts" "packages/nest/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
}, },
"implicitDependencies": ["node", "linter"] "implicitDependencies": ["node", "linter"]

View File

@ -1,6 +1,6 @@
// ignoring while we support both Next 11.1.0 and versions before it // ignoring while we support both Next 11.1.0 and versions before it
// @ts-ignore // @ts-ignore
import type { NextConfig } from 'next/dist/next-server/server/config'; import type { NextConfig } from 'next/dist/server/config';
import { WebpackConfigOptions } from '../src/utils/types'; import { WebpackConfigOptions } from '../src/utils/types';
const { join } = require('path'); const { join } = require('path');

View File

@ -75,7 +75,8 @@
"packages/next/**/*.spec.jsx", "packages/next/**/*.spec.jsx",
"packages/next/**/*.d.ts" "packages/next/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -6,7 +6,7 @@ import { importConstants } from './require-shim';
const { PHASE_PRODUCTION_BUILD } = importConstants(); const { PHASE_PRODUCTION_BUILD } = importConstants();
jest.mock('tsconfig-paths-webpack-plugin'); jest.mock('tsconfig-paths-webpack-plugin');
jest.mock('next/dist/next-server/server/config', () => ({ jest.mock('next/dist/server/config', () => ({
__esModule: true, __esModule: true,
default: () => ({ default: () => ({
webpack: () => ({}), webpack: () => ({}),
@ -139,8 +139,8 @@ describe('Next.js webpack config builder', () => {
[] []
); );
console.log('config', config);
expect(config).toMatchObject({ expect(config).toMatchObject({
myPhase: 'phase-production-build',
myCustomValue: 'test', myCustomValue: 'test',
}); });
}); });

View File

@ -8,7 +8,7 @@ import type {
PHASE_EXPORT, PHASE_EXPORT,
PHASE_PRODUCTION_BUILD, PHASE_PRODUCTION_BUILD,
PHASE_PRODUCTION_SERVER, PHASE_PRODUCTION_SERVER,
} from 'next/dist/next-server/lib/constants'; } from 'next/dist/shared/lib/constants';
import { join, resolve } from 'path'; import { join, resolve } from 'path';
import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin'; import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
import { Configuration } from 'webpack'; import { Configuration } from 'webpack';

View File

@ -8,7 +8,7 @@ export function importConstants() {
export function importConfig() { export function importConfig() {
try { try {
return require('next/dist/next-server/server/config').default; return require('next/dist/next-server/lib/config').default;
} catch { } catch {
return require('next/dist/server/config').default; return require('next/dist/server/config').default;
} }

View File

@ -70,7 +70,8 @@
"packages/node/**/*.spec.jsx", "packages/node/**/*.spec.jsx",
"packages/node/**/*.d.ts" "packages/node/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -70,7 +70,8 @@
"packages/nx-plugin/**/*.spec.jsx", "packages/nx-plugin/**/*.spec.jsx",
"packages/nx-plugin/**/*.d.ts" "packages/nx-plugin/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -67,7 +67,8 @@
"packages/nx/**/*.spec.jsx", "packages/nx/**/*.spec.jsx",
"packages/nx/**/*.d.ts" "packages/nx/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -1 +1,5 @@
{ "extends": "../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] } {
"extends": "../../.eslintrc",
"rules": {},
"ignorePatterns": ["!**/*"]
}

View File

@ -4,7 +4,7 @@
"projectType": "library", "projectType": "library",
"targets": { "targets": {
"lint": { "lint": {
"builder": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": [ "lintFilePatterns": [
"packages/react-native/**/*.ts", "packages/react-native/**/*.ts",
@ -14,10 +14,11 @@
"packages/react-native/**/*.spec.jsx", "packages/react-native/**/*.spec.jsx",
"packages/react-native/**/*.d.ts" "packages/react-native/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"builder": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",
"options": { "options": {
"jestConfig": "packages/react-native/jest.config.js", "jestConfig": "packages/react-native/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
@ -25,7 +26,7 @@
"outputs": ["coverage/packages/react-native"] "outputs": ["coverage/packages/react-native"]
}, },
"build-base": { "build-base": {
"builder": "@nrwl/node:package", "executor": "@nrwl/node:package",
"options": { "options": {
"outputPath": "build/packages/react-native", "outputPath": "build/packages/react-native",
"tsConfig": "packages/react-native/tsconfig.lib.json", "tsConfig": "packages/react-native/tsconfig.lib.json",

View File

@ -80,7 +80,8 @@
"packages/react/**/*.spec.jsx", "packages/react/**/*.spec.jsx",
"packages/react/**/*.d.ts" "packages/react/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -80,7 +80,8 @@
"packages/storybook/**/*.spec.jsx", "packages/storybook/**/*.spec.jsx",
"packages/storybook/**/*.d.ts" "packages/storybook/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -80,7 +80,8 @@
"packages/tao/**/*.spec.jsx", "packages/tao/**/*.spec.jsx",
"packages/tao/**/*.d.ts" "packages/tao/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -75,7 +75,8 @@
"packages/web/**/*.spec.jsx", "packages/web/**/*.spec.jsx",
"packages/web/**/*.d.ts" "packages/web/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -83,7 +83,8 @@
"packages/workspace/**/*.spec.jsx", "packages/workspace/**/*.spec.jsx",
"packages/workspace/**/*.d.ts" "packages/workspace/**/*.d.ts"
] ]
} },
"outputs": ["{options.outputFile}"]
} }
} }
} }

View File

@ -88,8 +88,9 @@ function build(nxVersion: string) {
execSync('npx nx run-many --target=build --all', { execSync('npx nx run-many --target=build --all', {
stdio: ['ignore', 'ignore', 'ignore'], stdio: ['ignore', 'ignore', 'ignore'],
}); });
} catch { } catch (e) {
console.log('Build failed'); console.log('Build failed');
console.log(e);
process.exit(1); process.exit(1);
} }

View File

@ -27,7 +27,8 @@
"executor": "@nrwl/linter:eslint", "executor": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["typedoc-theme/**/*.ts"] "lintFilePatterns": ["typedoc-theme/**/*.ts"]
} },
"outputs": ["{options.outputFile}"]
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",

967
yarn.lock

File diff suppressed because it is too large Load Diff