fix(core): preserve dash casing when passing args to executors

This commit is contained in:
Victor Savkin 2022-05-17 09:57:11 -04:00
parent 4db6c2db08
commit 6351413b98
77 changed files with 337 additions and 394 deletions

View File

@ -1,7 +1,7 @@
// nx-ignore-next-line // nx-ignore-next-line
const nxPreset = require('@nrwl/jest/preset'); const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { export default {
...nxPreset, ...nxPreset,
displayName: 'dep-graph-client', displayName: 'dep-graph-client',
transform: { transform: {

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-add-nx-to-monorepo', displayName: 'e2e-add-nx-to-monorepo',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-angular-core', displayName: 'e2e-angular-core',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-angular-extensions', displayName: 'e2e-angular-extensions',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-cli', displayName: 'e2e-cli',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-cypress', displayName: 'e2e-cypress',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -7,5 +7,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-detox', displayName: 'e2e-detox',
testTimeout: 600000, testTimeout: 600000,
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-jest', displayName: 'e2e-jest',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-js', displayName: 'e2e-js',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-linter', displayName: 'e2e-linter',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-next', displayName: 'e2e-next',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-node', displayName: 'e2e-node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-nx-plugin', displayName: 'e2e-nx-plugin',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -7,5 +7,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-react-native', displayName: 'e2e-react-native',
testTimeout: 600000, testTimeout: 600000,
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-react', displayName: 'e2e-react',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-storybook', displayName: 'e2e-storybook',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -171,7 +171,8 @@ export function runCreateWorkspace(
const create = execSync(command, { const create = execSync(command, {
cwd: e2eCwd, cwd: e2eCwd,
stdio: [0, 1, 2], // stdio: [0, 1, 2],
stdio: ['pipe', 'pipe', 'pipe'],
env: process.env, env: process.env,
encoding: 'utf-8', encoding: 'utf-8',
}); });
@ -212,7 +213,8 @@ export function runCreatePlugin(
const create = execSync(command, { const create = execSync(command, {
cwd: e2eCwd, cwd: e2eCwd,
stdio: [0, 1, 2], //stdio: [0, 1, 2],
stdio: ['pipe', 'pipe', 'pipe'],
env: process.env, env: process.env,
encoding: 'utf-8', encoding: 'utf-8',
}); });
@ -232,7 +234,8 @@ export function packageInstall(
.join(' '); .join(' ');
const install = execSync(`${pm.addDev} ${pkgsWithVersions}`, { const install = execSync(`${pm.addDev} ${pkgsWithVersions}`, {
cwd, cwd,
stdio: [0, 1, 2], // stdio: [0, 1, 2],
stdio: ['pipe', 'pipe', 'pipe'],
env: process.env, env: process.env,
encoding: 'utf-8', encoding: 'utf-8',
}); });

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-web', displayName: 'e2e-web',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-workspace-core', displayName: 'e2e-workspace-core',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-workspace-create', displayName: 'e2e-workspace-create',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
maxWorkers: 1, maxWorkers: 1,
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-workspace-integrations', displayName: 'e2e-workspace-integrations',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -87,7 +87,7 @@ describe('format', () => {
} }
}, 90000); }, 90000);
it('should check spoecific project', async () => { it('should check specific project', async () => {
if (isNotWindows()) { if (isNotWindows()) {
const stdout = runCLI(`format:check --projects=${myapp}`, { const stdout = runCLI(`format:check --projects=${myapp}`, {
silenceError: true, silenceError: true,

View File

@ -1,5 +1,5 @@
const { getJestProjects } = require('@nrwl/jest'); const { getJestProjects } = require('@nrwl/jest');
module.exports = { export default {
projects: getJestProjects(), projects: getJestProjects(),
}; };

View File

@ -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.npm_config_registry = `http://localhost:4872`;
process.env.YARN_REGISTRY = `http://localhost:4872`; process.env.YARN_REGISTRY = `http://localhost:4872`;

View File

@ -1,5 +1,5 @@
const nxPreset = require('@nrwl/jest/preset'); const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { export default {
...nxPreset, ...nxPreset,
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'], setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
displayName: 'nx-dev-data-access-documents', displayName: 'nx-dev-data-access-documents',

View File

@ -1,6 +1,6 @@
module.exports = { export default {
displayName: 'nx-dev-data-access-menu', displayName: 'nx-dev-data-access-menu',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
globals: { globals: {
'ts-jest': { 'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json', tsconfig: '<rootDir>/tsconfig.spec.json',

View File

@ -1,5 +1,5 @@
const nxPreset = require('@nrwl/jest/preset'); const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { export default {
...nxPreset, ...nxPreset,
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'], setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
displayName: 'nx-dev-data-access-packages', displayName: 'nx-dev-data-access-packages',

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-feature-analytics', displayName: 'nx-dev-feature-analytics',
transform: { transform: {
@ -6,5 +6,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/feature-analytics', coverageDirectory: '../../coverage/nx-dev/feature-analytics',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,5 +1,5 @@
const nxPreset = require('@nrwl/jest/preset'); const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { export default {
...nxPreset, ...nxPreset,
displayName: 'nx-dev-feature-doc-viewer', displayName: 'nx-dev-feature-doc-viewer',
transform: { transform: {

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-feature-package-schema-viewer', displayName: 'nx-dev-feature-package-schema-viewer',
globals: { globals: {
@ -11,5 +11,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/feature-package-schema-viewer', coverageDirectory: '../../coverage/nx-dev/feature-package-schema-viewer',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-feature-search', displayName: 'nx-dev-feature-search',
transform: { transform: {
@ -6,5 +6,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/feature-search', coverageDirectory: '../../coverage/nx-dev/feature-search',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-models-document', displayName: 'nx-dev-models-document',
globals: { globals: {
@ -12,5 +12,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/models-document', coverageDirectory: '../../coverage/nx-dev/models-document',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-models-menu', displayName: 'nx-dev-models-menu',
globals: { globals: {
@ -12,5 +12,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/models-menu', coverageDirectory: '../../coverage/nx-dev/models-menu',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-models-package', displayName: 'nx-dev-models-package',
globals: { globals: {
@ -12,5 +12,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/models-package', coverageDirectory: '../../coverage/nx-dev/models-package',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,5 +1,5 @@
const nxPreset = require('@nrwl/jest/preset'); const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { export default {
...nxPreset, ...nxPreset,
displayName: 'nx-dev', displayName: 'nx-dev',
transform: { transform: {

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-ui-commands', displayName: 'nx-dev-ui-commands',
transform: { transform: {
@ -6,5 +6,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage//nx-dev/ui-commands', coverageDirectory: '../../coverage//nx-dev/ui-commands',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,5 +1,5 @@
const nxPreset = require('@nrwl/jest/preset'); const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { export default {
...nxPreset, ...nxPreset,
displayName: 'nx-dev-ui-common', displayName: 'nx-dev-ui-common',
transform: { transform: {

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-ui-community', displayName: 'nx-dev-ui-community',
transform: { transform: {
@ -6,5 +6,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/ui-community', coverageDirectory: '../../coverage/nx-dev/ui-community',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-ui-conference', displayName: 'nx-dev-ui-conference',
transform: { transform: {
@ -7,5 +7,5 @@ module.exports = {
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/ui-conference', coverageDirectory: '../../coverage/nx-dev/ui-conference',
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'], setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'nx-dev-ui-home', displayName: 'nx-dev-ui-home',
transform: { transform: {
@ -6,5 +6,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/ui-home', coverageDirectory: '../../coverage/nx-dev/ui-home',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,6 +1,6 @@
const nxPreset = require('@nrwl/jest/preset'); const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { export default {
...nxPreset, ...nxPreset,
displayName: 'nx-dev-ui-member-card', displayName: 'nx-dev-ui-member-card',
@ -10,5 +10,5 @@ module.exports = {
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/ui-member-card', coverageDirectory: '../../coverage/nx-dev/ui-member-card',
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'], setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,6 +1,6 @@
const nxPreset = require('@nrwl/jest/preset'); const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { export default {
...nxPreset, ...nxPreset,
displayName: 'nx-dev-ui-sponsor-card', displayName: 'nx-dev-ui-sponsor-card',
@ -10,5 +10,5 @@ module.exports = {
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/nx-dev/ui-sponsor-card', coverageDirectory: '../../coverage/nx-dev/ui-sponsor-card',
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'], setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,6 +1,6 @@
{ {
"name": "@nrwl/nx-source", "name": "@nrwl/nx-source",
"version": "14.1.6", "version": "14.1.7-beta.2",
"description": "Smart, Fast and Extensible Build System", "description": "Smart, Fast and Extensible Build System",
"homepage": "https://nx.dev", "homepage": "https://nx.dev",
"private": true, "private": true,
@ -58,12 +58,12 @@
"@ngrx/schematics": "~13.0.0", "@ngrx/schematics": "~13.0.0",
"@ngrx/store": "~13.0.0", "@ngrx/store": "~13.0.0",
"@ngrx/store-devtools": "~13.0.0", "@ngrx/store-devtools": "~13.0.0",
"@nrwl/eslint-plugin-nx": "14.1.1", "@nrwl/eslint-plugin-nx": "14.1.6",
"@nrwl/jest": "14.1.1", "@nrwl/jest": "14.1.6",
"@nrwl/next": "14.1.1", "@nrwl/next": "14.1.6",
"@nrwl/nx-cloud": "14.0.3", "@nrwl/nx-cloud": "14.0.3",
"@nrwl/react": "14.1.1", "@nrwl/react": "14.1.6",
"@nrwl/web": "14.1.1", "@nrwl/web": "14.1.6",
"@parcel/watcher": "2.0.4", "@parcel/watcher": "2.0.4",
"@phenomnomnominal/tsquery": "4.1.1", "@phenomnomnominal/tsquery": "4.1.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.1", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
@ -187,7 +187,7 @@
"ng-packagr": "~13.3.0", "ng-packagr": "~13.3.0",
"ngrx-store-freeze": "0.2.4", "ngrx-store-freeze": "0.2.4",
"node-fetch": "^2.6.7", "node-fetch": "^2.6.7",
"nx": "14.1.1", "nx": "14.1.6",
"open": "^8.4.0", "open": "^8.4.0",
"parse-markdown-links": "^1.0.4", "parse-markdown-links": "^1.0.4",
"parse5": "4.0.0", "parse5": "4.0.0",
@ -306,4 +306,5 @@
"**/xmlhttprequest-ssl": "~1.6.2", "**/xmlhttprequest-ssl": "~1.6.2",
"minimist": "^1.2.6" "minimist": "^1.2.6"
} }
} }

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'add-nx-to-monorepo', displayName: 'add-nx-to-monorepo',
globals: { globals: {
@ -11,5 +11,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/projects/add-nx-to-monorepo', coverageDirectory: '../../coverage/projects/add-nx-to-monorepo',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'angular', displayName: 'angular',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'cli', displayName: 'cli',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'cra-to-nx', displayName: 'cra-to-nx',
globals: { globals: {
@ -11,5 +11,5 @@ module.exports = {
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/projects/cra-to-nx', coverageDirectory: '../../coverage/projects/cra-to-nx',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'create-nx-plugin', displayName: 'create-nx-plugin',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'create-nx-workspace', displayName: 'create-nx-workspace',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'cypress', displayName: 'cypress',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -9,5 +9,5 @@ module.exports = {
displayName: 'react-native', displayName: 'react-native',
testEnvironment: 'node', testEnvironment: 'node',
verbose: true, verbose: true,
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'cli', displayName: 'cli',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'eslint-plugin-nx', displayName: 'eslint-plugin-nx',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'express', displayName: 'express',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'jest', displayName: 'jest',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'jest', displayName: 'jest',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'linter', displayName: 'linter',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'nest', displayName: 'nest',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'next', displayName: 'next',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'node', displayName: 'node',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'nx-plugin', displayName: 'nx-plugin',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'nx', displayName: 'nx',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -17,8 +17,6 @@ yargs.wrap(yargs.terminalWidth());
export const parserConfiguration: Partial<yargs.ParserConfigurationOptions> = { export const parserConfiguration: Partial<yargs.ParserConfigurationOptions> = {
'strip-dashed': true, '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 { function withFormatOptions(yargs: yargs.Argv): yargs.Argv {
return withAffectedOptions(yargs) return withAffectedOptions(yargs)
.parserConfiguration({
'camel-case-expansion': true,
})
.option('libs-and-apps', { .option('libs-and-apps', {
describe: 'Format only libraries and applications files.', describe: 'Format only libraries and applications files.',
type: 'boolean', type: 'boolean',
@ -346,6 +347,11 @@ function withPlainOption(yargs: yargs.Argv): yargs.Argv {
function withAffectedOptions(yargs: yargs.Argv): yargs.Argv { function withAffectedOptions(yargs: yargs.Argv): yargs.Argv {
return yargs return yargs
.parserConfiguration({
'camel-case-expansion': false,
// allow parsing --env.SOME_ARG for cypress cli env args
'dot-notation': true,
})
.option('files', { .option('files', {
describe: describe:
'Change the way Nx is calculating the affected command by providing directly changed files, list of files delimited by commas', '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 { function withRunManyOptions(yargs: yargs.Argv): yargs.Argv {
return yargs return yargs
.parserConfiguration({
'camel-case-expansion': false,
// allow parsing --env.SOME_ARG for cypress cli env args
'dot-notation': true,
})
.option('projects', { .option('projects', {
describe: 'Projects to run (comma delimited)', describe: 'Projects to run (comma delimited)',
type: 'string', type: 'string',
@ -595,6 +606,11 @@ function withRunOneOptions(yargs: yargs.Argv) {
process.argv[2] === 'run' && process.argv[3] === '--help' process.argv[2] === 'run' && process.argv[3] === '--help'
); );
const res = yargs const res = yargs
.parserConfiguration({
'camel-case-expansion': false,
// allow parsing --env.SOME_ARG for cypress cli env args
'dot-notation': true,
})
.option('prod', { .option('prod', {
describe: 'Use the production configuration', describe: 'Use the production configuration',
type: 'boolean', type: 'boolean',

View File

@ -289,7 +289,7 @@ function transformCommand(
) { ) {
if (command.indexOf('{args.') > -1) { if (command.indexOf('{args.') > -1) {
const regex = /{args\.([^}]+)}/g; 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) { } else if (Object.keys(args).length > 0 && forwardAllArgs) {
const stringifiedArgs = Object.keys(args) const stringifiedArgs = Object.keys(args)
.map((a) => .map((a) =>
@ -313,16 +313,6 @@ function parseArgs(options: RunCommandsOptions) {
return unknownOptionsTreatedAsArgs; return unknownOptionsTreatedAsArgs;
} }
return yargsParser(args.replace(/(^"|"$)/g, ''), { 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;
}
}

View File

@ -39,7 +39,6 @@ describe('splitArgs', () => {
}, },
'affected' 'affected'
).nxArgs; ).nxArgs;
expect(nxArgs['nx-key']).toEqual('some-value');
expect(nxArgs['nxKey']).toEqual('some-value'); expect(nxArgs['nxKey']).toEqual('some-value');
}); });

View File

@ -74,14 +74,14 @@ const runOne: string[] = [
'prod', 'prod',
'runner', 'runner',
'parallel', 'parallel',
'max-parallel', 'maxParallel',
'exclude', 'exclude',
'only-failed', 'onlyFailed',
'help', 'help',
'with-deps', 'withDeps',
'skip-nx-cache', 'skipNxCache',
'scan', 'scan',
'output-style', 'outputStyle',
]; ];
const runMany: string[] = [...runOne, 'projects', 'all']; const runMany: string[] = [...runOne, 'projects', 'all'];
@ -144,7 +144,7 @@ export function splitArgsIntoNxArgsAndOverrides(
const nxArgs: RawNxArgs = {}; const nxArgs: RawNxArgs = {};
const overrides = yargsParser(args._ as string[], { const overrides = yargsParser(args._ as string[], {
configuration: { configuration: {
'strip-dashed': true, 'camel-case-expansion': false,
'dot-notation': false, 'dot-notation': false,
}, },
}); });
@ -154,9 +154,9 @@ export function splitArgsIntoNxArgsAndOverrides(
delete overrides._; delete overrides._;
Object.entries(args).forEach(([key, value]) => { Object.entries(args).forEach(([key, value]) => {
const dasherized = names(key).fileName; const camelCased = names(key).propertyName;
if (nxSpecific.includes(dasherized) || dasherized.startsWith('nx-')) { if (nxSpecific.includes(camelCased) || camelCased.startsWith('nx')) {
if (value !== undefined) nxArgs[key] = value; if (value !== undefined) nxArgs[camelCased] = value;
} else if (!ignoreArgs.includes(key)) { } else if (!ignoreArgs.includes(key)) {
overrides[key] = value; overrides[key] = value;
} }

View File

@ -7,7 +7,6 @@ import {
convertAliases, convertAliases,
convertSmartDefaultsIntoNamedParams, convertSmartDefaultsIntoNamedParams,
convertToCamelCase, convertToCamelCase,
lookupUnmatched,
Schema, Schema,
setDefaults, setDefaults,
validateOptsAgainstSchema, validateOptsAgainstSchema,
@ -329,12 +328,18 @@ describe('params', () => {
}); });
describe('convertToCamelCase', () => { 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( expect(
convertToCamelCase( convertToCamelCase(
yargsParser(['--one-two', '1'], { yargsParser(['--one-two', '1'], {
number: ['oneTwo'], number: ['oneTwo'],
}) configuration: {
'camel-case-expansion': false,
},
}),
{
properties: { oneTwo: 'some object' },
} as any
) )
).toEqual({ ).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', () => { it('should not convert camel case', () => {
expect( expect(
convertToCamelCase( convertToCamelCase(
yargsParser(['--oneTwo', '1'], { yargsParser(['--oneTwo', '1'], {
number: ['oneTwo'], number: ['oneTwo'],
}) configuration: {
'camel-case-expansion': false,
},
}),
{
properties: { oneTwo: 'some object' },
} as any
) )
).toEqual({ ).toEqual({
_: [], _: [],
@ -360,7 +389,13 @@ describe('params', () => {
convertToCamelCase( convertToCamelCase(
yargsParser(['--one-Two', '1'], { yargsParser(['--one-Two', '1'], {
number: ['oneTwo'], number: ['oneTwo'],
}) configuration: {
'camel-case-expansion': false,
},
}),
{
properties: { oneTwo: 'some object' },
} as any
) )
).toEqual({ ).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', () => { describe('setDefault', () => {
it('should set default values', () => { it('should set default values', () => {
const opts = setDefaults( const opts = setDefaults(

View File

@ -96,11 +96,17 @@ function camelCase(input: string): string {
} }
} }
export function convertToCamelCase(parsed: { [k: string]: any }): Options { export function convertToCamelCase(
return Object.keys(parsed).reduce( parsed: { [k: string]: any },
(m, c) => ({ ...m, [camelCase(c)]: parsed[c] }), 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 isVerbose = false
) { ) {
const r = convertAliases( const r = convertAliases(
coerceTypesInOptions(commandLineOpts, schema), coerceTypesInOptions(convertToCamelCase(commandLineOpts, schema), schema),
schema, schema,
false 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( function findSchemaForProperty(
propName: string, propName: string,
schema: Schema schema: Schema
@ -784,37 +770,6 @@ function findSchemaForProperty(
return null; 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 { function isTTY(): boolean {
return !!process.stdout.isTTY && process.env['CI'] !== 'true'; return !!process.stdout.isTTY && process.env['CI'] !== 'true';
} }

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -8,5 +8,5 @@ module.exports = {
}, },
displayName: 'react-native', displayName: 'react-native',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'react', displayName: 'react',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -8,5 +8,5 @@ module.exports = {
}, },
displayName: 'storybook', displayName: 'storybook',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'tao', displayName: 'tao',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'web', displayName: 'web',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
transform: { transform: {
'^.+\\.[tj]sx?$': 'ts-jest', '^.+\\.[tj]sx?$': 'ts-jest',
}, },
@ -6,5 +6,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } }, globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'workspace', displayName: 'workspace',
testEnvironment: 'node', testEnvironment: 'node',
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'eslint-rules', displayName: 'eslint-rules',
globals: { globals: {
@ -14,5 +14,5 @@ module.exports = {
moduleNameMapper: { moduleNameMapper: {
'@eslint/eslintrc': '@eslint/eslintrc/dist/eslintrc-universal.cjs', '@eslint/eslintrc': '@eslint/eslintrc/dist/eslintrc-universal.cjs',
}, },
preset: '../../jest.preset.ts', preset: '../../jest.preset.js',
}; };

View File

@ -1,4 +1,4 @@
module.exports = { export default {
displayName: 'typedoc-theme', displayName: 'typedoc-theme',
globals: { globals: {
@ -12,5 +12,5 @@ module.exports = {
resolver: '../scripts/patched-jest-resolver.js', resolver: '../scripts/patched-jest-resolver.js',
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../coverage/typedoc-theme', coverageDirectory: '../coverage/typedoc-theme',
preset: '../jest.preset.ts', preset: '../jest.preset.js',
}; };

212
yarn.lock
View File

@ -2651,22 +2651,22 @@
node-gyp "^8.2.0" node-gyp "^8.2.0"
read-package-json-fast "^2.0.1" read-package-json-fast "^2.0.1"
"@nrwl/cli@14.1.1": "@nrwl/cli@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-14.1.1.tgz#5814932d771f1c00705bdfc957a45df56af5da79" resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-14.1.6.tgz#c0e7c67d132bf8bda2b8ee74247f357d604f0352"
integrity sha512-QSARR7H2nmYfWT78MP3DszM9QLPYxia99sO8w5Y4iuz63AoilC4vQfsFaWwhRLxp05LzouAiBkdk3RytQazoqA== integrity sha512-1XHfj1GTpzotYf1b2Ljx4xCT2RJ2CM4/YygxGaM285AU4972eIf+DS/Pe4Bukqf83+EpC0dyQ4ruZmaHw/BkBw==
dependencies: dependencies:
nx "14.1.1" nx "14.1.6"
"@nrwl/cypress@14.1.1": "@nrwl/cypress@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-14.1.1.tgz#0d51611d4aebb76ca57f57bf154428be4c1c63c6" resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-14.1.6.tgz#cf26eaa2dc732ac669383aaf8d6c5da20c6a7337"
integrity sha512-T7uRQbuU/+laMPqjPjgHajuORu/EzgQyOHzfwDHB20SFmp1hh/GJewXq+LHy78QxWtN4hB/ehso2ZmvdVz5s0w== integrity sha512-0ya6DWbo3V7V66a/5x/XTbrKvX7qq0PUwDaERWJr6IDS5csb8r05gW5VIf36BTNiI61gC11iSW74IforB32faA==
dependencies: dependencies:
"@cypress/webpack-preprocessor" "^5.9.1" "@cypress/webpack-preprocessor" "^5.9.1"
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
"@nrwl/linter" "14.1.1" "@nrwl/linter" "14.1.6"
"@nrwl/workspace" "14.1.1" "@nrwl/workspace" "14.1.6"
chalk "4.1.0" chalk "4.1.0"
enhanced-resolve "^5.8.3" enhanced-resolve "^5.8.3"
fork-ts-checker-webpack-plugin "6.2.10" fork-ts-checker-webpack-plugin "6.2.10"
@ -2677,10 +2677,10 @@
tslib "^2.3.0" tslib "^2.3.0"
webpack-node-externals "^3.0.0" webpack-node-externals "^3.0.0"
"@nrwl/devkit@14.1.1": "@nrwl/devkit@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-14.1.1.tgz#b7425b863c3a900e10745f05a59c6ea0f8258296" resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-14.1.6.tgz#b11170dd71d62751aba480773b1a26488ccce669"
integrity sha512-+nKJZRtgyuZHJIb3STNPMU1ZskKYL25NJry1IcnLpAIHVDY8vCru9AR0k3gChqzHE1PwR0cU0Zeyr0NeBdl0mw== integrity sha512-AR/hOPEtFyHGj8ZLkddorehHI1Ac50eWhgHY3zhgIl86ZelNJZJQpGyEmoJOmKs6P9m38kUCoinn4jnfuh1EKQ==
dependencies: dependencies:
ejs "^3.1.7" ejs "^3.1.7"
ignore "^5.0.4" ignore "^5.0.4"
@ -2688,25 +2688,25 @@
semver "7.3.4" semver "7.3.4"
tslib "^2.3.0" tslib "^2.3.0"
"@nrwl/eslint-plugin-nx@14.1.1": "@nrwl/eslint-plugin-nx@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-14.1.1.tgz#83385c4de7281c57737130038ff1c7db7e66f228" resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-14.1.6.tgz#284427903ff3750dc7eacb26c08945a94da569be"
integrity sha512-+v5WEs5Ka8uCAAJV0T0yDIByjcWa/ro7savgxHs0Hpj1KVKy1Fo3E7uZR7545gPFtKPr7EYznn59c/yIj1o4ZQ== integrity sha512-twv79FRf7ArwzkbzdJbKAP3jJWSAhNbIyB+JXuY0MxoPxER4/tucM6Xj//e72XKZlM6MUwplNDHzuwzy/zTUDQ==
dependencies: dependencies:
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
"@nrwl/workspace" "14.1.1" "@nrwl/workspace" "14.1.6"
"@typescript-eslint/experimental-utils" "~5.18.0" "@typescript-eslint/experimental-utils" "~5.18.0"
chalk "4.1.0" chalk "4.1.0"
confusing-browser-globals "^1.0.9" confusing-browser-globals "^1.0.9"
"@nrwl/jest@14.1.1": "@nrwl/jest@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-14.1.1.tgz#179aea798c2c9c284bdf5246b3b7e2a7c12fe8f1" resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-14.1.6.tgz#2fc960ad815f9776fc73a593a43ef58297f0e72f"
integrity sha512-F2ruXro5xQT4HY7b4beHCCCPW8Cc0STCrJ++AyhZzg/0xiOqTnkyx0GuBIyNG2IoC4FcAGFdsRl84WWpKzLC3w== integrity sha512-aYoNT9N2ar2aeIu9xYmjEWbNaWi9A8z3REhMTtL+Z649EaGzOxGnI3FUU6PUZH4H4J6nP4ni15Hiu3jeaIPa8w==
dependencies: dependencies:
"@jest/reporters" "27.5.1" "@jest/reporters" "27.5.1"
"@jest/test-result" "27.5.1" "@jest/test-result" "27.5.1"
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
chalk "4.1.0" chalk "4.1.0"
identity-obj-proxy "3.0.0" identity-obj-proxy "3.0.0"
jest-config "27.5.1" jest-config "27.5.1"
@ -2716,53 +2716,53 @@
rxjs "^6.5.4" rxjs "^6.5.4"
tslib "^2.3.0" tslib "^2.3.0"
"@nrwl/js@14.1.1": "@nrwl/js@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-14.1.1.tgz#02a9c73d30301f74b4d55aeeb161ea755976282b" resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-14.1.6.tgz#422bc31e0753b287a44de9cd10854bc719b35b9e"
integrity sha512-TK99dSBuhyBx3G9ih3bZLAmmkUQwrVw8WiNTVPLsZSHaSlJH4dcc4supHUPYUrNU7Kkl/YaFOL9KUiaFJ+e74w== integrity sha512-0pomo+lM8t9U5nczLOLjTJlTyKDru0jbvMZ5b24FLXpkWUnmMxHO9nO5A0Hrkm5H3VJG+JLP0RG7G2ZgLaUDkw==
dependencies: dependencies:
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
"@nrwl/jest" "14.1.1" "@nrwl/jest" "14.1.6"
"@nrwl/linter" "14.1.1" "@nrwl/linter" "14.1.6"
"@nrwl/workspace" "14.1.1" "@nrwl/workspace" "14.1.6"
"@parcel/watcher" "2.0.4" "@parcel/watcher" "2.0.4"
chalk "4.1.0" chalk "4.1.0"
fast-glob "3.2.7" fast-glob "3.2.7"
fs-extra "^9.1.0" fs-extra "^10.1.0"
ignore "^5.0.4" ignore "^5.0.4"
js-tokens "^4.0.0" js-tokens "^4.0.0"
minimatch "3.0.4" minimatch "3.0.4"
source-map-support "0.5.19" source-map-support "0.5.19"
tree-kill "1.2.2" tree-kill "1.2.2"
"@nrwl/linter@14.1.1": "@nrwl/linter@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-14.1.1.tgz#784e5d0c1a237a4920c1ebefb029e5da0f889094" resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-14.1.6.tgz#d134d39d14a46c6729e17573647e607f81312569"
integrity sha512-xyhsxGVTHH7KRcw244BR6T3/sp4WRxSrft5wHR2jFcmPgfTAN0Px7FOR8c/c2eIRS89zECtrehQeLcF8T8nsIA== integrity sha512-loQx6/Ze4PyKS5Py6zIsegUtb6L1SzYLOitwQAXumKxCRhK9JRIOcA8yNfgAOD/umMg4FoDVv8FPiI+IG0Amgw==
dependencies: dependencies:
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
"@nrwl/jest" "14.1.1" "@nrwl/jest" "14.1.6"
"@phenomnomnominal/tsquery" "4.1.1" "@phenomnomnominal/tsquery" "4.1.1"
tmp "~0.2.1" tmp "~0.2.1"
tslib "^2.3.0" tslib "^2.3.0"
"@nrwl/next@14.1.1": "@nrwl/next@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/next/-/next-14.1.1.tgz#6c87d2f4f62db8c6db9310d3e9da1796b398cb3e" resolved "https://registry.yarnpkg.com/@nrwl/next/-/next-14.1.6.tgz#5c1581a8d171591cfccfdf361d5297bf8d1b1763"
integrity sha512-2x1P1m7I2MkVsYzktThQBLb/y4hNIBCIhpuR8F/9Qw0Z5+0O8ibF/OkbjUzstBWBbzS4N1xSFImnHjt8gjAqvQ== integrity sha512-TVteSfpzGvRjs7Q8aA4lJhwZa8FsW8Kya8JK5nObHF8q62uAGWPcYa4SfFdVgpAxj2QBbq9ZInRexE7OsNSe5Q==
dependencies: dependencies:
"@babel/plugin-proposal-decorators" "^7.14.5" "@babel/plugin-proposal-decorators" "^7.14.5"
"@nrwl/cypress" "14.1.1" "@nrwl/cypress" "14.1.6"
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
"@nrwl/jest" "14.1.1" "@nrwl/jest" "14.1.6"
"@nrwl/linter" "14.1.1" "@nrwl/linter" "14.1.6"
"@nrwl/react" "14.1.1" "@nrwl/react" "14.1.6"
"@nrwl/web" "14.1.1" "@nrwl/web" "14.1.6"
"@nrwl/workspace" "14.1.1" "@nrwl/workspace" "14.1.6"
"@svgr/webpack" "^6.1.2" "@svgr/webpack" "^6.1.2"
chalk "4.1.0" chalk "4.1.0"
eslint-config-next "^12.1.0" eslint-config-next "^12.1.0"
fs-extra "^9.1.0" fs-extra "^10.1.0"
ts-node "~9.1.1" ts-node "~9.1.1"
tsconfig-paths "^3.9.0" tsconfig-paths "^3.9.0"
url-loader "^4.1.1" url-loader "^4.1.1"
@ -2779,21 +2779,21 @@
strip-json-comments "^3.1.1" strip-json-comments "^3.1.1"
tar "6.1.11" tar "6.1.11"
"@nrwl/react@14.1.1": "@nrwl/react@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/react/-/react-14.1.1.tgz#ddec13eb46fe8481b5607f1f6beb6be2f060e9ba" resolved "https://registry.yarnpkg.com/@nrwl/react/-/react-14.1.6.tgz#be1dd50beed859f569cc4cc6f984d8f1c3cadfac"
integrity sha512-ZBT9BSulS48qz8sFOdUTC+GtR4CNRsKe6S2bh0L2egQODHLAyumRA8+hp2HS2NkH7VxsT+iw0iR50NyXzFDFcg== integrity sha512-ogNlQEPo92H3V39Y5VXFOmNCJU7irt1JPQvmkk6dL6oOgMdwxw1j7YsUCvxwppBTp5omtcfrb27b5Q7osjV7QQ==
dependencies: dependencies:
"@babel/core" "^7.15.0" "@babel/core" "^7.15.0"
"@babel/preset-react" "^7.14.5" "@babel/preset-react" "^7.14.5"
"@nrwl/cypress" "14.1.1" "@nrwl/cypress" "14.1.6"
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
"@nrwl/jest" "14.1.1" "@nrwl/jest" "14.1.6"
"@nrwl/js" "14.1.1" "@nrwl/js" "14.1.6"
"@nrwl/linter" "14.1.1" "@nrwl/linter" "14.1.6"
"@nrwl/storybook" "14.1.1" "@nrwl/storybook" "14.1.6"
"@nrwl/web" "14.1.1" "@nrwl/web" "14.1.6"
"@nrwl/workspace" "14.1.1" "@nrwl/workspace" "14.1.6"
"@pmmmwh/react-refresh-webpack-plugin" "^0.5.1" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.1"
"@storybook/node-logger" "6.1.20" "@storybook/node-logger" "6.1.20"
"@svgr/webpack" "^6.1.2" "@svgr/webpack" "^6.1.2"
@ -2808,31 +2808,31 @@
webpack "^5.58.1" webpack "^5.58.1"
webpack-merge "^5.8.0" webpack-merge "^5.8.0"
"@nrwl/storybook@14.1.1": "@nrwl/storybook@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/storybook/-/storybook-14.1.1.tgz#9da7c17989550e97c3cbf3f9d4ad031420ea8881" resolved "https://registry.yarnpkg.com/@nrwl/storybook/-/storybook-14.1.6.tgz#c24ad7d53d8f54d8ca3fbb5ea3c9aa87f46e3512"
integrity sha512-ih4fYbdSOqBDj030gtvpzQmTQKIp1F+D9m4RgNAtsZx6ZlR7tWx1P6PaI3mFjO9LwnhShlogqIzy9m1q/Eg+Ig== integrity sha512-1tfTqfE1RyYnr8zCMrseQh0V8tMy6nS0dZACRQmMd7TLuXYtqO3GAuM4QzTh3tiXOsnvO6xOtzZDjDONkkM1+Q==
dependencies: dependencies:
"@nrwl/cypress" "14.1.1" "@nrwl/cypress" "14.1.6"
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
"@nrwl/linter" "14.1.1" "@nrwl/linter" "14.1.6"
"@nrwl/workspace" "14.1.1" "@nrwl/workspace" "14.1.6"
core-js "^3.6.5" core-js "^3.6.5"
semver "7.3.4" semver "7.3.4"
ts-loader "^9.2.6" ts-loader "^9.2.6"
tsconfig-paths-webpack-plugin "3.5.2" tsconfig-paths-webpack-plugin "3.5.2"
"@nrwl/tao@14.1.1": "@nrwl/tao@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-14.1.1.tgz#56b4d39c8ca1e1ca04ac3defb2c8f98ac2bd188b" resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-14.1.6.tgz#b7e731d69675480d246cda2b1bea5e438faeb824"
integrity sha512-sMD2Ada6goyAClRW5d8ODN78Z8uPMhMdC5axBrhDlb2h+obNVI2S1d6G9Hp72KxlnujpI7wQdjK+CuKwpc1KAw== integrity sha512-dJ+vfQv0hHR0JjYrvgISHKbHsjwbSmFnVDyXSac3UPocoSmU9ZInW4ZpnKmHh6qO1mmLiTuYZGm6MTN/g+du/A==
dependencies: dependencies:
nx "14.1.1" nx "14.1.6"
"@nrwl/web@14.1.1": "@nrwl/web@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/web/-/web-14.1.1.tgz#4850ed9c9010b6eec8eb2f55ec06e3abe1eff716" resolved "https://registry.yarnpkg.com/@nrwl/web/-/web-14.1.6.tgz#88546f9420ac45c967497e949469a35ea906d6b5"
integrity sha512-8/nbJGbDv/tL71hrHyqcv/hqcbcWDisdwJrnBj2xpDLTrjfCm+8ApXr3olPoZcpnOY6KFwdWN76aq9bb4cdN6A== integrity sha512-6FtZfto3PNP2491cNXJC9I9EkxySfMguSE1euxrWb5IMvZo5o0g6Wc5uL+BS3h5giRvEiOYNFKpHqb/7GvtyNQ==
dependencies: dependencies:
"@babel/core" "^7.15.0" "@babel/core" "^7.15.0"
"@babel/plugin-proposal-class-properties" "^7.14.5" "@babel/plugin-proposal-class-properties" "^7.14.5"
@ -2842,12 +2842,12 @@
"@babel/preset-env" "^7.15.0" "@babel/preset-env" "^7.15.0"
"@babel/preset-typescript" "^7.15.0" "@babel/preset-typescript" "^7.15.0"
"@babel/runtime" "^7.14.8" "@babel/runtime" "^7.14.8"
"@nrwl/cypress" "14.1.1" "@nrwl/cypress" "14.1.6"
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
"@nrwl/jest" "14.1.1" "@nrwl/jest" "14.1.6"
"@nrwl/js" "14.1.1" "@nrwl/js" "14.1.6"
"@nrwl/linter" "14.1.1" "@nrwl/linter" "14.1.6"
"@nrwl/workspace" "14.1.1" "@nrwl/workspace" "14.1.6"
"@pmmmwh/react-refresh-webpack-plugin" "^0.5.1" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.1"
"@rollup/plugin-babel" "^5.3.0" "@rollup/plugin-babel" "^5.3.0"
"@rollup/plugin-commonjs" "^20.0.0" "@rollup/plugin-commonjs" "^20.0.0"
@ -2872,7 +2872,7 @@
enhanced-resolve "^5.8.3" enhanced-resolve "^5.8.3"
file-loader "^6.2.0" file-loader "^6.2.0"
fork-ts-checker-webpack-plugin "6.2.10" fork-ts-checker-webpack-plugin "6.2.10"
fs-extra "^9.1.0" fs-extra "^10.1.0"
http-server "14.1.0" http-server "14.1.0"
identity-obj-proxy "3.0.0" identity-obj-proxy "3.0.0"
ignore "^5.0.4" ignore "^5.0.4"
@ -2915,14 +2915,14 @@
webpack-sources "^3.0.2" webpack-sources "^3.0.2"
webpack-subresource-integrity "^5.1.0" webpack-subresource-integrity "^5.1.0"
"@nrwl/workspace@14.1.1": "@nrwl/workspace@14.1.6":
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-14.1.1.tgz#5945836e3d75a8233141c2e33042e2a76618d0d8" resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-14.1.6.tgz#340bb8bcae114436f3104ab56ec611e3af338961"
integrity sha512-ELJq6m67X+wYvSyPMgudDlU1X6Zbyn2nGMTsPmULHPrtg49FRcrZ7TWH5YTA/LkkV5IY0xGwY9UNlyYGsZNj4Q== integrity sha512-J8GfKIubZ4jj/uTK1mEwRhHHL3lHhuWM14VbNdVmuueH+pVNHBh657vLnwlneISJH15Z3RyFfGuJRuCZcJUYsA==
dependencies: dependencies:
"@nrwl/devkit" "14.1.1" "@nrwl/devkit" "14.1.6"
"@nrwl/jest" "14.1.1" "@nrwl/jest" "14.1.6"
"@nrwl/linter" "14.1.1" "@nrwl/linter" "14.1.6"
"@parcel/watcher" "2.0.4" "@parcel/watcher" "2.0.4"
chalk "4.1.0" chalk "4.1.0"
chokidar "^3.5.1" chokidar "^3.5.1"
@ -2932,12 +2932,12 @@
enquirer "~2.3.6" enquirer "~2.3.6"
figures "3.2.0" figures "3.2.0"
flat "^5.0.2" flat "^5.0.2"
fs-extra "^9.1.0" fs-extra "^10.1.0"
glob "7.1.4" glob "7.1.4"
ignore "^5.0.4" ignore "^5.0.4"
minimatch "3.0.4" minimatch "3.0.4"
npm-run-path "^4.0.1" npm-run-path "^4.0.1"
nx "14.1.1" nx "14.1.6"
open "^8.4.0" open "^8.4.0"
rxjs "^6.5.4" rxjs "^6.5.4"
semver "7.3.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" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
nx@14.1.1: nx@14.1.6:
version "14.1.1" version "14.1.6"
resolved "https://registry.yarnpkg.com/nx/-/nx-14.1.1.tgz#91b4076f8c268ec13acf1cbf5821f0a3fcddb473" resolved "https://registry.yarnpkg.com/nx/-/nx-14.1.6.tgz#bcadd84381fe710abd1dd3431b0f9eb858db5dcc"
integrity sha512-+fZ7Bi2qhmP03I0dz6/cIOXPSwKjJD+xv3MBW4Ex9MtsW0BnMQ7bJOCjn0Nuk29oaz5NnojpXiens8UcZDQSAQ== integrity sha512-0Cgo7vqgyl+NzQlZX1KlqoRp87yJbO/Y11ylfVahfyfmfUkF3uTIwZvols2u4/c9k4Qm13JrvYHwpI7+FgzuHA==
dependencies: dependencies:
"@nrwl/cli" "14.1.1" "@nrwl/cli" "14.1.6"
"@nrwl/tao" "14.1.1" "@nrwl/tao" "14.1.6"
"@parcel/watcher" "2.0.4" "@parcel/watcher" "2.0.4"
"@swc-node/register" "^1.4.2" "@swc-node/register" "^1.4.2"
"@swc/core" "^1.2.173" "@swc/core" "^1.2.173"
@ -16538,7 +16538,7 @@ nx@14.1.1:
fast-glob "3.2.7" fast-glob "3.2.7"
figures "3.2.0" figures "3.2.0"
flat "^5.0.2" flat "^5.0.2"
fs-extra "^9.1.0" fs-extra "^10.1.0"
glob "7.1.4" glob "7.1.4"
ignore "^5.0.4" ignore "^5.0.4"
jsonc-parser "3.0.0" jsonc-parser "3.0.0"