Feature/fix deps 1

.eslintrc.json

@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx/eslint-plugin-nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -26,7 +26,7 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/nx/typescript"],
       "rules": {
         "no-unused-vars": "off",
         "react-hooks/exhaustive-deps": "off",
@@ -36,7 +36,7 @@
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/nx/javascript"],
       "rules": {}
     }
   ]

.github/workflows/affected-build.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nx/nx-set-shas@v3
       - uses: actions/cache@v3
         with:
           path: '**/node_modules'
@@ -40,7 +40,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nx/nx-set-shas@v3
       - uses: actions/cache@v3
         with:
           path: '**/node_modules'

.github/workflows/affected-lint.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nx/nx-set-shas@v3
       - uses: actions/cache@v3
         with:
           path: '**/node_modules'
@@ -40,7 +40,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nx/nx-set-shas@v3
       - uses: actions/cache@v3
         with:
           path: '**/node_modules'

.github/workflows/affected-test.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nx/nx-set-shas@v3
       - uses: actions/cache@v3
         with:
           path: '**/node_modules'
@@ -40,7 +40,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nx/nx-set-shas@v3
       - uses: actions/cache@v3
         with:
           path: '**/node_modules'

.gitignore

@@ -41,3 +41,5 @@ hs_err*.log
 # System Files
 .DS_Store
 Thumbs.db
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md

.prettierignore

@@ -3,3 +3,6 @@
 /dist
 /coverage
 tmp
+
+/.nx/cache
+/.nx/workspace-data

.vscode/extensions.json

@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    "nrwl.angular-console",
+    "nx.angular-console",
     "esbenp.prettier-vscode",
     "firsttris.vscode-jest-runner",
     "dbaeumer.vscode-eslint"

apps/api-e2e/project.json

@@ -4,14 +4,14 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "apps/api-e2e/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/api-e2e/**/*.ts"]

apps/api/project.json

@@ -4,15 +4,17 @@
   "projectType": "application",
   "targets": {
     "build": {
-      "executor": "@nrwl/webpack:webpack",
+      "executor": "@nx/webpack:webpack",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/api",
         "main": "apps/api/src/main.ts",
         "tsConfig": "apps/api/tsconfig.app.json",
         "assets": ["apps/api/src/assets"],
         "target": "node",
-        "compiler": "tsc"
+        "compiler": "tsc",
+        "webpackConfig": "apps/api/webpack.config.js",
+        "outputFileName": "main.js"
       },
       "configurations": {
         "production": {
@@ -29,25 +31,23 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/node:node",
+      "executor": "@nx/js:node",
       "options": {
-        "buildTarget": "api:build"
+        "buildTarget": "api:build",
+        "watch": true,
+        "inspect": true
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/api/**/*.ts"]
-      }
+      "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",
-        "passWithNoTests": true
-      }
+      "options": { "jestConfig": "apps/api/jest.config.ts", "passWithNoTests": true }
     }
   },
   "tags": [],

apps/api/src/main.ts

@@ -40,8 +40,8 @@ async function bootstrap() {
         config.corsBypass
           ? 'Bypassed'
           : config?.corsOrigins
-          ? `enabled for: ${Array.isArray(config?.corsOrigins) ? config?.corsOrigins?.join(', ') : config?.corsOrigins}`
-          : 'disabled'
+            ? `enabled for: ${Array.isArray(config?.corsOrigins) ? config?.corsOrigins?.join(', ') : config?.corsOrigins}`
+            : 'disabled'
       }`,
     )
 

apps/api/webpack.config.js

@@ -0,0 +1,34 @@
+const path = require('path')
+const { composePlugins, withNx } = require('@nx/webpack')
+
+module.exports = composePlugins(withNx(), (config) => {
+  // silence the "mode" warning and give sane defaults
+  config.mode = process.env.NODE_ENV === 'production' ? 'production' : 'development'
+
+  // we’re bundling for Node
+  config.target = 'node'
+
+  // force the correct entry (no accidental "./src" at repo root)
+  config.entry = {
+    main: path.resolve(__dirname, 'src/main.ts'),
+  }
+
+  // emit exactly where serve expects
+  config.output = {
+    path: path.resolve(__dirname, '../../dist/apps/api'),
+    filename: 'main.js',
+    clean: true,
+  }
+
+  // make sure TS resolves; keep existing plus add .ts/.tsx
+  config.resolve = config.resolve || {}
+  config.resolve.extensions = Array.from(new Set([...(config.resolve.extensions || []), '.ts', '.tsx', '.js']))
+
+  // if you use TS path aliases, uncomment this block:
+  // const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+  // config.resolve.plugins = [...(config.resolve.plugins || []), new TsconfigPathsPlugin({
+  //   configFile: path.resolve(__dirname, 'tsconfig.app.json'),
+  // })];
+
+  return config
+})

apps/sdk-e2e/project.json

@@ -19,14 +19,14 @@
       }
     },
     "e2e-local": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "apps/sdk-e2e/jest.config.js",
         "passWithNoTests": true
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/sdk-e2e/**/*.ts"]

apps/web-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),

apps/web-e2e/project.json

@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/web-e2e/cypress.config.ts",
         "devServerTarget": "web:serve:development",
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/web-e2e/**/*.{js,ts}"]

apps/web/.babelrc

@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/react/babel",
+      "@nx/react/babel",
       {
         "runtime": "automatic"
       }

apps/web/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
+  "extends": ["plugin:@nx/nx/react", "../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {

apps/web/jest.config.ts

@@ -3,8 +3,8 @@ export default {
   displayName: 'web',
   preset: '../../jest.preset.js',
   transform: {
-    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
-    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/react/babel'] }],
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/apps/web',

apps/web/project.json

@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "build": {
-      "executor": "@nrwl/webpack:webpack",
+      "executor": "@nx/webpack:webpack",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "options": {
@@ -19,7 +19,7 @@
         "assets": ["apps/web/src/favicon.ico", "apps/web/src/assets"],
         "styles": ["apps/web/src/styles.css"],
         "scripts": [],
-        "webpackConfig": "@nrwl/react/plugins/webpack"
+        "webpackConfig": "@nx/react/plugins/webpack"
       },
       "configurations": {
         "development": {
@@ -45,7 +45,7 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/webpack:dev-server",
+      "executor": "@nx/webpack:dev-server",
       "defaultConfiguration": "development",
       "options": {
         "buildTarget": "web:build",
@@ -63,14 +63,14 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/web/**/*.{ts,tsx,js,jsx}"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/web/jest.config.ts",

apps/web/src/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

apps/web/tsconfig.app.json

@@ -4,10 +4,7 @@
     "outDir": "../../dist/out-tsc",
     "types": ["node"]
   },
-  "files": [
-    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nrwl/react/typings/image.d.ts"
-  ],
+  "files": ["../../node_modules/@nx/react/typings/cssmodule.d.ts", "../../node_modules/@nx/react/typings/image.d.ts"],
   "exclude": [
     "jest.config.ts",
     "**/*.spec.ts",

apps/web/tsconfig.spec.json

@@ -17,8 +17,5 @@
     "**/*.spec.jsx",
     "**/*.d.ts"
   ],
-  "files": [
-    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nrwl/react/typings/image.d.ts"
-  ]
+  "files": ["../../node_modules/@nx/react/typings/cssmodule.d.ts", "../../node_modules/@nx/react/typings/image.d.ts"]
 }

jest.config.ts

@@ -1,4 +1,4 @@
-const { getJestProjects } = require('@nrwl/jest')
+const { getJestProjects } = require('@nx/jest')
 
 module.exports = {
   projects: getJestProjects(),

jest.preset.js

@@ -1,3 +1,3 @@
-const nxPreset = require('@nrwl/jest/preset').default
+const nxPreset = require('@nx/jest/preset').default
 
 module.exports = { ...nxPreset }

libs/api/account/data-access/.babelrc

@@ -1,3 +1,3 @@
 {
-  "presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
+  "presets": [["@nx/web/babel", { "useBuiltIns": "usage" }]]
 }