Skip to content

Commit

Permalink
fix(core): preserve dash casing when passing args to executors
Browse files Browse the repository at this point in the history
  • Loading branch information
vsavkin committed May 17, 2022
1 parent 4db6c2d commit 6351413
Show file tree
Hide file tree
Showing 77 changed files with 337 additions and 394 deletions.
4 changes: 2 additions & 2 deletions 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: {
Expand Down
4 changes: 2 additions & 2 deletions e2e/add-nx-to-monorepo/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-add-nx-to-monorepo',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/angular-core/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-angular-core',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/angular-extensions/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-angular-extensions',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/cli/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-cli',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/cypress/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-cypress',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/detox/jest.config.ts
@@ -1,4 +1,4 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
Expand All @@ -7,5 +7,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-detox',
testTimeout: 600000,
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/jest/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-jest',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/js/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-js',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/linter/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-linter',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/next/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-next',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/node/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-node',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/nx-plugin/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-nx-plugin',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/react-native/jest.config.ts
@@ -1,4 +1,4 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
Expand All @@ -7,5 +7,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-react-native',
testTimeout: 600000,
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/react/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-react',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/storybook/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-storybook',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
9 changes: 6 additions & 3 deletions e2e/utils/index.ts
Expand Up @@ -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',
});
Expand Down Expand Up @@ -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',
});
Expand All @@ -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',
});
Expand Down
4 changes: 2 additions & 2 deletions e2e/web/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-web',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/workspace-core/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-workspace-core',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/workspace-create/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-workspace-create',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions e2e/workspace-integrations/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-workspace-integrations',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion jest.config.ts
@@ -1,5 +1,5 @@
const { getJestProjects } = require('@nrwl/jest');

module.exports = {
export default {
projects: getJestProjects(),
};
2 changes: 1 addition & 1 deletion jest.preset.ts → 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`;
Expand Down
4 changes: 2 additions & 2 deletions 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: ['<rootDir>/src/test-setup.ts'],
displayName: 'nx-dev-data-access-documents',
Expand Down
4 changes: 2 additions & 2 deletions 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: '<rootDir>/tsconfig.spec.json',
Expand Down
4 changes: 2 additions & 2 deletions 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: ['<rootDir>/src/test-setup.ts'],
displayName: 'nx-dev-data-access-packages',
Expand Down
4 changes: 2 additions & 2 deletions nx-dev/feature-analytics/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
displayName: 'nx-dev-feature-analytics',

transform: {
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/feature-analytics',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions 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: {
Expand Down
4 changes: 2 additions & 2 deletions 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: {
Expand All @@ -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',
};
4 changes: 2 additions & 2 deletions nx-dev/feature-search/jest.config.ts
@@ -1,10 +1,10 @@
module.exports = {
export default {
displayName: 'nx-dev-feature-search',

transform: {
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/feature-search',
preset: '../../jest.preset.ts',
preset: '../../jest.preset.js',
};
4 changes: 2 additions & 2 deletions nx-dev/models-document/jest.config.ts
@@ -1,4 +1,4 @@
module.exports = {
export default {
displayName: 'nx-dev-models-document',

globals: {
Expand All @@ -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',
};

1 comment on commit 6351413

@vercel
Copy link

@vercel vercel bot commented on 6351413 May 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx-dev-git-master-nrwl.vercel.app
nx.dev
nx-dev-nrwl.vercel.app
nx-five.vercel.app

Please sign in to comment.