Merge branch 'master' into chore/reinstate-terraform-for-azure-migration

talent-connect · Mar 18, 2022 · b3e7f20 · b3e7f20
1 parent adeb917
commit b3e7f20
Show file tree

Hide file tree

Showing 26 changed files with 244 additions and 20,569 deletions.
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/custom-webpack-config.js b/apps/redi-talent-pool/custom-webpack-config.js
@@ -1,9 +1,31 @@
 const nrwlConfig = require('@nrwl/react/plugins/webpack.js') // require the main @nrwl/react/plugins/webpack configuration function.
+const { merge } = require('lodash')
 
 module.exports = (config, context) => {
   nrwlConfig(config) // first call it so that it @nrwl/react plugin adds its configs,
 
-  return { ...config, node: undefined }
+  const mergedConfig = merge({}, config, {
+    resolve: {
+      fallback: {
+        crypto: require.resolve('crypto-browserify'),
+        process: require.resolve('process/browser'),
+        zlib: require.resolve('browserify-zlib'),
+        stream: require.resolve('stream-browserify'),
+        util: require.resolve('util'),
+        buffer: require.resolve('buffer'),
+        asset: require.resolve('assert'),
+      },
+    },
+    // plugins: [
+    //   new webpack.ProvidePlugin({
+    //     Buffer: ['buffer', 'Buffer'],
+    //     process: 'process/browser',
+    //   }),
+    // ],
+    node: undefined,
+  })
+
+  return mergedConfig
 }
 
 /**

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/nx.json b/nx.json
@@ -17,67 +17,37 @@
         "cacheableOperations": [],
         "accessToken": "YTA4ZjEzZTctYTc5NS00OWIwLWFiOTQtOGM5YTJkNThjMDM1fHJlYWQtd3JpdGU=",
         "canTrackAnalytics": false,
-        "showUsageWarnings": true
+        "showUsageWarnings": true,
+        "parallel": 1
       }
     }
   },
-  "projects": {
-    "admin-panel": {
-      "tags": []
-    },
-    "admin-panel-e2e": {
-      "tags": [],
-      "implicitDependencies": ["admin-panel"]
-    },
-    "api": {
-      "tags": [],
-      "implicitDependencies": []
-    },
-    "nestjs-api": {
-      "tags": []
-    },
-    "redi-connect": {
-      "tags": []
-    },
-    "redi-connect-e2e": {
-      "tags": [],
-      "implicitDependencies": ["redi-connect"]
-    },
-    "redi-talent-pool": {
-      "tags": []
-    },
-    "redi-talent-pool-e2e": {
-      "tags": [],
-      "implicitDependencies": ["redi-talent-pool"]
-    },
-    "shared-atomic-design-components": {
-      "tags": []
-    },
-    "shared-config": {
-      "tags": []
-    },
-    "shared-types": {
-      "tags": []
-    },
-    "shared-utils": {
-      "tags": []
-    },
-    "talent-pool-config": {
-      "tags": []
-    },
-    "talent-pool-types": {
-      "tags": []
-    },
-    "typescript-utilities": {
-      "tags": []
-    }
-  },
   "targetDependencies": {
     "build": [
       {
         "target": "build",
         "projects": "dependencies"
       }
     ]
-  }
+  },
+  "cli": {
+    "defaultCollection": "@nrwl/react"
+  },
+  "generators": {
+    "@nrwl/react": {
+      "application": {
+        "style": "scss",
+        "linter": "eslint",
+        "babel": true
+      },
+      "component": {
+        "style": "scss"
+      },
+      "library": {
+        "style": "scss",
+        "linter": "eslint"
+      }
+    }
+  },
+  "defaultProject": "redi-connect"
 }