Merge pull request #5 from censeo-io/upgrade

Upgrade
censeo-io · Feb 19, 2024 · df141a1 · df141a1
2 parents 0e952ae + e3d1bd6
commit df141a1
Show file tree

Hide file tree

Showing 14 changed files with 5,876 additions and 6,528 deletions.
diff --git a/hosting/.eslintignore b/hosting/.eslintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/hosting/.eslintrc.json b/hosting/.eslintrc.json
@@ -1,13 +1,13 @@
 {
   "root": true,
   "ignorePatterns": ["!**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/typescript",
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/typescript",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -32,7 +32,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/hosting/.gitignore b/hosting/.gitignore
@@ -44,3 +44,5 @@ Thumbs.db
 .firebase
 *-debug.log
 .runtimeconfig.json
+
+.nx/cache
diff --git a/hosting/.prettierignore b/hosting/.prettierignore
@@ -2,3 +2,5 @@
 
 /dist
 /coverage
+
+/.nx/cache
diff --git a/hosting/e2e/.eslintrc.json b/hosting/e2e/.eslintrc.json
@@ -4,12 +4,12 @@
   "overrides": [
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {
@@ -24,5 +24,5 @@
       }
     }
   ],
-  "plugins": ["@nrwl/nx"]
+  "plugins": ["@nx"]
 }
diff --git a/hosting/e2e/cypress.config.ts b/hosting/e2e/cypress.config.ts
@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 
 export default defineConfig({
   e2e: nxE2EPreset(__dirname),

diff --git a/hosting/e2e/project.json b/hosting/e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "e2e/cypress.config.ts",
         "devServerTarget": "censeo:serve:development",
@@ -18,11 +18,8 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["e2e/**/*.{js,ts}"]
-      }
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/hosting/jest.config.ts b/hosting/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'censeo',
   preset: './jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: './coverage/censeo',
   transform: {
-    '^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+\\.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
   snapshotSerializers: [

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