diff --git a/dep-graph/client/jest.config.ts b/dep-graph/client/jest.config.ts index 6c5973b3e0314..153441608ab1a 100644 --- a/dep-graph/client/jest.config.ts +++ b/dep-graph/client/jest.config.ts @@ -1,7 +1,7 @@ // nx-ignore-next-line -const nxPreset = require('@nrwl/jest/preset'); +const nxPreset = require('@nrwl/jest/preset').default; -module.exports = { +export default { ...nxPreset, displayName: 'dep-graph-client', transform: { diff --git a/e2e/add-nx-to-monorepo/jest.config.ts b/e2e/add-nx-to-monorepo/jest.config.ts index 356aaf1ed1f53..9b9f74bcb67ea 100644 --- a/e2e/add-nx-to-monorepo/jest.config.ts +++ b/e2e/add-nx-to-monorepo/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-add-nx-to-monorepo', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/angular-core/jest.config.ts b/e2e/angular-core/jest.config.ts index fb1a8f0ffcde8..a233ed69f7da9 100644 --- a/e2e/angular-core/jest.config.ts +++ b/e2e/angular-core/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-angular-core', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/angular-extensions/jest.config.ts b/e2e/angular-extensions/jest.config.ts index 0e54e6da9ae11..dc39770bb0218 100644 --- a/e2e/angular-extensions/jest.config.ts +++ b/e2e/angular-extensions/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-angular-extensions', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/cli/jest.config.ts b/e2e/cli/jest.config.ts index c4a38020d06c1..0a249cad9a484 100644 --- a/e2e/cli/jest.config.ts +++ b/e2e/cli/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-cli', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/cypress/jest.config.ts b/e2e/cypress/jest.config.ts index 0fc5436adaf69..98790acbd08ff 100644 --- a/e2e/cypress/jest.config.ts +++ b/e2e/cypress/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-cypress', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/detox/jest.config.ts b/e2e/detox/jest.config.ts index 7ae891b2e137f..5ffbe27a48732 100644 --- a/e2e/detox/jest.config.ts +++ b/e2e/detox/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -7,5 +7,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-detox', testTimeout: 600000, - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/jest/jest.config.ts b/e2e/jest/jest.config.ts index 3186befe597ae..eb0b577e0bd82 100644 --- a/e2e/jest/jest.config.ts +++ b/e2e/jest/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-jest', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/js/jest.config.ts b/e2e/js/jest.config.ts index f459796532711..1c5de2ee378e8 100644 --- a/e2e/js/jest.config.ts +++ b/e2e/js/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-js', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/linter/jest.config.ts b/e2e/linter/jest.config.ts index da89c131b1871..ac32c36e93b1a 100644 --- a/e2e/linter/jest.config.ts +++ b/e2e/linter/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-linter', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/next/jest.config.ts b/e2e/next/jest.config.ts index 025c481970945..2a42f80c96415 100644 --- a/e2e/next/jest.config.ts +++ b/e2e/next/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-next', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/node/jest.config.ts b/e2e/node/jest.config.ts index 3bb5a0f319b16..00469c6e89dde 100644 --- a/e2e/node/jest.config.ts +++ b/e2e/node/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/nx-plugin/jest.config.ts b/e2e/nx-plugin/jest.config.ts index 2c4ec7c241930..5598b04cf04ea 100644 --- a/e2e/nx-plugin/jest.config.ts +++ b/e2e/nx-plugin/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-nx-plugin', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/react-native/jest.config.ts b/e2e/react-native/jest.config.ts index dad9c2434a134..28b8eed7cd0b9 100644 --- a/e2e/react-native/jest.config.ts +++ b/e2e/react-native/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -7,5 +7,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-react-native', testTimeout: 600000, - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/react/jest.config.ts b/e2e/react/jest.config.ts index e4a2cdcaa457c..7f3fafeb38f0d 100644 --- a/e2e/react/jest.config.ts +++ b/e2e/react/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-react', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/storybook/jest.config.ts b/e2e/storybook/jest.config.ts index ef8abd5e6f467..2a3a353089557 100644 --- a/e2e/storybook/jest.config.ts +++ b/e2e/storybook/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-storybook', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/utils/index.ts b/e2e/utils/index.ts index d89561f547b66..708532960e56e 100644 --- a/e2e/utils/index.ts +++ b/e2e/utils/index.ts @@ -171,7 +171,8 @@ export function runCreateWorkspace( const create = execSync(command, { cwd: e2eCwd, - stdio: [0, 1, 2], + // stdio: [0, 1, 2], + stdio: ['pipe', 'pipe', 'pipe'], env: process.env, encoding: 'utf-8', }); @@ -212,7 +213,8 @@ export function runCreatePlugin( const create = execSync(command, { cwd: e2eCwd, - stdio: [0, 1, 2], + //stdio: [0, 1, 2], + stdio: ['pipe', 'pipe', 'pipe'], env: process.env, encoding: 'utf-8', }); @@ -232,7 +234,8 @@ export function packageInstall( .join(' '); const install = execSync(`${pm.addDev} ${pkgsWithVersions}`, { cwd, - stdio: [0, 1, 2], + // stdio: [0, 1, 2], + stdio: ['pipe', 'pipe', 'pipe'], env: process.env, encoding: 'utf-8', }); diff --git a/e2e/web/jest.config.ts b/e2e/web/jest.config.ts index e6345791a987b..8bfb28a5d003d 100644 --- a/e2e/web/jest.config.ts +++ b/e2e/web/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-web', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/workspace-core/jest.config.ts b/e2e/workspace-core/jest.config.ts index 9368dd60554bd..ae23c9e915d5f 100644 --- a/e2e/workspace-core/jest.config.ts +++ b/e2e/workspace-core/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-workspace-core', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/workspace-create/jest.config.ts b/e2e/workspace-create/jest.config.ts index 44ab65491f146..61d064457a79f 100644 --- a/e2e/workspace-create/jest.config.ts +++ b/e2e/workspace-create/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-workspace-create', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/workspace-integrations/jest.config.ts b/e2e/workspace-integrations/jest.config.ts index 0b606c65e4111..341d0d623751b 100644 --- a/e2e/workspace-integrations/jest.config.ts +++ b/e2e/workspace-integrations/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { maxWorkers: 1, globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'e2e-workspace-integrations', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/e2e/workspace-integrations/src/workspace-aux-commands.test.ts b/e2e/workspace-integrations/src/workspace-aux-commands.test.ts index d887106aa97b9..40d25d0a223c9 100644 --- a/e2e/workspace-integrations/src/workspace-aux-commands.test.ts +++ b/e2e/workspace-integrations/src/workspace-aux-commands.test.ts @@ -87,7 +87,7 @@ describe('format', () => { } }, 90000); - it('should check spoecific project', async () => { + it('should check specific project', async () => { if (isNotWindows()) { const stdout = runCLI(`format:check --projects=${myapp}`, { silenceError: true, diff --git a/jest.config.ts b/jest.config.ts index 42c86fd0ca4dc..dafe1653a539d 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,5 +1,5 @@ const { getJestProjects } = require('@nrwl/jest'); -module.exports = { +export default { projects: getJestProjects(), }; diff --git a/jest.preset.ts b/jest.preset.js similarity index 89% rename from jest.preset.ts rename to jest.preset.js index f4300654706f4..01a7af2a0343b 100644 --- a/jest.preset.ts +++ b/jest.preset.js @@ -1,4 +1,4 @@ -const nxPreset = require('@nrwl/jest/preset'); +const nxPreset = require('@nrwl/jest/preset').default; process.env.npm_config_registry = `http://localhost:4872`; process.env.YARN_REGISTRY = `http://localhost:4872`; diff --git a/nx-dev/data-access-documents/jest.config.ts b/nx-dev/data-access-documents/jest.config.ts index eedaf937965b9..e0497a36f5897 100644 --- a/nx-dev/data-access-documents/jest.config.ts +++ b/nx-dev/data-access-documents/jest.config.ts @@ -1,5 +1,5 @@ -const nxPreset = require('@nrwl/jest/preset'); -module.exports = { +const nxPreset = require('@nrwl/jest/preset').default; +export default { ...nxPreset, setupFilesAfterEnv: ['/src/test-setup.ts'], displayName: 'nx-dev-data-access-documents', diff --git a/nx-dev/data-access-menu/jest.config.ts b/nx-dev/data-access-menu/jest.config.ts index 1adbc8b4b500f..9aed2df4b6a79 100644 --- a/nx-dev/data-access-menu/jest.config.ts +++ b/nx-dev/data-access-menu/jest.config.ts @@ -1,6 +1,6 @@ -module.exports = { +export default { displayName: 'nx-dev-data-access-menu', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json', diff --git a/nx-dev/data-access-packages/jest.config.ts b/nx-dev/data-access-packages/jest.config.ts index 246edfb3b8d92..2aadab82a85ad 100644 --- a/nx-dev/data-access-packages/jest.config.ts +++ b/nx-dev/data-access-packages/jest.config.ts @@ -1,5 +1,5 @@ -const nxPreset = require('@nrwl/jest/preset'); -module.exports = { +const nxPreset = require('@nrwl/jest/preset').default; +export default { ...nxPreset, setupFilesAfterEnv: ['/src/test-setup.ts'], displayName: 'nx-dev-data-access-packages', diff --git a/nx-dev/feature-analytics/jest.config.ts b/nx-dev/feature-analytics/jest.config.ts index 5f6db5d9d9d3b..a942aa952c80a 100644 --- a/nx-dev/feature-analytics/jest.config.ts +++ b/nx-dev/feature-analytics/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-feature-analytics', transform: { @@ -6,5 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/feature-analytics', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/feature-doc-viewer/jest.config.ts b/nx-dev/feature-doc-viewer/jest.config.ts index 93605ab2e29b5..a692f86a3d3d3 100644 --- a/nx-dev/feature-doc-viewer/jest.config.ts +++ b/nx-dev/feature-doc-viewer/jest.config.ts @@ -1,5 +1,5 @@ -const nxPreset = require('@nrwl/jest/preset'); -module.exports = { +const nxPreset = require('@nrwl/jest/preset').default; +export default { ...nxPreset, displayName: 'nx-dev-feature-doc-viewer', transform: { diff --git a/nx-dev/feature-package-schema-viewer/jest.config.ts b/nx-dev/feature-package-schema-viewer/jest.config.ts index 4cca991c7deda..ee031c6339333 100644 --- a/nx-dev/feature-package-schema-viewer/jest.config.ts +++ b/nx-dev/feature-package-schema-viewer/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-feature-package-schema-viewer', globals: { @@ -11,5 +11,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/feature-package-schema-viewer', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/feature-search/jest.config.ts b/nx-dev/feature-search/jest.config.ts index 1746df5d05a58..15c3b13394999 100644 --- a/nx-dev/feature-search/jest.config.ts +++ b/nx-dev/feature-search/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-feature-search', transform: { @@ -6,5 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/feature-search', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/models-document/jest.config.ts b/nx-dev/models-document/jest.config.ts index 2ce9d3d03c73e..027628796b2c2 100644 --- a/nx-dev/models-document/jest.config.ts +++ b/nx-dev/models-document/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-models-document', globals: { @@ -12,5 +12,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/models-document', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/models-menu/jest.config.ts b/nx-dev/models-menu/jest.config.ts index e49d5b4255165..16d6997e48082 100644 --- a/nx-dev/models-menu/jest.config.ts +++ b/nx-dev/models-menu/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-models-menu', globals: { @@ -12,5 +12,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/models-menu', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/models-package/jest.config.ts b/nx-dev/models-package/jest.config.ts index 17b7153889e5d..b59f3f9373e4d 100644 --- a/nx-dev/models-package/jest.config.ts +++ b/nx-dev/models-package/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-models-package', globals: { @@ -12,5 +12,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/models-package', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/nx-dev/jest.config.ts b/nx-dev/nx-dev/jest.config.ts index f20ab6b7a0161..0aec0a0d785fd 100644 --- a/nx-dev/nx-dev/jest.config.ts +++ b/nx-dev/nx-dev/jest.config.ts @@ -1,5 +1,5 @@ -const nxPreset = require('@nrwl/jest/preset'); -module.exports = { +const nxPreset = require('@nrwl/jest/preset').default; +export default { ...nxPreset, displayName: 'nx-dev', transform: { diff --git a/nx-dev/ui-commands/jest.config.ts b/nx-dev/ui-commands/jest.config.ts index c117afd932a5e..1077039600d64 100644 --- a/nx-dev/ui-commands/jest.config.ts +++ b/nx-dev/ui-commands/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-ui-commands', transform: { @@ -6,5 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage//nx-dev/ui-commands', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/ui-common/jest.config.ts b/nx-dev/ui-common/jest.config.ts index b477fb26e44d2..29506e0a20f58 100644 --- a/nx-dev/ui-common/jest.config.ts +++ b/nx-dev/ui-common/jest.config.ts @@ -1,5 +1,5 @@ -const nxPreset = require('@nrwl/jest/preset'); -module.exports = { +const nxPreset = require('@nrwl/jest/preset').default; +export default { ...nxPreset, displayName: 'nx-dev-ui-common', transform: { diff --git a/nx-dev/ui-community/jest.config.ts b/nx-dev/ui-community/jest.config.ts index f681266280253..8341466421143 100644 --- a/nx-dev/ui-community/jest.config.ts +++ b/nx-dev/ui-community/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-ui-community', transform: { @@ -6,5 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/ui-community', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/ui-conference/jest.config.ts b/nx-dev/ui-conference/jest.config.ts index e5a8c3765de17..cb3c2e8c9f2e7 100644 --- a/nx-dev/ui-conference/jest.config.ts +++ b/nx-dev/ui-conference/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-ui-conference', transform: { @@ -7,5 +7,5 @@ module.exports = { moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/ui-conference', setupFilesAfterEnv: ['/test-setup.ts'], - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/ui-home/jest.config.ts b/nx-dev/ui-home/jest.config.ts index 65ee762cd948d..f8fbac9addcee 100644 --- a/nx-dev/ui-home/jest.config.ts +++ b/nx-dev/ui-home/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'nx-dev-ui-home', transform: { @@ -6,5 +6,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/ui-home', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/ui-member-card/jest.config.ts b/nx-dev/ui-member-card/jest.config.ts index b0d9b3cffb852..8c304e4f92824 100644 --- a/nx-dev/ui-member-card/jest.config.ts +++ b/nx-dev/ui-member-card/jest.config.ts @@ -1,6 +1,6 @@ -const nxPreset = require('@nrwl/jest/preset'); +const nxPreset = require('@nrwl/jest/preset').default; -module.exports = { +export default { ...nxPreset, displayName: 'nx-dev-ui-member-card', @@ -10,5 +10,5 @@ module.exports = { moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/ui-member-card', setupFilesAfterEnv: ['/test-setup.ts'], - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/ui-sponsor-card/jest.config.ts b/nx-dev/ui-sponsor-card/jest.config.ts index 9943db85f335e..ec0c8168346c5 100644 --- a/nx-dev/ui-sponsor-card/jest.config.ts +++ b/nx-dev/ui-sponsor-card/jest.config.ts @@ -1,6 +1,6 @@ -const nxPreset = require('@nrwl/jest/preset'); +const nxPreset = require('@nrwl/jest/preset').default; -module.exports = { +export default { ...nxPreset, displayName: 'nx-dev-ui-sponsor-card', @@ -10,5 +10,5 @@ module.exports = { moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/ui-sponsor-card', setupFilesAfterEnv: ['/test-setup.ts'], - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/package.json b/package.json index 47b6661562f90..e5df5c00ecaca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nrwl/nx-source", - "version": "14.1.6", + "version": "14.1.7-beta.2", "description": "Smart, Fast and Extensible Build System", "homepage": "https://nx.dev", "private": true, @@ -58,12 +58,12 @@ "@ngrx/schematics": "~13.0.0", "@ngrx/store": "~13.0.0", "@ngrx/store-devtools": "~13.0.0", - "@nrwl/eslint-plugin-nx": "14.1.1", - "@nrwl/jest": "14.1.1", - "@nrwl/next": "14.1.1", + "@nrwl/eslint-plugin-nx": "14.1.6", + "@nrwl/jest": "14.1.6", + "@nrwl/next": "14.1.6", "@nrwl/nx-cloud": "14.0.3", - "@nrwl/react": "14.1.1", - "@nrwl/web": "14.1.1", + "@nrwl/react": "14.1.6", + "@nrwl/web": "14.1.6", "@parcel/watcher": "2.0.4", "@phenomnomnominal/tsquery": "4.1.1", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1", @@ -187,7 +187,7 @@ "ng-packagr": "~13.3.0", "ngrx-store-freeze": "0.2.4", "node-fetch": "^2.6.7", - "nx": "14.1.1", + "nx": "14.1.6", "open": "^8.4.0", "parse-markdown-links": "^1.0.4", "parse5": "4.0.0", @@ -306,4 +306,5 @@ "**/xmlhttprequest-ssl": "~1.6.2", "minimist": "^1.2.6" } -} \ No newline at end of file +} + diff --git a/packages/add-nx-to-monorepo/jest.config.ts b/packages/add-nx-to-monorepo/jest.config.ts index c4aa7ff5e9528..48aae21e661f6 100644 --- a/packages/add-nx-to-monorepo/jest.config.ts +++ b/packages/add-nx-to-monorepo/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'add-nx-to-monorepo', globals: { @@ -11,5 +11,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/projects/add-nx-to-monorepo', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/angular/jest.config.ts b/packages/angular/jest.config.ts index 8aa767f00b65e..afe8f90de9418 100644 --- a/packages/angular/jest.config.ts +++ b/packages/angular/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'angular', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/cli/jest.config.ts b/packages/cli/jest.config.ts index 3fffb99381b84..421c5b05fd67c 100644 --- a/packages/cli/jest.config.ts +++ b/packages/cli/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'cli', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/cra-to-nx/jest.config.ts b/packages/cra-to-nx/jest.config.ts index b45433767a7ed..d30ebe2b646d3 100644 --- a/packages/cra-to-nx/jest.config.ts +++ b/packages/cra-to-nx/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'cra-to-nx', globals: { @@ -11,5 +11,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/projects/cra-to-nx', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/create-nx-plugin/jest.config.ts b/packages/create-nx-plugin/jest.config.ts index 19263a174481b..723774ed5a39c 100644 --- a/packages/create-nx-plugin/jest.config.ts +++ b/packages/create-nx-plugin/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'create-nx-plugin', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/create-nx-workspace/jest.config.ts b/packages/create-nx-workspace/jest.config.ts index f2e3441b76445..57e2336df32e4 100644 --- a/packages/create-nx-workspace/jest.config.ts +++ b/packages/create-nx-workspace/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'create-nx-workspace', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/cypress/jest.config.ts b/packages/cypress/jest.config.ts index d049af6e27668..ad745bf7839aa 100644 --- a/packages/cypress/jest.config.ts +++ b/packages/cypress/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'cypress', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/detox/jest.config.ts b/packages/detox/jest.config.ts index 21e300cad165b..ada854977c192 100644 --- a/packages/detox/jest.config.ts +++ b/packages/detox/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -9,5 +9,5 @@ module.exports = { displayName: 'react-native', testEnvironment: 'node', verbose: true, - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/devkit/jest.config.ts b/packages/devkit/jest.config.ts index 3fffb99381b84..421c5b05fd67c 100644 --- a/packages/devkit/jest.config.ts +++ b/packages/devkit/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'cli', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/eslint-plugin-nx/jest.config.ts b/packages/eslint-plugin-nx/jest.config.ts index c929bd41dcd4e..f1f0c17ab5362 100644 --- a/packages/eslint-plugin-nx/jest.config.ts +++ b/packages/eslint-plugin-nx/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'eslint-plugin-nx', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/express/jest.config.ts b/packages/express/jest.config.ts index a56ad5186bdc1..dee5e5b485aef 100644 --- a/packages/express/jest.config.ts +++ b/packages/express/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'express', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/jest/jest.config.ts b/packages/jest/jest.config.ts index a38430f94db8d..23e1e88618013 100644 --- a/packages/jest/jest.config.ts +++ b/packages/jest/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'jest', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/js/jest.config.ts b/packages/js/jest.config.ts index a38430f94db8d..23e1e88618013 100644 --- a/packages/js/jest.config.ts +++ b/packages/js/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'jest', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/linter/jest.config.ts b/packages/linter/jest.config.ts index 011dc7cb4059d..9a27de03c9d49 100644 --- a/packages/linter/jest.config.ts +++ b/packages/linter/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'linter', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/nest/jest.config.ts b/packages/nest/jest.config.ts index dc9fc79e89c1b..5fe74f20debdf 100644 --- a/packages/nest/jest.config.ts +++ b/packages/nest/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'nest', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/next/jest.config.ts b/packages/next/jest.config.ts index 4388b1356fd29..6c4aee53a8527 100644 --- a/packages/next/jest.config.ts +++ b/packages/next/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'next', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/node/jest.config.ts b/packages/node/jest.config.ts index cc558875e7ebb..ec1096a9d0e48 100644 --- a/packages/node/jest.config.ts +++ b/packages/node/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'node', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/nx-plugin/jest.config.ts b/packages/nx-plugin/jest.config.ts index a0436c49ee371..5da844f8e972c 100644 --- a/packages/nx-plugin/jest.config.ts +++ b/packages/nx-plugin/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'nx-plugin', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/nx/jest.config.ts b/packages/nx/jest.config.ts index 669c2c922ec85..50a5791b82cca 100644 --- a/packages/nx/jest.config.ts +++ b/packages/nx/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'nx', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/nx/src/command-line/nx-commands.ts b/packages/nx/src/command-line/nx-commands.ts index 3a49661e26736..3d092f0990bca 100644 --- a/packages/nx/src/command-line/nx-commands.ts +++ b/packages/nx/src/command-line/nx-commands.ts @@ -17,8 +17,6 @@ yargs.wrap(yargs.terminalWidth()); export const parserConfiguration: Partial = { 'strip-dashed': true, - // allow parsing --env.SOME_ARG for cypress cli env args - 'dot-notation': true, }; /** @@ -312,6 +310,9 @@ ${daemonHelpOutput} function withFormatOptions(yargs: yargs.Argv): yargs.Argv { return withAffectedOptions(yargs) + .parserConfiguration({ + 'camel-case-expansion': true, + }) .option('libs-and-apps', { describe: 'Format only libraries and applications files.', type: 'boolean', @@ -346,6 +347,11 @@ function withPlainOption(yargs: yargs.Argv): yargs.Argv { function withAffectedOptions(yargs: yargs.Argv): yargs.Argv { return yargs + .parserConfiguration({ + 'camel-case-expansion': false, + // allow parsing --env.SOME_ARG for cypress cli env args + 'dot-notation': true, + }) .option('files', { describe: 'Change the way Nx is calculating the affected command by providing directly changed files, list of files delimited by commas', @@ -429,6 +435,11 @@ function withAffectedOptions(yargs: yargs.Argv): yargs.Argv { function withRunManyOptions(yargs: yargs.Argv): yargs.Argv { return yargs + .parserConfiguration({ + 'camel-case-expansion': false, + // allow parsing --env.SOME_ARG for cypress cli env args + 'dot-notation': true, + }) .option('projects', { describe: 'Projects to run (comma delimited)', type: 'string', @@ -595,6 +606,11 @@ function withRunOneOptions(yargs: yargs.Argv) { process.argv[2] === 'run' && process.argv[3] === '--help' ); const res = yargs + .parserConfiguration({ + 'camel-case-expansion': false, + // allow parsing --env.SOME_ARG for cypress cli env args + 'dot-notation': true, + }) .option('prod', { describe: 'Use the production configuration', type: 'boolean', diff --git a/packages/nx/src/executors/run-commands/run-commands.impl.ts b/packages/nx/src/executors/run-commands/run-commands.impl.ts index 9b678e36e7324..5556da19de6f9 100644 --- a/packages/nx/src/executors/run-commands/run-commands.impl.ts +++ b/packages/nx/src/executors/run-commands/run-commands.impl.ts @@ -289,7 +289,7 @@ function transformCommand( ) { if (command.indexOf('{args.') > -1) { const regex = /{args\.([^}]+)}/g; - return command.replace(regex, (_, group: string) => args[camelCase(group)]); + return command.replace(regex, (_, group: string) => args[group]); } else if (Object.keys(args).length > 0 && forwardAllArgs) { const stringifiedArgs = Object.keys(args) .map((a) => @@ -313,16 +313,6 @@ function parseArgs(options: RunCommandsOptions) { return unknownOptionsTreatedAsArgs; } return yargsParser(args.replace(/(^"|"$)/g, ''), { - configuration: { 'camel-case-expansion': true }, + configuration: { 'camel-case-expansion': false }, }); } - -function camelCase(input) { - if (input.indexOf('-') > 1) { - return input - .toLowerCase() - .replace(/-(.)/g, (match, group1) => group1.toUpperCase()); - } else { - return input; - } -} diff --git a/packages/nx/src/utils/command-line-utils.spec.ts b/packages/nx/src/utils/command-line-utils.spec.ts index 1fa525af6d046..2718b7c2813a1 100644 --- a/packages/nx/src/utils/command-line-utils.spec.ts +++ b/packages/nx/src/utils/command-line-utils.spec.ts @@ -39,7 +39,6 @@ describe('splitArgs', () => { }, 'affected' ).nxArgs; - expect(nxArgs['nx-key']).toEqual('some-value'); expect(nxArgs['nxKey']).toEqual('some-value'); }); diff --git a/packages/nx/src/utils/command-line-utils.ts b/packages/nx/src/utils/command-line-utils.ts index e3a44a1db5ed4..7806bf911a4c0 100644 --- a/packages/nx/src/utils/command-line-utils.ts +++ b/packages/nx/src/utils/command-line-utils.ts @@ -74,14 +74,14 @@ const runOne: string[] = [ 'prod', 'runner', 'parallel', - 'max-parallel', + 'maxParallel', 'exclude', - 'only-failed', + 'onlyFailed', 'help', - 'with-deps', - 'skip-nx-cache', + 'withDeps', + 'skipNxCache', 'scan', - 'output-style', + 'outputStyle', ]; const runMany: string[] = [...runOne, 'projects', 'all']; @@ -144,7 +144,7 @@ export function splitArgsIntoNxArgsAndOverrides( const nxArgs: RawNxArgs = {}; const overrides = yargsParser(args._ as string[], { configuration: { - 'strip-dashed': true, + 'camel-case-expansion': false, 'dot-notation': false, }, }); @@ -154,9 +154,9 @@ export function splitArgsIntoNxArgsAndOverrides( delete overrides._; Object.entries(args).forEach(([key, value]) => { - const dasherized = names(key).fileName; - if (nxSpecific.includes(dasherized) || dasherized.startsWith('nx-')) { - if (value !== undefined) nxArgs[key] = value; + const camelCased = names(key).propertyName; + if (nxSpecific.includes(camelCased) || camelCased.startsWith('nx')) { + if (value !== undefined) nxArgs[camelCased] = value; } else if (!ignoreArgs.includes(key)) { overrides[key] = value; } diff --git a/packages/nx/src/utils/params.spec.ts b/packages/nx/src/utils/params.spec.ts index 3d619d8bed986..55aa5d45c15bb 100644 --- a/packages/nx/src/utils/params.spec.ts +++ b/packages/nx/src/utils/params.spec.ts @@ -7,7 +7,6 @@ import { convertAliases, convertSmartDefaultsIntoNamedParams, convertToCamelCase, - lookupUnmatched, Schema, setDefaults, validateOptsAgainstSchema, @@ -329,12 +328,18 @@ describe('params', () => { }); describe('convertToCamelCase', () => { - it('should convert dash case to camel case', () => { + it('should convert dash case to camel case if the came case property is present in schema', () => { expect( convertToCamelCase( yargsParser(['--one-two', '1'], { number: ['oneTwo'], - }) + configuration: { + 'camel-case-expansion': false, + }, + }), + { + properties: { oneTwo: 'some object' }, + } as any ) ).toEqual({ _: [], @@ -342,12 +347,36 @@ describe('params', () => { }); }); + it('should not convert dash case to camel case if the came case property is not present in schema', () => { + expect( + convertToCamelCase( + yargsParser(['--one-two', '1'], { + configuration: { + 'camel-case-expansion': false, + }, + }), + { + properties: {}, + } as any + ) + ).toEqual({ + _: [], + 'one-two': 1, + }); + }); + it('should not convert camel case', () => { expect( convertToCamelCase( yargsParser(['--oneTwo', '1'], { number: ['oneTwo'], - }) + configuration: { + 'camel-case-expansion': false, + }, + }), + { + properties: { oneTwo: 'some object' }, + } as any ) ).toEqual({ _: [], @@ -360,7 +389,13 @@ describe('params', () => { convertToCamelCase( yargsParser(['--one-Two', '1'], { number: ['oneTwo'], - }) + configuration: { + 'camel-case-expansion': false, + }, + }), + { + properties: { oneTwo: 'some object' }, + } as any ) ).toEqual({ _: [], @@ -436,62 +471,6 @@ describe('params', () => { }); }); - describe('lookupUnmatched', () => { - it('should populate the possible array with near matches', () => { - expect( - lookupUnmatched( - { - '--': [ - { - name: 'directoy', - possible: [], - }, - ], - }, - { - properties: { directory: { type: 'string' } }, - required: [], - description: '', - } - ) - ).toEqual({ - '--': [ - { - name: 'directoy', - possible: ['directory'], - }, - ], - }); - }); - - it('should NOT populate the possible array with far matches', () => { - expect( - lookupUnmatched( - { - '--': [ - { - name: 'directoy', - possible: [], - }, - ], - }, - { - properties: { faraway: { type: 'string' } }, - required: [], - description: '', - } - ) - ).toEqual({ - '--': [ - { - name: 'directoy', - possible: [], - }, - ], - }); - }); - }); - describe('setDefault', () => { it('should set default values', () => { const opts = setDefaults( diff --git a/packages/nx/src/utils/params.ts b/packages/nx/src/utils/params.ts index 0720403e3745e..13bf2ff5d03f7 100644 --- a/packages/nx/src/utils/params.ts +++ b/packages/nx/src/utils/params.ts @@ -96,11 +96,17 @@ function camelCase(input: string): string { } } -export function convertToCamelCase(parsed: { [k: string]: any }): Options { - return Object.keys(parsed).reduce( - (m, c) => ({ ...m, [camelCase(c)]: parsed[c] }), - {} - ); +export function convertToCamelCase( + parsed: { [k: string]: any }, + schema: Schema +): Options { + return Object.keys(parsed).reduce((m, c) => { + if (schema.properties[camelCase(c)]) { + return { ...m, [camelCase(c)]: parsed[c] }; + } else { + return { ...m, [c]: parsed[c] }; + } + }, {}); } /** @@ -520,7 +526,7 @@ export function combineOptionsForExecutor( isVerbose = false ) { const r = convertAliases( - coerceTypesInOptions(commandLineOpts, schema), + coerceTypesInOptions(convertToCamelCase(commandLineOpts, schema), schema), schema, false ); @@ -742,26 +748,6 @@ async function promptForValues(opts: Options, schema: Schema) { }); } -/** - * Tries to find what the user meant by unmatched commands - * - * @param opts The options passed in by the user - * @param schema The schema definition to check against - * - */ -export function lookupUnmatched(opts: Options, schema: Schema): Options { - if (opts['--']) { - const props = Object.keys(schema.properties); - - opts['--'].forEach((unmatched) => { - unmatched.possible = props.filter( - (p) => levenshtein(p, unmatched.name) < 3 - ); - }); - } - return opts; -} - function findSchemaForProperty( propName: string, schema: Schema @@ -784,37 +770,6 @@ function findSchemaForProperty( return null; } -function levenshtein(a: string, b: string) { - if (a.length == 0) { - return b.length; - } - if (b.length == 0) { - return a.length; - } - const matrix = []; - - for (let i = 0; i <= b.length; i++) { - matrix[i] = [i]; - } - for (let j = 0; j <= a.length; j++) { - matrix[0][j] = j; - } - for (let i = 1; i <= b.length; i++) { - for (let j = 1; j <= a.length; j++) { - if (b.charAt(i - 1) == a.charAt(j - 1)) { - matrix[i][j] = matrix[i - 1][j - 1]; - } else { - matrix[i][j] = Math.min( - matrix[i - 1][j - 1] + 1, - matrix[i][j - 1] + 1, - matrix[i - 1][j] + 1 - ); - } - } - } - return matrix[b.length][a.length]; -} - function isTTY(): boolean { return !!process.stdout.isTTY && process.env['CI'] !== 'true'; } diff --git a/packages/react-native/jest.config.ts b/packages/react-native/jest.config.ts index 21e79e293a055..27772b3edc49c 100644 --- a/packages/react-native/jest.config.ts +++ b/packages/react-native/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -8,5 +8,5 @@ module.exports = { }, displayName: 'react-native', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/react/jest.config.ts b/packages/react/jest.config.ts index a7ecd6d5bd3d0..b021f4414c434 100644 --- a/packages/react/jest.config.ts +++ b/packages/react/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'react', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/storybook/jest.config.ts b/packages/storybook/jest.config.ts index dbac6a4569859..029bedc1cc45d 100644 --- a/packages/storybook/jest.config.ts +++ b/packages/storybook/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -8,5 +8,5 @@ module.exports = { }, displayName: 'storybook', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/tao/jest.config.ts b/packages/tao/jest.config.ts index e109c52fe7ee8..8e2ff397e9e13 100644 --- a/packages/tao/jest.config.ts +++ b/packages/tao/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'tao', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/web/jest.config.ts b/packages/web/jest.config.ts index 0800c2a1e7a90..76ff04d32ec92 100644 --- a/packages/web/jest.config.ts +++ b/packages/web/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'web', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/packages/workspace/jest.config.ts b/packages/workspace/jest.config.ts index 39f14211e888c..49ce93dd83b16 100644 --- a/packages/workspace/jest.config.ts +++ b/packages/workspace/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, @@ -6,5 +6,5 @@ module.exports = { globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json' } }, displayName: 'workspace', testEnvironment: 'node', - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/tools/eslint-rules/jest.config.ts b/tools/eslint-rules/jest.config.ts index 2aaa9cc2e3251..8b11fa98b5690 100644 --- a/tools/eslint-rules/jest.config.ts +++ b/tools/eslint-rules/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'eslint-rules', globals: { @@ -14,5 +14,5 @@ module.exports = { moduleNameMapper: { '@eslint/eslintrc': '@eslint/eslintrc/dist/eslintrc-universal.cjs', }, - preset: '../../jest.preset.ts', + preset: '../../jest.preset.js', }; diff --git a/typedoc-theme/jest.config.ts b/typedoc-theme/jest.config.ts index ddb5ff45295c1..20adf1318f68f 100644 --- a/typedoc-theme/jest.config.ts +++ b/typedoc-theme/jest.config.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { displayName: 'typedoc-theme', globals: { @@ -12,5 +12,5 @@ module.exports = { resolver: '../scripts/patched-jest-resolver.js', moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../coverage/typedoc-theme', - preset: '../jest.preset.ts', + preset: '../jest.preset.js', }; diff --git a/yarn.lock b/yarn.lock index 99f5b27366485..eeb64af0abeeb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2651,22 +2651,22 @@ node-gyp "^8.2.0" read-package-json-fast "^2.0.1" -"@nrwl/cli@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-14.1.1.tgz#5814932d771f1c00705bdfc957a45df56af5da79" - integrity sha512-QSARR7H2nmYfWT78MP3DszM9QLPYxia99sO8w5Y4iuz63AoilC4vQfsFaWwhRLxp05LzouAiBkdk3RytQazoqA== +"@nrwl/cli@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-14.1.6.tgz#c0e7c67d132bf8bda2b8ee74247f357d604f0352" + integrity sha512-1XHfj1GTpzotYf1b2Ljx4xCT2RJ2CM4/YygxGaM285AU4972eIf+DS/Pe4Bukqf83+EpC0dyQ4ruZmaHw/BkBw== dependencies: - nx "14.1.1" + nx "14.1.6" -"@nrwl/cypress@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-14.1.1.tgz#0d51611d4aebb76ca57f57bf154428be4c1c63c6" - integrity sha512-T7uRQbuU/+laMPqjPjgHajuORu/EzgQyOHzfwDHB20SFmp1hh/GJewXq+LHy78QxWtN4hB/ehso2ZmvdVz5s0w== +"@nrwl/cypress@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-14.1.6.tgz#cf26eaa2dc732ac669383aaf8d6c5da20c6a7337" + integrity sha512-0ya6DWbo3V7V66a/5x/XTbrKvX7qq0PUwDaERWJr6IDS5csb8r05gW5VIf36BTNiI61gC11iSW74IforB32faA== dependencies: "@cypress/webpack-preprocessor" "^5.9.1" - "@nrwl/devkit" "14.1.1" - "@nrwl/linter" "14.1.1" - "@nrwl/workspace" "14.1.1" + "@nrwl/devkit" "14.1.6" + "@nrwl/linter" "14.1.6" + "@nrwl/workspace" "14.1.6" chalk "4.1.0" enhanced-resolve "^5.8.3" fork-ts-checker-webpack-plugin "6.2.10" @@ -2677,10 +2677,10 @@ tslib "^2.3.0" webpack-node-externals "^3.0.0" -"@nrwl/devkit@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-14.1.1.tgz#b7425b863c3a900e10745f05a59c6ea0f8258296" - integrity sha512-+nKJZRtgyuZHJIb3STNPMU1ZskKYL25NJry1IcnLpAIHVDY8vCru9AR0k3gChqzHE1PwR0cU0Zeyr0NeBdl0mw== +"@nrwl/devkit@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-14.1.6.tgz#b11170dd71d62751aba480773b1a26488ccce669" + integrity sha512-AR/hOPEtFyHGj8ZLkddorehHI1Ac50eWhgHY3zhgIl86ZelNJZJQpGyEmoJOmKs6P9m38kUCoinn4jnfuh1EKQ== dependencies: ejs "^3.1.7" ignore "^5.0.4" @@ -2688,25 +2688,25 @@ semver "7.3.4" tslib "^2.3.0" -"@nrwl/eslint-plugin-nx@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-14.1.1.tgz#83385c4de7281c57737130038ff1c7db7e66f228" - integrity sha512-+v5WEs5Ka8uCAAJV0T0yDIByjcWa/ro7savgxHs0Hpj1KVKy1Fo3E7uZR7545gPFtKPr7EYznn59c/yIj1o4ZQ== +"@nrwl/eslint-plugin-nx@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-14.1.6.tgz#284427903ff3750dc7eacb26c08945a94da569be" + integrity sha512-twv79FRf7ArwzkbzdJbKAP3jJWSAhNbIyB+JXuY0MxoPxER4/tucM6Xj//e72XKZlM6MUwplNDHzuwzy/zTUDQ== dependencies: - "@nrwl/devkit" "14.1.1" - "@nrwl/workspace" "14.1.1" + "@nrwl/devkit" "14.1.6" + "@nrwl/workspace" "14.1.6" "@typescript-eslint/experimental-utils" "~5.18.0" chalk "4.1.0" confusing-browser-globals "^1.0.9" -"@nrwl/jest@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-14.1.1.tgz#179aea798c2c9c284bdf5246b3b7e2a7c12fe8f1" - integrity sha512-F2ruXro5xQT4HY7b4beHCCCPW8Cc0STCrJ++AyhZzg/0xiOqTnkyx0GuBIyNG2IoC4FcAGFdsRl84WWpKzLC3w== +"@nrwl/jest@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-14.1.6.tgz#2fc960ad815f9776fc73a593a43ef58297f0e72f" + integrity sha512-aYoNT9N2ar2aeIu9xYmjEWbNaWi9A8z3REhMTtL+Z649EaGzOxGnI3FUU6PUZH4H4J6nP4ni15Hiu3jeaIPa8w== dependencies: "@jest/reporters" "27.5.1" "@jest/test-result" "27.5.1" - "@nrwl/devkit" "14.1.1" + "@nrwl/devkit" "14.1.6" chalk "4.1.0" identity-obj-proxy "3.0.0" jest-config "27.5.1" @@ -2716,53 +2716,53 @@ rxjs "^6.5.4" tslib "^2.3.0" -"@nrwl/js@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-14.1.1.tgz#02a9c73d30301f74b4d55aeeb161ea755976282b" - integrity sha512-TK99dSBuhyBx3G9ih3bZLAmmkUQwrVw8WiNTVPLsZSHaSlJH4dcc4supHUPYUrNU7Kkl/YaFOL9KUiaFJ+e74w== +"@nrwl/js@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-14.1.6.tgz#422bc31e0753b287a44de9cd10854bc719b35b9e" + integrity sha512-0pomo+lM8t9U5nczLOLjTJlTyKDru0jbvMZ5b24FLXpkWUnmMxHO9nO5A0Hrkm5H3VJG+JLP0RG7G2ZgLaUDkw== dependencies: - "@nrwl/devkit" "14.1.1" - "@nrwl/jest" "14.1.1" - "@nrwl/linter" "14.1.1" - "@nrwl/workspace" "14.1.1" + "@nrwl/devkit" "14.1.6" + "@nrwl/jest" "14.1.6" + "@nrwl/linter" "14.1.6" + "@nrwl/workspace" "14.1.6" "@parcel/watcher" "2.0.4" chalk "4.1.0" fast-glob "3.2.7" - fs-extra "^9.1.0" + fs-extra "^10.1.0" ignore "^5.0.4" js-tokens "^4.0.0" minimatch "3.0.4" source-map-support "0.5.19" tree-kill "1.2.2" -"@nrwl/linter@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-14.1.1.tgz#784e5d0c1a237a4920c1ebefb029e5da0f889094" - integrity sha512-xyhsxGVTHH7KRcw244BR6T3/sp4WRxSrft5wHR2jFcmPgfTAN0Px7FOR8c/c2eIRS89zECtrehQeLcF8T8nsIA== +"@nrwl/linter@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-14.1.6.tgz#d134d39d14a46c6729e17573647e607f81312569" + integrity sha512-loQx6/Ze4PyKS5Py6zIsegUtb6L1SzYLOitwQAXumKxCRhK9JRIOcA8yNfgAOD/umMg4FoDVv8FPiI+IG0Amgw== dependencies: - "@nrwl/devkit" "14.1.1" - "@nrwl/jest" "14.1.1" + "@nrwl/devkit" "14.1.6" + "@nrwl/jest" "14.1.6" "@phenomnomnominal/tsquery" "4.1.1" tmp "~0.2.1" tslib "^2.3.0" -"@nrwl/next@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/next/-/next-14.1.1.tgz#6c87d2f4f62db8c6db9310d3e9da1796b398cb3e" - integrity sha512-2x1P1m7I2MkVsYzktThQBLb/y4hNIBCIhpuR8F/9Qw0Z5+0O8ibF/OkbjUzstBWBbzS4N1xSFImnHjt8gjAqvQ== +"@nrwl/next@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/next/-/next-14.1.6.tgz#5c1581a8d171591cfccfdf361d5297bf8d1b1763" + integrity sha512-TVteSfpzGvRjs7Q8aA4lJhwZa8FsW8Kya8JK5nObHF8q62uAGWPcYa4SfFdVgpAxj2QBbq9ZInRexE7OsNSe5Q== dependencies: "@babel/plugin-proposal-decorators" "^7.14.5" - "@nrwl/cypress" "14.1.1" - "@nrwl/devkit" "14.1.1" - "@nrwl/jest" "14.1.1" - "@nrwl/linter" "14.1.1" - "@nrwl/react" "14.1.1" - "@nrwl/web" "14.1.1" - "@nrwl/workspace" "14.1.1" + "@nrwl/cypress" "14.1.6" + "@nrwl/devkit" "14.1.6" + "@nrwl/jest" "14.1.6" + "@nrwl/linter" "14.1.6" + "@nrwl/react" "14.1.6" + "@nrwl/web" "14.1.6" + "@nrwl/workspace" "14.1.6" "@svgr/webpack" "^6.1.2" chalk "4.1.0" eslint-config-next "^12.1.0" - fs-extra "^9.1.0" + fs-extra "^10.1.0" ts-node "~9.1.1" tsconfig-paths "^3.9.0" url-loader "^4.1.1" @@ -2779,21 +2779,21 @@ strip-json-comments "^3.1.1" tar "6.1.11" -"@nrwl/react@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/react/-/react-14.1.1.tgz#ddec13eb46fe8481b5607f1f6beb6be2f060e9ba" - integrity sha512-ZBT9BSulS48qz8sFOdUTC+GtR4CNRsKe6S2bh0L2egQODHLAyumRA8+hp2HS2NkH7VxsT+iw0iR50NyXzFDFcg== +"@nrwl/react@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/react/-/react-14.1.6.tgz#be1dd50beed859f569cc4cc6f984d8f1c3cadfac" + integrity sha512-ogNlQEPo92H3V39Y5VXFOmNCJU7irt1JPQvmkk6dL6oOgMdwxw1j7YsUCvxwppBTp5omtcfrb27b5Q7osjV7QQ== dependencies: "@babel/core" "^7.15.0" "@babel/preset-react" "^7.14.5" - "@nrwl/cypress" "14.1.1" - "@nrwl/devkit" "14.1.1" - "@nrwl/jest" "14.1.1" - "@nrwl/js" "14.1.1" - "@nrwl/linter" "14.1.1" - "@nrwl/storybook" "14.1.1" - "@nrwl/web" "14.1.1" - "@nrwl/workspace" "14.1.1" + "@nrwl/cypress" "14.1.6" + "@nrwl/devkit" "14.1.6" + "@nrwl/jest" "14.1.6" + "@nrwl/js" "14.1.6" + "@nrwl/linter" "14.1.6" + "@nrwl/storybook" "14.1.6" + "@nrwl/web" "14.1.6" + "@nrwl/workspace" "14.1.6" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.1" "@storybook/node-logger" "6.1.20" "@svgr/webpack" "^6.1.2" @@ -2808,31 +2808,31 @@ webpack "^5.58.1" webpack-merge "^5.8.0" -"@nrwl/storybook@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/storybook/-/storybook-14.1.1.tgz#9da7c17989550e97c3cbf3f9d4ad031420ea8881" - integrity sha512-ih4fYbdSOqBDj030gtvpzQmTQKIp1F+D9m4RgNAtsZx6ZlR7tWx1P6PaI3mFjO9LwnhShlogqIzy9m1q/Eg+Ig== +"@nrwl/storybook@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/storybook/-/storybook-14.1.6.tgz#c24ad7d53d8f54d8ca3fbb5ea3c9aa87f46e3512" + integrity sha512-1tfTqfE1RyYnr8zCMrseQh0V8tMy6nS0dZACRQmMd7TLuXYtqO3GAuM4QzTh3tiXOsnvO6xOtzZDjDONkkM1+Q== dependencies: - "@nrwl/cypress" "14.1.1" - "@nrwl/devkit" "14.1.1" - "@nrwl/linter" "14.1.1" - "@nrwl/workspace" "14.1.1" + "@nrwl/cypress" "14.1.6" + "@nrwl/devkit" "14.1.6" + "@nrwl/linter" "14.1.6" + "@nrwl/workspace" "14.1.6" core-js "^3.6.5" semver "7.3.4" ts-loader "^9.2.6" tsconfig-paths-webpack-plugin "3.5.2" -"@nrwl/tao@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-14.1.1.tgz#56b4d39c8ca1e1ca04ac3defb2c8f98ac2bd188b" - integrity sha512-sMD2Ada6goyAClRW5d8ODN78Z8uPMhMdC5axBrhDlb2h+obNVI2S1d6G9Hp72KxlnujpI7wQdjK+CuKwpc1KAw== +"@nrwl/tao@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-14.1.6.tgz#b7e731d69675480d246cda2b1bea5e438faeb824" + integrity sha512-dJ+vfQv0hHR0JjYrvgISHKbHsjwbSmFnVDyXSac3UPocoSmU9ZInW4ZpnKmHh6qO1mmLiTuYZGm6MTN/g+du/A== dependencies: - nx "14.1.1" + nx "14.1.6" -"@nrwl/web@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/web/-/web-14.1.1.tgz#4850ed9c9010b6eec8eb2f55ec06e3abe1eff716" - integrity sha512-8/nbJGbDv/tL71hrHyqcv/hqcbcWDisdwJrnBj2xpDLTrjfCm+8ApXr3olPoZcpnOY6KFwdWN76aq9bb4cdN6A== +"@nrwl/web@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/web/-/web-14.1.6.tgz#88546f9420ac45c967497e949469a35ea906d6b5" + integrity sha512-6FtZfto3PNP2491cNXJC9I9EkxySfMguSE1euxrWb5IMvZo5o0g6Wc5uL+BS3h5giRvEiOYNFKpHqb/7GvtyNQ== dependencies: "@babel/core" "^7.15.0" "@babel/plugin-proposal-class-properties" "^7.14.5" @@ -2842,12 +2842,12 @@ "@babel/preset-env" "^7.15.0" "@babel/preset-typescript" "^7.15.0" "@babel/runtime" "^7.14.8" - "@nrwl/cypress" "14.1.1" - "@nrwl/devkit" "14.1.1" - "@nrwl/jest" "14.1.1" - "@nrwl/js" "14.1.1" - "@nrwl/linter" "14.1.1" - "@nrwl/workspace" "14.1.1" + "@nrwl/cypress" "14.1.6" + "@nrwl/devkit" "14.1.6" + "@nrwl/jest" "14.1.6" + "@nrwl/js" "14.1.6" + "@nrwl/linter" "14.1.6" + "@nrwl/workspace" "14.1.6" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.1" "@rollup/plugin-babel" "^5.3.0" "@rollup/plugin-commonjs" "^20.0.0" @@ -2872,7 +2872,7 @@ enhanced-resolve "^5.8.3" file-loader "^6.2.0" fork-ts-checker-webpack-plugin "6.2.10" - fs-extra "^9.1.0" + fs-extra "^10.1.0" http-server "14.1.0" identity-obj-proxy "3.0.0" ignore "^5.0.4" @@ -2915,14 +2915,14 @@ webpack-sources "^3.0.2" webpack-subresource-integrity "^5.1.0" -"@nrwl/workspace@14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-14.1.1.tgz#5945836e3d75a8233141c2e33042e2a76618d0d8" - integrity sha512-ELJq6m67X+wYvSyPMgudDlU1X6Zbyn2nGMTsPmULHPrtg49FRcrZ7TWH5YTA/LkkV5IY0xGwY9UNlyYGsZNj4Q== +"@nrwl/workspace@14.1.6": + version "14.1.6" + resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-14.1.6.tgz#340bb8bcae114436f3104ab56ec611e3af338961" + integrity sha512-J8GfKIubZ4jj/uTK1mEwRhHHL3lHhuWM14VbNdVmuueH+pVNHBh657vLnwlneISJH15Z3RyFfGuJRuCZcJUYsA== dependencies: - "@nrwl/devkit" "14.1.1" - "@nrwl/jest" "14.1.1" - "@nrwl/linter" "14.1.1" + "@nrwl/devkit" "14.1.6" + "@nrwl/jest" "14.1.6" + "@nrwl/linter" "14.1.6" "@parcel/watcher" "2.0.4" chalk "4.1.0" chokidar "^3.5.1" @@ -2932,12 +2932,12 @@ enquirer "~2.3.6" figures "3.2.0" flat "^5.0.2" - fs-extra "^9.1.0" + fs-extra "^10.1.0" glob "7.1.4" ignore "^5.0.4" minimatch "3.0.4" npm-run-path "^4.0.1" - nx "14.1.1" + nx "14.1.6" open "^8.4.0" rxjs "^6.5.4" semver "7.3.4" @@ -16518,13 +16518,13 @@ nwsapi@^2.2.0: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== -nx@14.1.1: - version "14.1.1" - resolved "https://registry.yarnpkg.com/nx/-/nx-14.1.1.tgz#91b4076f8c268ec13acf1cbf5821f0a3fcddb473" - integrity sha512-+fZ7Bi2qhmP03I0dz6/cIOXPSwKjJD+xv3MBW4Ex9MtsW0BnMQ7bJOCjn0Nuk29oaz5NnojpXiens8UcZDQSAQ== +nx@14.1.6: + version "14.1.6" + resolved "https://registry.yarnpkg.com/nx/-/nx-14.1.6.tgz#bcadd84381fe710abd1dd3431b0f9eb858db5dcc" + integrity sha512-0Cgo7vqgyl+NzQlZX1KlqoRp87yJbO/Y11ylfVahfyfmfUkF3uTIwZvols2u4/c9k4Qm13JrvYHwpI7+FgzuHA== dependencies: - "@nrwl/cli" "14.1.1" - "@nrwl/tao" "14.1.1" + "@nrwl/cli" "14.1.6" + "@nrwl/tao" "14.1.6" "@parcel/watcher" "2.0.4" "@swc-node/register" "^1.4.2" "@swc/core" "^1.2.173" @@ -16538,7 +16538,7 @@ nx@14.1.1: fast-glob "3.2.7" figures "3.2.0" flat "^5.0.2" - fs-extra "^9.1.0" + fs-extra "^10.1.0" glob "7.1.4" ignore "^5.0.4" jsonc-parser "3.0.0"