Skip to content

Commit

Permalink
chore(repo): update to nx 16.0.0-beta.5 (#16347)
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenPandaz committed Apr 21, 2023
1 parent ec3c642 commit ff8074b
Show file tree
Hide file tree
Showing 144 changed files with 1,618 additions and 1,087 deletions.
2 changes: 1 addition & 1 deletion e2e/linter/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"targets": {
"e2e": {},
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "e2e/linter/jest.config.ts",
"passWithNoTests": true,
Expand Down
2 changes: 1 addition & 1 deletion graph/client-e2e/cypress-release-static.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default defineConfig({
...cypressJsonConfig,
setupNodeEvents,
/**
* TODO(@nrwl/cypress): In Cypress v12,the testIsolation option is turned on by default.
* TODO(@nx/cypress): In Cypress v12,the testIsolation option is turned on by default.
* This can cause tests to start breaking where not indended.
* You should consider enabling this once you verify tests do not depend on each other
* More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
Expand Down
2 changes: 1 addition & 1 deletion graph/client-e2e/cypress-release.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default defineConfig({
...cypressJsonConfig,
setupNodeEvents,
/**
* TODO(@nrwl/cypress): In Cypress v12,the testIsolation option is turned on by default.
* TODO(@nx/cypress): In Cypress v12,the testIsolation option is turned on by default.
* This can cause tests to start breaking where not indended.
* You should consider enabling this once you verify tests do not depend on each other
* More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
Expand Down
2 changes: 1 addition & 1 deletion graph/client-e2e/cypress-watch-mode.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default defineConfig({
...cypressJsonConfig,
setupNodeEvents,
/**
* TODO(@nrwl/cypress): In Cypress v12,the testIsolation option is turned on by default.
* TODO(@nx/cypress): In Cypress v12,the testIsolation option is turned on by default.
* This can cause tests to start breaking where not indended.
* You should consider enabling this once you verify tests do not depend on each other
* More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
Expand Down
2 changes: 1 addition & 1 deletion graph/client-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default defineConfig({
...cypressJsonConfig,
setupNodeEvents,
/**
* TODO(@nrwl/cypress): In Cypress v12,the testIsolation option is turned on by default.
* TODO(@nx/cypress): In Cypress v12,the testIsolation option is turned on by default.
* This can cause tests to start breaking where not indended.
* You should consider enabling this once you verify tests do not depend on each other
* More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
Expand Down
2 changes: 1 addition & 1 deletion graph/client-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projectType": "application",
"targets": {
"e2e-base": {
"executor": "@nrwl/cypress:cypress",
"executor": "@nx/cypress:cypress",
"options": {
"tsConfig": "graph/client-e2e/tsconfig.e2e.json",
"testingType": "e2e",
Expand Down
2 changes: 1 addition & 1 deletion graph/client/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/react/babel",
"@nx/react/babel",
{
"runtime": "automatic"
}
Expand Down
2 changes: 1 addition & 1 deletion graph/client/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
],
addons: [
'@storybook/addon-essentials',
'@nrwl/react/plugins/storybook',
'@nx/react/plugins/storybook',
'storybook-dark-mode',
],
};
6 changes: 3 additions & 3 deletions graph/client/.storybook/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"outDir": ""
},
"files": [
"../../../node_modules/@nrwl/react/typings/styled-jsx.d.ts",
"../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../../node_modules/@nrwl/react/typings/image.d.ts"
"../../../node_modules/@nx/react/typings/styled-jsx.d.ts",
"../../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../../node_modules/@nx/react/typings/image.d.ts"
],

"exclude": [
Expand Down
6 changes: 3 additions & 3 deletions graph/client/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* eslint-disable */
// nx-ignore-next-line
const nxPreset = require('@nrwl/jest/preset').default;
const nxPreset = require('@nx/jest/preset').default;

export default {
...nxPreset,
displayName: 'graph-client',
transform: {
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/next/babel'] }],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/nx-dev',
Expand Down
8 changes: 4 additions & 4 deletions graph/client/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}
},
"build-base": {
"executor": "@nrwl/webpack:webpack",
"executor": "@nx/webpack:webpack",
"options": {
"maxWorkers": 8,
"outputPath": "build/apps/graph",
Expand Down Expand Up @@ -182,7 +182,7 @@
"outputs": ["{options.outputPath}"]
},
"serve-base": {
"executor": "@nrwl/webpack:dev-server",
"executor": "@nx/webpack:dev-server",
"configurations": {
"dev": {
"buildTarget": "graph-client:build-base:dev",
Expand Down Expand Up @@ -243,7 +243,7 @@
"lint": {},
"test": {},
"storybook": {
"executor": "@nrwl/storybook:storybook",
"executor": "@nx/storybook:storybook",
"options": {
"uiFramework": "@storybook/react",
"port": 4400,
Expand All @@ -256,7 +256,7 @@
}
},
"build-storybook": {
"executor": "@nrwl/storybook:build",
"executor": "@nx/storybook:build",
"outputs": ["{options.outputDir}"],
"options": {
"uiFramework": "@storybook/react",
Expand Down
2 changes: 1 addition & 1 deletion graph/client/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path');

// nx-ignore-next-line
const { createGlobPatternsForDependencies } = require('@nrwl/react/tailwind');
const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');

module.exports = {
content: [
Expand Down
4 changes: 2 additions & 2 deletions graph/client/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"lib": ["DOM", "es2019"]
},
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
"../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../node_modules/@nx/react/typings/image.d.ts"
],
"exclude": [
"**/*.spec.ts",
Expand Down
4 changes: 2 additions & 2 deletions graph/client/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"jest.config.ts"
],
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
"../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../node_modules/@nx/react/typings/image.d.ts"
]
}
4 changes: 2 additions & 2 deletions graph/client/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// nx-ignore-next-line
const { withNx, composePlugins } = require('@nrwl/webpack');
const { withNx, composePlugins } = require('@nx/webpack');
// nx-ignore-next-line
const { withReact } = require('@nrwl/react');
const { withReact } = require('@nx/react');

module.exports = composePlugins(withNx(), withReact(), (config, context) => {
return {
Expand Down
2 changes: 1 addition & 1 deletion graph/ui-components/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/react/babel",
"@nx/react/babel",
{
"runtime": "automatic",
"useBuiltIns": "usage"
Expand Down
2 changes: 1 addition & 1 deletion graph/ui-components/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ module.exports = {
'../src/lib/**/*.stories.mdx',
'../src/lib/**/*.stories.@(js|jsx|ts|tsx)',
],
addons: ['@storybook/addon-essentials', '@nrwl/react/plugins/storybook'],
addons: ['@storybook/addon-essentials', '@nx/react/plugins/storybook'],
};
6 changes: 3 additions & 3 deletions graph/ui-components/.storybook/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"outDir": ""
},
"files": [
"../../../node_modules/@nrwl/react/typings/styled-jsx.d.ts",
"../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../../node_modules/@nrwl/react/typings/image.d.ts"
"../../../node_modules/@nx/react/typings/styled-jsx.d.ts",
"../../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../../node_modules/@nx/react/typings/image.d.ts"
],
"exclude": [
"../**/*.spec.ts",
Expand Down
4 changes: 2 additions & 2 deletions graph/ui-components/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lint": {},
"test": {},
"storybook": {
"executor": "@nrwl/storybook:storybook",
"executor": "@nx/storybook:storybook",
"options": {
"uiFramework": "@storybook/react",
"port": 4400,
Expand All @@ -21,7 +21,7 @@
}
},
"build-storybook": {
"executor": "@nrwl/storybook:build",
"executor": "@nx/storybook:build",
"outputs": ["{options.outputDir}"],
"options": {
"uiFramework": "@storybook/react",
Expand Down
4 changes: 2 additions & 2 deletions graph/ui-components/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"lib": ["dom"]
},
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
"../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../node_modules/@nx/react/typings/image.d.ts"
],
"exclude": [
"jest.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion graph/ui-graph/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/react/babel",
"@nx/react/babel",
{
"runtime": "automatic",
"useBuiltIns": "usage"
Expand Down
2 changes: 1 addition & 1 deletion graph/ui-graph/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ module.exports = {
'../src/lib/**/*.stories.mdx',
'../src/lib/**/*.stories.@(js|jsx|ts|tsx)',
],
addons: ['@storybook/addon-essentials', '@nrwl/react/plugins/storybook'],
addons: ['@storybook/addon-essentials', '@nx/react/plugins/storybook'],
};
6 changes: 3 additions & 3 deletions graph/ui-graph/.storybook/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"outDir": ""
},
"files": [
"../../../node_modules/@nrwl/react/typings/styled-jsx.d.ts",
"../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../../node_modules/@nrwl/react/typings/image.d.ts"
"../../../node_modules/@nx/react/typings/styled-jsx.d.ts",
"../../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../../node_modules/@nx/react/typings/image.d.ts"
],

"exclude": [
Expand Down
4 changes: 2 additions & 2 deletions graph/ui-graph/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lint": {},
"test": {},
"storybook": {
"executor": "@nrwl/storybook:storybook",
"executor": "@nx/storybook:storybook",
"options": {
"uiFramework": "@storybook/react",
"port": 4400,
Expand All @@ -21,7 +21,7 @@
}
},
"build-storybook": {
"executor": "@nrwl/storybook:build",
"executor": "@nx/storybook:build",
"outputs": ["{options.outputDir}"],
"options": {
"uiFramework": "@storybook/react",
Expand Down
4 changes: 2 additions & 2 deletions graph/ui-graph/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"lib": ["DOM", "es2019"]
},
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
"../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../node_modules/@nx/react/typings/image.d.ts"
],
"exclude": [
"jest.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion graph/ui-tooltips/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/react/babel",
"@nx/react/babel",
{
"runtime": "automatic",
"useBuiltIns": "usage"
Expand Down
2 changes: 1 addition & 1 deletion graph/ui-tooltips/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ module.exports = {
'../src/lib/**/*.stories.mdx',
'../src/lib/**/*.stories.@(js|jsx|ts|tsx)',
],
addons: ['@storybook/addon-essentials', '@nrwl/react/plugins/storybook'],
addons: ['@storybook/addon-essentials', '@nx/react/plugins/storybook'],
};
6 changes: 3 additions & 3 deletions graph/ui-tooltips/.storybook/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"outDir": ""
},
"files": [
"../../../node_modules/@nrwl/react/typings/styled-jsx.d.ts",
"../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../../node_modules/@nrwl/react/typings/image.d.ts"
"../../../node_modules/@nx/react/typings/styled-jsx.d.ts",
"../../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../../node_modules/@nx/react/typings/image.d.ts"
],
"exclude": [
"../**/*.spec.ts",
Expand Down
4 changes: 2 additions & 2 deletions graph/ui-tooltips/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lint": {},
"test": {},
"storybook": {
"executor": "@nrwl/storybook:storybook",
"executor": "@nx/storybook:storybook",
"options": {
"uiFramework": "@storybook/react",
"port": 4400,
Expand All @@ -21,7 +21,7 @@
}
},
"build-storybook": {
"executor": "@nrwl/storybook:build",
"executor": "@nx/storybook:build",
"outputs": ["{options.outputDir}"],
"options": {
"uiFramework": "@storybook/react",
Expand Down
4 changes: 2 additions & 2 deletions graph/ui-tooltips/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"types": ["node"]
},
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
"../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../node_modules/@nx/react/typings/image.d.ts"
],
"exclude": [
"jest.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getJestProjects } = require('@nrwl/jest');
const { getJestProjects } = require('@nx/jest');

export default {
projects: getJestProjects(),
Expand Down
2 changes: 1 addition & 1 deletion jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const nxPreset = require('@nrwl/jest/preset').default;
const nxPreset = require('@nx/jest/preset').default;

process.env.npm_config_registry = `http://localhost:4872`;
process.env.YARN_REGISTRY = `http://localhost:4872`;
Expand Down
2 changes: 1 addition & 1 deletion nx-dev/data-access-documents/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/react/babel",
"@nx/react/babel",
{
"runtime": "automatic",
"useBuiltIns": "usage"
Expand Down
2 changes: 1 addition & 1 deletion nx-dev/data-access-menu/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/js/babel",
"@nx/js/babel",
{
"useBuiltIns": "usage"
}
Expand Down
2 changes: 1 addition & 1 deletion nx-dev/data-access-packages/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/react/babel",
"@nx/react/babel",
{
"runtime": "automatic",
"useBuiltIns": "usage"
Expand Down
2 changes: 1 addition & 1 deletion nx-dev/feature-analytics/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/react/babel",
"@nx/react/babel",
{
"runtime": "automatic",
"useBuiltIns": "usage"
Expand Down
Loading

0 comments on commit ff8074b

Please sign in to comment.