build: add support for and upgrade to Nx 18 (#888)

analogjs · Feb 11, 2024 · 180f358 · 180f358
1 parent ed807c4
commit 180f358
Show file tree

Hide file tree

Showing 44 changed files with 812 additions and 1,912 deletions.
diff --git a/apps/analog-app-e2e-cypress/project.json b/apps/analog-app-e2e-cypress/project.json
@@ -20,10 +20,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/analog-app-e2e-cypress/**/*.{js,ts}"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/apps/analog-app-e2e-playwright/project.json b/apps/analog-app-e2e-playwright/project.json
@@ -16,10 +16,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/analog-app-e2e-playwright/**/*.{js,ts}"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/apps/analog-app-e2e-playwright/vite.config.ts b/apps/analog-app-e2e-playwright/vite.config.ts
@@ -6,8 +6,9 @@ import { offsetFromRoot } from '@nx/devkit';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
-    root: 'tests',
+    root: __dirname,
     test: {
+      reporters: ['default'],
       globals: true,
       environment: 'node',
       include: ['**/*.spec.ts'],

diff --git a/apps/analog-app/project.json b/apps/analog-app/project.json
@@ -60,13 +60,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": [
-          "apps/analog-app/**/*.ts",
-          "apps/analog-app/**/*.html"
-        ]
-      }
+      "executor": "@nx/eslint:lint"
     },
     "tests": {
       "executor": "@nx/vite:test",

diff --git a/apps/analog-app/vite.config.ts b/apps/analog-app/vite.config.ts
@@ -20,8 +20,12 @@ if (process.env['NETLIFY'] === 'true') {
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
+    root: __dirname,
     publicDir: 'src/public',
     build: {
+      outDir: '../../dist/apps/analog-app/client',
+      reportCompressedSize: true,
+      commonjsOptions: { transformMixedEsModules: true },
       target: ['es2020'],
     },
     optimizeDeps: {
@@ -45,6 +49,11 @@ export default defineConfig(({ mode }) => {
       splitVendorChunkPlugin(),
     ],
     test: {
+      reporters: ['default'],
+      coverage: {
+        reportsDirectory: '../../coverage/apps/analog-app',
+        provider: 'v8',
+      },
       globals: true,
       environment: 'jsdom',
       setupFiles: ['src/test-setup.ts'],

diff --git a/apps/analog-preset-e2e/vite.config.ts b/apps/analog-preset-e2e/vite.config.ts
@@ -6,8 +6,9 @@ import { offsetFromRoot } from '@nx/devkit';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
-    root: 'tests',
+    root: __dirname,
     test: {
+      reporters: ['default'],
       globals: true,
       environment: 'node',
       include: ['**/*.spec.ts'],

diff --git a/apps/astro-app-e2e-playwright/project.json b/apps/astro-app-e2e-playwright/project.json
@@ -16,10 +16,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/astro-app-e2e-playwright/**/*.{js,ts}"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/apps/astro-app-e2e-playwright/vite.config.ts b/apps/astro-app-e2e-playwright/vite.config.ts
@@ -6,7 +6,9 @@ import { defineConfig } from 'vite';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
+    root: __dirname,
     test: {
+      reporters: ['default'],
       globals: true,
       environment: 'node',
       include: ['**/*.spec.ts'],

diff --git a/apps/blog-app-e2e-cypress/project.json b/apps/blog-app-e2e-cypress/project.json
@@ -19,10 +19,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/blog-app-e2e-cypress/**/*.{js,ts}"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/apps/blog-app/vite.config.ts b/apps/blog-app/vite.config.ts
@@ -6,11 +6,15 @@ import { defineConfig } from 'vite';
 // https://vitejs.dev/config/
 export default defineConfig(() => {
   return {
+    root: __dirname,
     publicDir: 'src/assets',
     optimizeDeps: {
       include: ['@angular/common'],
     },
     build: {
+      outDir: '../../dist/apps/blog-app/client',
+      reportCompressedSize: true,
+      commonjsOptions: { transformMixedEsModules: true },
       target: ['es2020'],
     },
     plugins: [

diff --git a/apps/create-analog-e2e/vite.config.ts b/apps/create-analog-e2e/vite.config.ts
@@ -6,8 +6,9 @@ import { offsetFromRoot } from '@nx/devkit';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
-    root: 'tests',
+    root: __dirname,
     test: {
+      reporters: ['default'],
       globals: true,
       environment: 'node',
       include: ['**/*.spec.ts'],

diff --git a/apps/ng-app/project.json b/apps/ng-app/project.json
@@ -54,10 +54,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/ng-app/**/*.ts", "apps/ng-app/**/*.html"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   }
 }
diff --git a/apps/ng-app/vite.config.ts b/apps/ng-app/vite.config.ts
@@ -5,8 +5,12 @@ import analog from '@analogjs/platform';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => ({
+  root: __dirname,
   publicDir: 'src/assets',
   build: {
+    outDir: '../../dist/apps/ng-app/client',
+    reportCompressedSize: true,
+    commonjsOptions: { transformMixedEsModules: true },
     target: ['es2020'],
   },
   resolve: {
@@ -23,6 +27,10 @@ export default defineConfig(({ mode }) => ({
     }),
   ],
   test: {
+    coverage: {
+      reportsDirectory: '../../coverage/apps/ng-app',
+      provider: 'v8',
+    },
     globals: true,
     environment: 'jsdom',
     setupFiles: ['src/test.ts'],

diff --git a/apps/nx-plugin-e2e/vite.config.ts b/apps/nx-plugin-e2e/vite.config.ts
@@ -1,20 +1,18 @@
 /// <reference types="vitest" />
 
 import { defineConfig } from 'vite';
-import { offsetFromRoot } from '@nx/devkit';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
-    root: 'tests',
+    root: __dirname,
     test: {
+      reporters: ['default'],
       globals: true,
       environment: 'node',
       include: ['**/*.spec.ts'],
       cache: {
-        dir: `${offsetFromRoot(
-          'apps/nx-plugin-e2e'
-        )}/node_modules/.vitest/nx-plugin-e2e`,
+        dir: `../../node_modules/.vitest/nx-plugin-e2e`,
       },
     },
     define: {

diff --git a/apps/trpc-app-e2e-playwright/project.json b/apps/trpc-app-e2e-playwright/project.json
@@ -16,10 +16,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/trpc-app-e2e-playwright/**/*.{js,ts}"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/apps/trpc-app-e2e-playwright/vite.config.ts b/apps/trpc-app-e2e-playwright/vite.config.ts
@@ -8,6 +8,7 @@ export default defineConfig(({ mode }) => {
   return {
     root: 'tests',
     test: {
+      reporters: ['default'],
       globals: true,
       environment: 'node',
       include: ['**/*.spec.ts'],

diff --git a/apps/trpc-app/project.json b/apps/trpc-app/project.json
@@ -61,10 +61,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/trpc-app/**/*.ts", "apps/trpc-app/**/*.html"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "tests": {
       "executor": "@nx/vite:test",

diff --git a/apps/trpc-app/vite.config.ts b/apps/trpc-app/vite.config.ts
@@ -8,6 +8,7 @@ import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
+    root: __dirname,
     publicDir: 'src/public',
     optimizeDeps: {
       include: ['@angular/common', '@angular/forms', 'isomorphic-fetch'],
@@ -16,6 +17,9 @@ export default defineConfig(({ mode }) => {
       noExternal: ['@analogjs/trpc', '@trpc/server'],
     },
     build: {
+      outDir: '../../dist/apps/trpc-app/client',
+      reportCompressedSize: true,
+      commonjsOptions: { transformMixedEsModules: true },
       target: ['es2020'],
     },
     plugins: [
@@ -33,6 +37,11 @@ export default defineConfig(({ mode }) => {
       splitVendorChunkPlugin(),
     ],
     test: {
+      reporters: ['default'],
+      coverage: {
+        reportsDirectory: '../../coverage/apps/trpc-app',
+        provider: 'v8',
+      },
       globals: true,
       environment: 'jsdom',
       setupFiles: ['src/test-setup.ts'],

diff --git a/libs/card/project.json b/libs/card/project.json
@@ -11,10 +11,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/card/**/*.ts", "libs/card/**/*.html"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "implicitDependencies": ["vite-plugin-angular"]

diff --git a/libs/card/vite.config.ts b/libs/card/vite.config.ts
@@ -6,8 +6,10 @@ import angular from '@analogjs/vite-plugin-angular';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
+    root: __dirname,
     plugins: [angular()],
     test: {
+      reporters: ['default'],
       globals: true,
       environment: 'jsdom',
       setupFiles: ['src/test-setup.ts'],

diff --git a/libs/top-bar/project.json b/libs/top-bar/project.json
@@ -10,10 +10,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/top-bar/**/*.ts", "libs/top-bar/**/*.html"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": []

diff --git a/libs/top-bar/vite.config.ts b/libs/top-bar/vite.config.ts
@@ -7,9 +7,10 @@ import angular from '@analogjs/vite-plugin-angular';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
-    root: 'src',
+    root: __dirname,
     plugins: [angular()],
     test: {
+      reporters: ['default'],
       globals: true,
       environment: 'jsdom',
       setupFiles: ['src/test-setup.ts'],

diff --git a/nx.json b/nx.json
@@ -33,14 +33,11 @@
     "serve": {
       "dependsOn": ["^build"]
     },
-    "cypress": {
-      "inputs": ["default", "^production"]
-    },
-    "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+    "build-package": {
       "cache": true
     },
-    "build-package": {
+    "@nx/eslint:lint": {
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
       "cache": true
     }
   },