miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Revert "chore(repo): update nx to 12.8.0-beta.1 (#6804)" (#6831)

Browse Source 
This reverts commit 8e8191f22c7bce330c2c314f37bdf57c71cabadb.
This commit is contained in:
Jason Jean 2021-08-23 21:48:50 -04:00 committed by GitHub
parent 8e8191f22c
commit 0772cb3642
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 804 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dep-graph/dep-graph-e2e/cypress.json
View File

@ -3,7 +3,7 @@
"fixturesFolder": "./src/fixtures",
"integrationFolder": "./src/integration",
"modifyObstructiveCode": false,
"pluginsFile": false,
"pluginsFile": "./src/plugins/index",
"supportFile": "./src/support/index.ts",
"video": true,
"videosFolder": "../../dist/cypress/dep-graph/dep-graph-e2e/videos",

7
dep-graph/dep-graph-e2e/project.json
View File

@ -7,13 +7,16 @@
"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:eslint",
"executor": "@nrwl/linter:lint",
"options": {
"lintFilePatterns": ["dep-graph/dep-graph-e2e/**/*.{js,ts}"]
"linter": "eslint",
"tsConfig": ["dep-graph/dep-graph-e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**", "!dep-graph/dep-graph-e2e/**/*"]
}
}
},

22
dep-graph/dep-graph-e2e/src/plugins/index.js Normal file
View File

@ -0,0 +1,22 @@
// ***********************************************************
// This example plugins/index.js can be used to load plugins
//
// You can change the location of this file or turn off loading
// the plugins file with the 'pluginsFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/plugins-guide
// ***********************************************************
// This function is called when a project is opened or re-opened (e.g. due to
// the project's config changing)
const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');
module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config
// Preprocess Typescript file using Nx helper
on('file:preprocessor', preprocessTypescript(config));
};

10
dep-graph/dep-graph-e2e/tsconfig.e2e.json Normal file
View File

@ -0,0 +1,10 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"sourceMap": false,
"outDir": "../../dist/out-tsc",
"allowJs": true,
"types": ["cypress", "node"]
},
"include": ["src/**/*.ts", "src/**/*.js"]
}

14
dep-graph/dep-graph-e2e/tsconfig.json
View File

@ -1,10 +1,10 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"sourceMap": false,
"outDir": "../../dist/out-tsc",
"allowJs": true,
"types": ["cypress", "node"]
},
"include": ["src/**/*.ts", "src/**/*.js"]
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.e2e.json"
}
]
}

2
nx-dev/nx-dev-e2e/cypress.json
View File

@ -3,7 +3,7 @@
"fixturesFolder": "./src/fixtures",
"integrationFolder": "./src/integration",
"modifyObstructiveCode": false,
"pluginsFile": false,
"pluginsFile": "./src/plugins/index",
"supportFile": "./src/support/index.ts",
"video": true,
"videosFolder": "../../dist/cypress/apps/documentation-e2e/videos",

1
nx-dev/nx-dev-e2e/project.json
View File

@ -7,6 +7,7 @@
"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": {

22
nx-dev/nx-dev-e2e/src/plugins/index.js Normal file
View File

@ -0,0 +1,22 @@
// ***********************************************************
// This example plugins/index.js can be used to load plugins
//
// You can change the location of this file or turn off loading
// the plugins file with the 'pluginsFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/plugins-guide
// ***********************************************************
// This function is called when a project is opened or re-opened (e.g. due to
// the project's config changing)
const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');
module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config
// Preprocess Typescript file using Nx helper
on('file:preprocessor', preprocessTypescript(config));
};

10
nx-dev/nx-dev-e2e/tsconfig.e2e.json Normal file
View File

@ -0,0 +1,10 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"sourceMap": false,
"outDir": "../../dist/out-tsc",
"allowJs": true,
"types": ["cypress", "node"]
},
"include": ["src/**/*.ts", "src/**/*.js"]
}

14
nx-dev/nx-dev-e2e/tsconfig.json
View File

@ -1,10 +1,10 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"sourceMap": false,
"outDir": "../../dist/out-tsc",
"allowJs": true,
"types": ["cypress", "node"]
},
"include": ["src/**/*.ts", "src/**/*.js"]
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.e2e.json"
}
]
}

3
nx-dev/nx-dev/next-env.d.ts vendored
View File

@ -1,6 +1,3 @@
/// <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
package.json
View File

@ -61,18 +61,18 @@
"@ngrx/schematics": "12.2.0",
"@ngrx/store": "12.2.0",
"@ngrx/store-devtools": "12.2.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",
"@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",
"@phenomnomnominal/tsquery": "4.1.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@popperjs/core": "^2.9.2",
@ -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",
@ -178,7 +178,7 @@
"mime": "2.4.4",
"mini-css-extract-plugin": "0.8.0",
"minimatch": "3.0.4",
"next": "11.1.0",
"next": "11.0.1",
"next-sitemap": "^1.6.108",
"ng-packagr": "~12.1.0",
"ngrx-store-freeze": "0.2.4",

4
packages/next/plugins/with-nx.ts
View File

@ -1,4 +1,6 @@
import type { NextConfig } from 'next/types';
// 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 { WebpackConfigOptions } from '../src/utils/types';
const { join } = require('path');

2
packages/next/src/utils/config.spec.ts
View File

@ -6,7 +6,7 @@ import { importConstants } from './require-shim';
const { PHASE_PRODUCTION_BUILD } = importConstants();
jest.mock('tsconfig-paths-webpack-plugin');
jest.mock('next/dist/server/config', () => ({
jest.mock('next/dist/next-server/server/config', () => ({
__esModule: true,
default: () => ({
webpack: () => ({}),

5
packages/next/src/utils/config.ts
View File

@ -1,11 +1,14 @@
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/shared/lib/constants';
} from 'next/dist/next-server/lib/constants';
import { join, resolve } from 'path';
import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
import { Configuration } from 'webpack';

900
yarn.lock
View File

File diff suppressed because it is too large Load Diff