Skip to content

Commit

Permalink
chore(repo): update nx to 12.8.0-beta.1 (nrwl#6804)
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenPandaz authored Aug 23, 2021
1 parent 8cc41de commit 8e8191f
Show file tree
Hide file tree
Showing 16 changed files with 242 additions and 804 deletions.
2 changes: 1 addition & 1 deletion dep-graph/dep-graph-e2e/cypress.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"fixturesFolder": "./src/fixtures",
"integrationFolder": "./src/integration",
"modifyObstructiveCode": false,
"pluginsFile": "./src/plugins/index",
"pluginsFile": false,
"supportFile": "./src/support/index.ts",
"video": true,
"videosFolder": "../../dist/cypress/dep-graph/dep-graph-e2e/videos",
Expand Down
7 changes: 2 additions & 5 deletions dep-graph/dep-graph-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@
"executor": "@nrwl/cypress:cypress",
"options": {
"cypressConfig": "dep-graph/dep-graph-e2e/cypress.json",
"tsConfig": "dep-graph/dep-graph-e2e/tsconfig.e2e.json",
"devServerTarget": "dep-graph-dep-graph:serve"
}
},
"lint": {
"executor": "@nrwl/linter:lint",
"executor": "@nrwl/linter:eslint",
"options": {
"linter": "eslint",
"tsConfig": ["dep-graph/dep-graph-e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**", "!dep-graph/dep-graph-e2e/**/*"]
"lintFilePatterns": ["dep-graph/dep-graph-e2e/**/*.{js,ts}"]
}
}
},
Expand Down
22 changes: 0 additions & 22 deletions dep-graph/dep-graph-e2e/src/plugins/index.js

This file was deleted.

10 changes: 0 additions & 10 deletions dep-graph/dep-graph-e2e/tsconfig.e2e.json

This file was deleted.

14 changes: 7 additions & 7 deletions dep-graph/dep-graph-e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"extends": "../../tsconfig.base.json",
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.e2e.json"
}
]
"compilerOptions": {
"sourceMap": false,
"outDir": "../../dist/out-tsc",
"allowJs": true,
"types": ["cypress", "node"]
},
"include": ["src/**/*.ts", "src/**/*.js"]
}
2 changes: 1 addition & 1 deletion nx-dev/nx-dev-e2e/cypress.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"fixturesFolder": "./src/fixtures",
"integrationFolder": "./src/integration",
"modifyObstructiveCode": false,
"pluginsFile": "./src/plugins/index",
"pluginsFile": false,
"supportFile": "./src/support/index.ts",
"video": true,
"videosFolder": "../../dist/cypress/apps/documentation-e2e/videos",
Expand Down
1 change: 0 additions & 1 deletion nx-dev/nx-dev-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"executor": "@nrwl/cypress:cypress",
"options": {
"cypressConfig": "nx-dev/nx-dev-e2e/cypress.json",
"tsConfig": "nx-dev/nx-dev-e2e/tsconfig.e2e.json",
"devServerTarget": "nx-dev:serve"
},
"configurations": {
Expand Down
22 changes: 0 additions & 22 deletions nx-dev/nx-dev-e2e/src/plugins/index.js

This file was deleted.

10 changes: 0 additions & 10 deletions nx-dev/nx-dev-e2e/tsconfig.e2e.json

This file was deleted.

14 changes: 7 additions & 7 deletions nx-dev/nx-dev-e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"extends": "../../tsconfig.base.json",
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.e2e.json"
}
]
"compilerOptions": {
"sourceMap": false,
"outDir": "../../dist/out-tsc",
"allowJs": true,
"types": ["cypress", "node"]
},
"include": ["src/**/*.ts", "src/**/*.js"]
}
3 changes: 3 additions & 0 deletions nx-dev/nx-dev/next-env.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/// <reference types="next" />
/// <reference types="next/types/global" />
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,18 @@
"@ngrx/schematics": "12.2.0",
"@ngrx/store": "12.2.0",
"@ngrx/store-devtools": "12.2.0",
"@nrwl/cli": "12.7.0",
"@nrwl/cypress": "12.7.0",
"@nrwl/eslint-plugin-nx": "12.7.0",
"@nrwl/jest": "12.7.0",
"@nrwl/linter": "12.7.0",
"@nrwl/next": "12.7.0",
"@nrwl/node": "12.7.0",
"@nrwl/nx-cloud": "12.3.8",
"@nrwl/react": "12.7.0",
"@nrwl/tao": "12.7.0",
"@nrwl/web": "12.7.0",
"@nrwl/workspace": "12.7.0",
"@nrwl/cli": "12.8.0-beta.2",
"@nrwl/cypress": "12.8.0-beta.2",
"@nrwl/eslint-plugin-nx": "12.8.0-beta.2",
"@nrwl/jest": "12.8.0-beta.2",
"@nrwl/linter": "12.8.0-beta.2",
"@nrwl/next": "12.8.0-beta.2",
"@nrwl/node": "12.8.0-beta.2",
"@nrwl/nx-cloud": "12.3.10",
"@nrwl/react": "12.8.0-beta.2",
"@nrwl/tao": "12.8.0-beta.2",
"@nrwl/web": "12.8.0-beta.2",
"@nrwl/workspace": "12.8.0-beta.2",
"@phenomnomnominal/tsquery": "4.1.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@popperjs/core": "^2.9.2",
Expand Down Expand Up @@ -134,7 +134,7 @@
"dotenv": "~10.0.0",
"ejs": "^3.1.5",
"eslint": "7.10.0",
"eslint-config-next": "^11.1.0",
"eslint-config-next": "11.1.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-import": "2.22.1",
Expand Down Expand Up @@ -178,7 +178,7 @@
"mime": "2.4.4",
"mini-css-extract-plugin": "0.8.0",
"minimatch": "3.0.4",
"next": "11.0.1",
"next": "11.1.0",
"next-sitemap": "^1.6.108",
"ng-packagr": "~12.1.0",
"ngrx-store-freeze": "0.2.4",
Expand Down
4 changes: 1 addition & 3 deletions packages/next/plugins/with-nx.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// ignoring while we support both Next 11.1.0 and versions before it
// @ts-ignore
import type { NextConfig } from 'next/dist/next-server/server/config';
import type { NextConfig } from 'next/types';
import { WebpackConfigOptions } from '../src/utils/types';

const { join } = require('path');
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/utils/config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { importConstants } from './require-shim';
const { PHASE_PRODUCTION_BUILD } = importConstants();

jest.mock('tsconfig-paths-webpack-plugin');
jest.mock('next/dist/next-server/server/config', () => ({
jest.mock('next/dist/server/config', () => ({
__esModule: true,
default: () => ({
webpack: () => ({}),
Expand Down
5 changes: 1 addition & 4 deletions packages/next/src/utils/config.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import { ExecutorContext, offsetFromRoot } from '@nrwl/devkit';
// ignoring while we support both Next 11.1.0 and versions before it
// @ts-ignore
import type { NextConfig } from 'next/dist/server/config-shared';
// @ts-ignore
import type {
PHASE_DEVELOPMENT_SERVER,
PHASE_EXPORT,
PHASE_PRODUCTION_BUILD,
PHASE_PRODUCTION_SERVER,
} from 'next/dist/next-server/lib/constants';
} from 'next/dist/shared/lib/constants';
import { join, resolve } from 'path';
import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
import { Configuration } from 'webpack';
Expand Down
Loading

0 comments on commit 8e8191f

Please sign in to comment.