Skip to content

Commit

Permalink
chore(repo): update nx to 14.0.2 (nrwl#9974)
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenPandaz authored Apr 23, 2022
1 parent fda454c commit 4f99b77
Show file tree
Hide file tree
Showing 242 changed files with 646 additions and 517 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion dep-graph/client/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/dep-graph/client"],
"options": {
"jestConfig": "dep-graph/client/jest.config.js",
"jestConfig": "dep-graph/client/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
3 changes: 2 additions & 1 deletion dep-graph/client/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"**/*.spec.js",
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx"
"**/*.test.jsx",
"jest.config.ts"
],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
3 changes: 2 additions & 1 deletion dep-graph/client/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"**/*.spec.js",
"**/*.test.jsx",
"**/*.spec.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
],
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/add-nx-to-monorepo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/add-nx-to-monorepo/jest.config.js",
"jestConfig": "e2e/add-nx-to-monorepo/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/add-nx-to-monorepo/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/angular-core/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/angular-core/jest.config.js",
"jestConfig": "e2e/angular-core/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/angular-core/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/angular-extensions/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/angular-extensions/jest.config.js",
"jestConfig": "e2e/angular-extensions/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/angular-extensions/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
2 changes: 1 addition & 1 deletion e2e/cli/jest.config.js → e2e/cli/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/cli/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/cli/jest.config.js",
"jestConfig": "e2e/cli/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/cli/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
2 changes: 1 addition & 1 deletion e2e/cypress/jest.config.js → e2e/cypress/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/cypress/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/cypress/jest.config.js",
"jestConfig": "e2e/cypress/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/cypress/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
2 changes: 1 addition & 1 deletion e2e/detox/jest.config.js → e2e/detox/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
module.exports = {
preset: '../../jest.preset.js',
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
Expand All @@ -8,4 +7,5 @@ module.exports = {
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-detox',
testTimeout: 600000,
preset: '../../jest.preset.ts',
};
2 changes: 1 addition & 1 deletion e2e/detox/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/detox/jest.config.js",
"jestConfig": "e2e/detox/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/detox/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
2 changes: 1 addition & 1 deletion e2e/jest/jest.config.js → e2e/jest/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/jest/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/jest/jest.config.js",
"jestConfig": "e2e/jest/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/jest/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
2 changes: 1 addition & 1 deletion e2e/js/jest.config.js → e2e/js/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/js/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/js/jest.config.js",
"jestConfig": "e2e/js/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/js/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
2 changes: 1 addition & 1 deletion e2e/linter/jest.config.js → e2e/linter/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/linter/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/linter/jest.config.js",
"jestConfig": "e2e/linter/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/linter/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
2 changes: 1 addition & 1 deletion e2e/next/jest.config.js → e2e/next/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/next/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/next/jest.config.js",
"jestConfig": "e2e/next/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/next/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
2 changes: 1 addition & 1 deletion e2e/node/jest.config.js → e2e/node/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/node/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/node/jest.config.js",
"jestConfig": "e2e/node/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/node/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
preset: '../../jest.preset.js',
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',
};
2 changes: 1 addition & 1 deletion e2e/nx-plugin/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"run-e2e-tests": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "e2e/nx-plugin/jest.config.js",
"jestConfig": "e2e/nx-plugin/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
Expand Down
3 changes: 2 additions & 1 deletion e2e/nx-plugin/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
"**/*.d.ts",
"jest.config.ts"
]
}
Loading

0 comments on commit 4f99b77

Please sign in to comment.