upgrade nx dependencies. NOTE: talent-pool is erroring - to be fixed

ericbolikowski · ericbolikowski · commit 863d3337f394 · 2022-04-07T14:37:54.000+02:00
diff --git a/apps/admin-panel/tsconfig.app.json b/apps/admin-panel/tsconfig.app.json
@@ -8,6 +8,6 @@
     "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
     "../../node_modules/@nrwl/react/typings/image.d.ts"
   ],
-  "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
   "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
 }
diff --git a/apps/admin-panel/tsconfig.spec.json b/apps/admin-panel/tsconfig.spec.json
@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ],
   "files": [
diff --git a/apps/redi-connect/tsconfig.app.json b/apps/redi-connect/tsconfig.app.json
@@ -8,6 +8,6 @@
     "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
     "../../node_modules/@nrwl/react/typings/image.d.ts"
   ],
-  "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
   "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
 }
diff --git a/apps/redi-connect/tsconfig.spec.json b/apps/redi-connect/tsconfig.spec.json
@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ],
   "files": [
diff --git a/apps/redi-talent-pool/tsconfig.app.json b/apps/redi-talent-pool/tsconfig.app.json
@@ -8,6 +8,6 @@
     "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
     "../../node_modules/@nrwl/react/typings/image.d.ts"
   ],
-  "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
   "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
 }
diff --git a/apps/redi-talent-pool/tsconfig.spec.json b/apps/redi-talent-pool/tsconfig.spec.json
@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ],
   "files": [
diff --git a/jest.config.js b/jest.config.js
@@ -1,14 +1,3 @@
-module.exports = {
-  projects: [
-    '<rootDir>/apps/redi-connect',
-    '<rootDir>/apps/admin-panel',
-    '<rootDir>/libs/shared-atomic-design-components',
-    '<rootDir>/apps/redi-talent-pool',
-    '<rootDir>/libs/shared-config',
-    '<rootDir>/libs/talent-pool/types',
-    '<rootDir>/libs/talent-pool/config',
-    '<rootDir>/libs/shared-utils',
-    '<rootDir>/libs/typescript-utilities',
-    '<rootDir>/apps/nestjs-api',
-  ],
-}
+const { getJestProjects } = require('@nrwl/jest')
+
+module.exports = { projects: getJestProjects() }
diff --git a/libs/shared-atomic-design-components/.storybook/main.js b/libs/shared-atomic-design-components/.storybook/main.js
@@ -5,5 +5,6 @@ const rootMain = require('../../../.storybook/main')
 rootMain.stories.push(
   ...['../src/lib/**/*.stories.mdx', '../src/lib/**/*.stories.@(js|jsx|ts|tsx)']
 )
+rootMain.core = { ...rootMain.core, builder: 'webpack5' }
 
 module.exports = rootMain
diff --git a/libs/shared-atomic-design-components/.storybook/tsconfig.json b/libs/shared-atomic-design-components/.storybook/tsconfig.json
@@ -6,9 +6,18 @@
   },
   "exclude": [
     "../**/*.spec.ts",
+    "../**/*.test.ts",
     "../**/*.spec.js",
+    "../**/*.test.js",
     "../**/*.spec.tsx",
-    "../**/*.spec.jsx"
+    "../**/*.test.tsx",
+    "../**/*.spec.jsx",
+    "../**/*.test.jsx"
   ],
-  "include": ["../src/**/*", "*.js"]
+  "include": ["../src/**/*", "*.js"],
+  "files": [
+    "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../../node_modules/@nrwl/react/typings/image.d.ts",
+    "../../../node_modules/@nrwl/react/typings/styled-jsx.d.ts"
+  ]
 }
diff --git a/libs/shared-atomic-design-components/tsconfig.lib.json b/libs/shared-atomic-design-components/tsconfig.lib.json
@@ -10,7 +10,9 @@
   ],
   "exclude": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.stories.ts",
     "**/*.stories.js",
     "**/*.stories.jsx",
diff --git a/libs/shared-atomic-design-components/tsconfig.spec.json b/libs/shared-atomic-design-components/tsconfig.spec.json
@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ]
 }
diff --git a/libs/shared-config/tsconfig.lib.json b/libs/shared-config/tsconfig.lib.json
@@ -5,5 +5,5 @@
     "types": []
   },
   "include": ["**/*.ts"],
-  "exclude": ["**/*.spec.ts"]
+  "exclude": ["**/*.spec.ts", "**/*.test.ts"]
 }
diff --git a/libs/shared-config/tsconfig.spec.json b/libs/shared-config/tsconfig.spec.json
@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ]
 }
diff --git a/libs/shared-utils/tsconfig.lib.json b/libs/shared-utils/tsconfig.lib.json
@@ -5,5 +5,5 @@
     "types": []
   },
   "include": ["**/*.ts"],
-  "exclude": ["**/*.spec.ts"]
+  "exclude": ["**/*.spec.ts", "**/*.test.ts"]
 }
diff --git a/libs/shared-utils/tsconfig.spec.json b/libs/shared-utils/tsconfig.spec.json
@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ]
 }
diff --git a/libs/talent-pool/config/tsconfig.lib.json b/libs/talent-pool/config/tsconfig.lib.json
@@ -5,5 +5,5 @@
     "types": []
   },
   "include": ["**/*.ts"],
-  "exclude": ["**/*.spec.ts"]
+  "exclude": ["**/*.spec.ts", "**/*.test.ts"]
 }
diff --git a/libs/talent-pool/config/tsconfig.spec.json b/libs/talent-pool/config/tsconfig.spec.json
@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ]
 }
diff --git a/libs/talent-pool/types/tsconfig.lib.json b/libs/talent-pool/types/tsconfig.lib.json
@@ -5,5 +5,5 @@
     "types": []
   },
   "include": ["**/*.ts"],
-  "exclude": ["**/*.spec.ts"]
+  "exclude": ["**/*.spec.ts", "**/*.test.ts"]
 }
diff --git a/libs/talent-pool/types/tsconfig.spec.json b/libs/talent-pool/types/tsconfig.spec.json
@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ]
 }
diff --git a/libs/typescript-utilities/tsconfig.lib.json b/libs/typescript-utilities/tsconfig.lib.json
@@ -6,5 +6,5 @@
     "types": []
   },
   "include": ["**/*.ts"],
-  "exclude": ["**/*.spec.ts"]
+  "exclude": ["**/*.spec.ts", "**/*.test.ts"]
 }
diff --git a/libs/typescript-utilities/tsconfig.spec.json b/libs/typescript-utilities/tsconfig.spec.json
@@ -7,9 +7,13 @@
   },
   "include": [
     "**/*.spec.ts",
+    "**/*.test.ts",
     "**/*.spec.tsx",
+    "**/*.test.tsx",
     "**/*.spec.js",
+    "**/*.test.js",
     "**/*.spec.jsx",
+    "**/*.test.jsx",
     "**/*.d.ts"
   ]
 }
diff --git a/migrations.json b/migrations.json
diff --git a/nx.json b/nx.json
diff --git a/package.json b/package.json
diff --git a/workspace.json b/workspace.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`	`"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",`
`9`	`9`	`"../../node_modules/@nrwl/react/typings/image.d.ts"`
`10`	`10`	`],`
`11`		`- "exclude": ["*/.spec.ts", "*/.spec.tsx"],`
	`11`	`+ "exclude": ["*/.spec.ts", "*/.test.ts", "*/.spec.tsx", "*/.test.tsx"],`
`12`	`12`	`"include": ["*/.js", "*/.jsx", "*/.ts", "*/.tsx"]`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@ const rootMain = require('../../../.storybook/main')`
`5`	`5`	`rootMain.stories.push(`
`6`	`6`	`...['../src/lib/*/.stories.mdx', '../src/lib/*/.stories.@(js\|jsx\|ts\|tsx)']`
`7`	`7`	`)`
	`8`	`+rootMain.core = { ...rootMain.core, builder: 'webpack5' }`
`8`	`9`
`9`	`10`	`module.exports = rootMain`