Skip to content

Commit

Permalink
feat: nx migrate 14 (#136)
Browse files Browse the repository at this point in the history
  • Loading branch information
udayvunnam authored Jun 4, 2022
1 parent b31cb89 commit 2889168
Show file tree
Hide file tree
Showing 40 changed files with 2,019 additions and 1,499 deletions.
1 change: 0 additions & 1 deletion apps/breadcrumb-demo-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"root": "apps/breadcrumb-demo-e2e",
"sourceRoot": "apps/breadcrumb-demo-e2e/src",
"projectType": "application",
"targets": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'breadcrumb-demo',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
Expand Down
3 changes: 1 addition & 2 deletions apps/breadcrumb-demo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"style": "css"
}
},
"root": "apps/breadcrumb-demo",
"sourceRoot": "apps/breadcrumb-demo/src",
"prefix": "bd",
"targets": {
Expand Down Expand Up @@ -89,7 +88,7 @@
"test": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "apps/breadcrumb-demo/jest.config.js",
"jestConfig": "apps/breadcrumb-demo/jest.config.ts",
"passWithNoTests": true
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/breadcrumb-demo/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"types": []
},
"files": ["src/main.ts", "src/polyfills.ts"],
"exclude": ["**/*.spec.ts", "**/*.test.ts"]
"exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"]
}
3 changes: 2 additions & 1 deletion apps/breadcrumb-demo/tsconfig.editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"include": ["**/*.ts"],
"compilerOptions": {
"types": ["jest", "node"]
}
},
"exclude": ["jest.config.ts"]
}
2 changes: 1 addition & 1 deletion apps/breadcrumb-demo/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
}
1 change: 0 additions & 1 deletion apps/demo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"style": "css"
}
},
"root": "apps/demo",
"sourceRoot": "apps/demo/src",
"prefix": "app",
"targets": {
Expand Down
1 change: 0 additions & 1 deletion apps/got-demo-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"root": "apps/got-demo-e2e",
"sourceRoot": "apps/got-demo-e2e/src",
"projectType": "application",
"targets": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'got-demo',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
Expand Down
3 changes: 1 addition & 2 deletions apps/got-demo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"style": "css"
}
},
"root": "apps/got-demo",
"sourceRoot": "apps/got-demo/src",
"prefix": "got",
"targets": {
Expand Down Expand Up @@ -83,7 +82,7 @@
"test": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "apps/got-demo/jest.config.js",
"jestConfig": "apps/got-demo/jest.config.ts",
"passWithNoTests": true
}
}
Expand Down
7 changes: 6 additions & 1 deletion apps/got-demo/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,10 @@
},
"files": ["src/main.ts", "src/polyfills.ts"],
"include": ["src/**/*.d.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"]
"exclude": [
"src/test-setup.ts",
"**/*.spec.ts",
"**/*.test.ts",
"jest.config.ts"
]
}
3 changes: 2 additions & 1 deletion apps/got-demo/tsconfig.editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"include": ["**/*.ts"],
"compilerOptions": {
"types": ["jest", "node"]
}
},
"exclude": ["jest.config.ts"]
}
2 changes: 1 addition & 1 deletion apps/got-demo/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
}
1 change: 0 additions & 1 deletion apps/simple-demo-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"root": "apps/simple-demo-e2e",
"sourceRoot": "apps/simple-demo-e2e/src",
"projectType": "application",
"targets": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'simple-demo',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
Expand Down
3 changes: 1 addition & 2 deletions apps/simple-demo/project.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"projectType": "application",
"generators": {},
"root": "apps/simple-demo",
"sourceRoot": "apps/simple-demo/src",
"prefix": "xng",
"targets": {
Expand Down Expand Up @@ -82,7 +81,7 @@
"test": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "apps/simple-demo/jest.config.js",
"jestConfig": "apps/simple-demo/jest.config.ts",
"passWithNoTests": true
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/simple-demo/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"types": []
},
"files": ["src/main.ts", "src/polyfills.ts"],
"exclude": ["**/*.spec.ts", "**/*.test.ts"]
"exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"]
}
3 changes: 2 additions & 1 deletion apps/simple-demo/tsconfig.editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"include": ["**/*.ts"],
"compilerOptions": {
"types": ["jest", "node"]
}
},
"exclude": ["jest.config.ts"]
}
2 changes: 1 addition & 1 deletion apps/simple-demo/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
}
3 changes: 2 additions & 1 deletion apps/ssr/jest.config.js → apps/ssr/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'ssr',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
Expand Down
3 changes: 1 addition & 2 deletions apps/ssr/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"projectType": "application",
"root": "apps/ssr",
"sourceRoot": "apps/ssr/src",
"prefix": "app",
"targets": {
Expand Down Expand Up @@ -78,7 +77,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/apps/ssr"],
"options": {
"jestConfig": "apps/ssr/jest.config.js",
"jestConfig": "apps/ssr/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion apps/ssr/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
},
"files": ["src/main.ts", "src/polyfills.ts"],
"include": ["src/**/*.d.ts"],
"exclude": ["**/*.test.ts", "**/*.spec.ts"]
"exclude": ["**/*.test.ts", "**/*.spec.ts", "jest.config.ts"]
}
3 changes: 2 additions & 1 deletion apps/ssr/tsconfig.editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"include": ["**/*.ts"],
"compilerOptions": {
"types": ["jest", "node"]
}
},
"exclude": ["jest.config.ts"]
}
2 changes: 1 addition & 1 deletion apps/ssr/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}
1 change: 0 additions & 1 deletion apps/with-gaurd-check-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"root": "apps/with-gaurd-check-e2e",
"sourceRoot": "apps/with-gaurd-check-e2e/src",
"projectType": "application",
"targets": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'with-gaurd-check',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
Expand Down
3 changes: 1 addition & 2 deletions apps/with-gaurd-check/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"projectType": "application",
"root": "apps/with-gaurd-check",
"sourceRoot": "apps/with-gaurd-check/src",
"prefix": "wgc",
"targets": {
Expand Down Expand Up @@ -84,7 +83,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/apps/with-gaurd-check"],
"options": {
"jestConfig": "apps/with-gaurd-check/jest.config.js",
"jestConfig": "apps/with-gaurd-check/jest.config.ts",
"passWithNoTests": true
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/with-gaurd-check/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
},
"files": ["src/main.ts", "src/polyfills.ts"],
"include": ["src/**/*.d.ts"],
"exclude": ["**/*.test.ts", "**/*.spec.ts"]
"exclude": ["**/*.test.ts", "**/*.spec.ts", "jest.config.ts"]
}
3 changes: 2 additions & 1 deletion apps/with-gaurd-check/tsconfig.editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"include": ["**/*.ts"],
"compilerOptions": {
"types": ["jest", "node"]
}
},
"exclude": ["jest.config.ts"]
}
2 changes: 1 addition & 1 deletion apps/with-gaurd-check/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}
2 changes: 1 addition & 1 deletion jest.config.js → jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { getJestProjects } = require('@nrwl/jest');

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

module.exports = { ...nxPreset };
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'xng-breadcrumb',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
Expand Down
3 changes: 1 addition & 2 deletions libs/xng-breadcrumb/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"projectType": "library",
"root": "libs/xng-breadcrumb",
"sourceRoot": "libs/xng-breadcrumb/src",
"prefix": "xng",
"targets": {
Expand All @@ -25,7 +24,7 @@
"test": {
"executor": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/xng-breadcrumb/jest.config.js",
"jestConfig": "libs/xng-breadcrumb/jest.config.ts",
"passWithNoTests": true
}
}
Expand Down
7 changes: 6 additions & 1 deletion libs/xng-breadcrumb/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
"enableResourceInlining": true,
"fullTemplateTypeCheck": true
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
"exclude": [
"src/test-setup.ts",
"**/*.spec.ts",
"**/*.test.ts",
"jest.config.ts"
],
"include": ["**/*.ts"]
}
3 changes: 2 additions & 1 deletion libs/xng-breadcrumb/tsconfig.lib.prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
},
"angularCompilerOptions": {
"compilationMode": "partial"
}
},
"exclude": ["jest.config.ts"]
}
2 changes: 1 addition & 1 deletion libs/xng-breadcrumb/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
}
Loading

0 comments on commit 2889168

Please sign in to comment.