Ran NX migrations & updated dependencies

cds-snc · Oct 11, 2023 · ca9114d · ca9114d
1 parent c277a07
commit ca9114d
Show file tree

Hide file tree

Showing 132 changed files with 18,331 additions and 42,200 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,12 +1,17 @@
 {
   "root": true,
   "ignorePatterns": ["**/*", "**/*.d.ts"],
-  "plugins": ["@nrwl/nx", "@ngrx"],
+  "plugins": ["@nx", "@ngrx"],
   "overrides": [
+    {
+      "files": "*.json",
+      "parser": "jsonc-eslint-parser",
+      "rules": {}
+    },
     {
       "files": ["*[^.d$].ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -23,12 +28,15 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript", "plugin:@ngrx/eslint-plugin/recommended"],
+      "extends": [
+        "plugin:@nx/typescript",
+        "plugin:@ngrx/eslint-plugin/recommended"
+      ],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     }
   ]

diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@ npm-debug.log
 yarn-error.log
 testem.log
 /typings
+.ipynb_checkpoints/
 
 # System Files
 .DS_Store

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "eslint.validate": ["json"]
+}
diff --git a/apps/api/project.json b/apps/api/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "build": {
-      "executor": "@nrwl/webpack:webpack",
+      "executor": "@nx/webpack:webpack",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/api",
@@ -42,20 +42,20 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/node:node",
+      "executor": "@nx/js:node",
       "options": {
         "buildTarget": "api:build"
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/api/**/*.ts"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/api"],
       "options": {
         "jestConfig": "apps/api/jest.config.ts",

diff --git a/apps/api/src/internal-search/internal-search.module.ts b/apps/api/src/internal-search/internal-search.module.ts
@@ -1,4 +1,5 @@
-import { CacheModule, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
+import { CacheModule } from '@nestjs/cache-manager';
 import { InternalSearchService } from './internal-search.service';
 import { InternalSearchController } from './internal-search.controller';
 import { DbModule, DbService } from '@dua-upd/db';

diff --git a/apps/api/src/overall/overall.module.ts b/apps/api/src/overall/overall.module.ts
@@ -1,4 +1,5 @@
-import { CacheModule, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
+import { CacheModule } from '@nestjs/cache-manager';
 import { OverallService } from './overall.service';
 import { OverallController } from './overall.controller';
 import { DbModule, DbService } from '@dua-upd/db';

diff --git a/apps/api/src/pages/pages.module.ts b/apps/api/src/pages/pages.module.ts
@@ -1,4 +1,5 @@
-import { CacheModule, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
+import { CacheModule } from '@nestjs/cache-manager';
 import { PagesService } from './pages.service';
 import { PagesController } from './pages.controller';
 import { DbModule, DbService } from '@dua-upd/db';

diff --git a/apps/api/src/projects/projects.module.ts b/apps/api/src/projects/projects.module.ts
@@ -1,4 +1,5 @@
-import { CacheModule, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
+import { CacheModule } from '@nestjs/cache-manager';
 import { DbModule } from '@dua-upd/db';
 import { ProjectsController } from './projects.controller';
 import { ProjectsService } from './projects.service';

diff --git a/apps/api/src/reports/reports.module.ts b/apps/api/src/reports/reports.module.ts
@@ -1,4 +1,5 @@
-import { CacheModule, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
+import { CacheModule } from '@nestjs/cache-manager';
 import { DbModule } from '@dua-upd/db';
 import { ReportsController } from './reports.controller';
 import { ReportsService } from './reports.service';

diff --git a/apps/api/src/tasks/tasks.module.ts b/apps/api/src/tasks/tasks.module.ts
@@ -1,4 +1,5 @@
-import { CacheModule, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
+import { CacheModule } from '@nestjs/cache-manager';
 import { TasksService } from './tasks.service';
 import { TasksController } from './tasks.controller';
 import { DbModule, DbService } from '@dua-upd/db';

diff --git a/apps/api/tsconfig.app.json b/apps/api/tsconfig.app.json
@@ -5,7 +5,7 @@
     "module": "commonjs",
     "types": ["node"],
     "emitDecoratorMetadata": true,
-    "target": "es2020",
+    "target": "es2021",
     "lib": ["ESNext", "DOM", "DOM.Iterable"]
   },
   "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],

diff --git a/apps/db-cli/.swcrc b/apps/db-cli/.swcrc
@@ -16,9 +16,7 @@
     "loose": true
   },
   "module": {
-    "type": "es6",
-    "strict": true,
-    "noInterop": true
+    "type": "es6"
   },
   "exclude": [
     "jest.config.js",

diff --git a/apps/db-cli/project.json b/apps/db-cli/project.json
@@ -6,7 +6,7 @@
   "targets": {
     "build": {
       "defaultConfiguration": "production",
-      "executor": "@nrwl/webpack:webpack",
+      "executor": "@nx/webpack:webpack",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/db-cli",
@@ -49,20 +49,20 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/node:node",
+      "executor": "@nx/js:node",
       "options": {
         "buildTarget": "db-cli:build"
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/db-cli/**/*.ts"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/db-cli"],
       "options": {
         "jestConfig": "apps/db-cli/jest.config.ts",

diff --git a/apps/db-cli/src/app/scripts/.gitignore b/apps/db-cli/src/app/scripts/.gitignore
@@ -0,0 +1 @@
+zcratchpad.ts
diff --git a/apps/db-updater/project.json b/apps/db-updater/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "build": {
-      "executor": "@nrwl/webpack:webpack",
+      "executor": "@nx/webpack:webpack",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/db-updater",
@@ -38,20 +38,20 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/node:node",
+      "executor": "@nx/js:node",
       "options": {
         "buildTarget": "db-updater:build"
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/db-updater/**/*.ts"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/db-updater"],
       "options": {
         "jestConfig": "apps/db-updater/jest.config.ts",

diff --git a/apps/log-viewer/.babelrc b/apps/log-viewer/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["@nrwl/js/babel"]
+  "presets": ["@nx/js/babel"]
 }
diff --git a/apps/log-viewer/project.json b/apps/log-viewer/project.json
@@ -6,7 +6,7 @@
   "tags": [],
   "targets": {
     "build": {
-      "executor": "@nrwl/vite:build",
+      "executor": "@nx/vite:build",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "options": {
@@ -22,7 +22,7 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/vite:dev-server",
+      "executor": "@nx/vite:dev-server",
       "defaultConfiguration": "development",
       "options": {
         "buildTarget": "log-viewer:build"
@@ -39,7 +39,7 @@
       }
     },
     "preview": {
-      "executor": "@nrwl/vite:preview-server",
+      "executor": "@nx/vite:preview-server",
       "defaultConfiguration": "development",
       "options": {
         "buildTarget": "log-viewer:build"
@@ -54,7 +54,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/log-viewer/**/*.ts"]

diff --git a/apps/log-viewer/src/app/app.element.ts b/apps/log-viewer/src/app/app.element.ts
@@ -74,10 +74,10 @@ export class AppElement extends HTMLElement {
               Add UI library
             </summary>
             <pre><span># Generate UI lib</span>
-nx g @nrwl/angular:lib ui
+nx g @nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nrwl/angular:component button --project ui</pre>
+nx g @nx/angular:component button --project ui</pre>
           </details>
           <details>
             <summary>

diff --git a/apps/log-viewer/vite.config.ts b/apps/log-viewer/vite.config.ts
@@ -1,7 +1,7 @@
 /// <reference types="vitest" />
 import { defineConfig } from 'vite';
 
-import viteTsConfigPaths from 'vite-tsconfig-paths';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 console.log(process.cwd());
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/log-viewer',
@@ -18,9 +18,7 @@ export default defineConfig({
   },
 
   plugins: [
-    viteTsConfigPaths({
-      root: '../../',
-    }),
+    nxViteTsPaths(),
   ],
 
   // Uncomment this if you are using workers.

diff --git a/apps/upd-e2e/project.json b/apps/upd-e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "tsConfig": "apps/upd-e2e/tsconfig.json",
         "cypressConfig": "apps/upd-e2e/cypress.json",
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/upd-e2e/**/*.{js,ts}"]

diff --git a/apps/upd/.eslintrc.json b/apps/upd/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/apps/upd/project.json b/apps/upd/project.json
@@ -6,7 +6,7 @@
   "prefix": "upd",
   "targets": {
     "build": {
-      "executor": "@nrwl/angular:webpack-browser",
+      "executor": "@nx/angular:webpack-browser",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/upd",
@@ -62,7 +62,7 @@
       "defaultConfiguration": "production"
     },
     "serve": {
-      "executor": "@nrwl/angular:webpack-dev-server",
+      "executor": "@nx/angular:webpack-dev-server",
       "configurations": {
         "production": {
           "browserTarget": "upd:build:production"
@@ -87,13 +87,13 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["apps/upd/src/**/*.ts", "apps/upd/src/**/*.html"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/upd"],
       "options": {
         "jestConfig": "apps/upd/jest.config.ts",

diff --git a/jest.config.ts b/jest.config.ts
@@ -1,4 +1,4 @@
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@nx/jest');
 
 export default {
   projects: getJestProjects(),

diff --git a/jest.preset.js b/jest.preset.js
@@ -1,4 +1,4 @@
-const nxPreset = require('@nrwl/jest/preset').default;
+const nxPreset = require('@nx/jest/preset').default;
 
 module.exports = {
   ...nxPreset,

diff --git a/libs/blob-storage/.swcrc b/libs/blob-storage/.swcrc
@@ -15,9 +15,7 @@
     "loose": true
   },
   "module": {
-    "type": "es6",
-    "strict": true,
-    "noInterop": true
+    "type": "es6"
   },
   "exclude": [
     "jest.config.js",