@nx/remix 19.0.2 → 19.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "19.0.2",
+  "version": "19.0.4",
   "description": "The Remix plugin for Nx contains executors and generators for managing Remix applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Jest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, routes, loaders, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -28,12 +28,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.0.2",
-    "@nx/js": "19.0.2",
-    "@nx/react": "19.0.2",
+    "@nx/devkit": "19.0.4",
+    "@nx/js": "19.0.4",
+    "@nx/react": "19.0.4",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/remix": "19.0.2"
+    "@nrwl/remix": "19.0.4"
   },
   "peerDependencies": {},
   "publishConfig": {

package/src/generators/application/__snapshots__/application.impl.spec.ts.snap

@@ -386,7 +386,7 @@ export default defineConfig({
     setupFiles: ['test-setup.ts'],
     globals: true,
     cache: {
-      dir: '../node_modules/.vitest',
+      dir: '../node_modules/.vitest/test',
     },
     environment: 'jsdom',
     include: ['./tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
@@ -899,7 +899,7 @@ export default defineConfig({
     setupFiles: ['test-setup.ts'],
     globals: true,
     cache: {
-      dir: '../../node_modules/.vitest',
+      dir: '../../node_modules/.vitest/apps/test',
     },
     environment: 'jsdom',
     include: ['./tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
@@ -1206,7 +1206,7 @@ import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 
 export default defineConfig({
   root: __dirname,
-  cacheDir: './node_modules/.vite/.',
+  cacheDir: './node_modules/.vite/test',
 
   plugins: [react(), nxViteTsPaths()],
 
@@ -1219,7 +1219,7 @@ export default defineConfig({
     setupFiles: ['test-setup.ts'],
     globals: true,
     cache: {
-      dir: './node_modules/.vitest',
+      dir: './node_modules/.vitest/test',
     },
     environment: 'jsdom',
     include: ['./tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],

package/src/generators/library/__snapshots__/library.impl.spec.ts.snap

@@ -42,7 +42,7 @@ export default defineConfig({
   test: {
     setupFiles: ['./src/test-setup.ts'],
     globals: true,
-    cache: { dir: '../node_modules/.vitest' },
+    cache: { dir: '../node_modules/.vitest/test' },
     environment: 'jsdom',
     include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
@@ -120,7 +120,7 @@ export default defineConfig({
   test: {
     setupFiles: ['./src/test-setup.ts'],
     globals: true,
-    cache: { dir: '../../node_modules/.vitest' },
+    cache: { dir: '../../node_modules/.vitest/libs/test' },
     environment: 'jsdom',
     include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],

package/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap

@@ -1,6 +1,25 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework jest 1`] = `
+"/// <reference types="vitest" />
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import viteTsConfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+  cacheDir: '../../node_modules/.vite/storybook/libs/storybook-test',
+
+  plugins: [
+    react(),
+    viteTsConfigPaths({
+      root: '../../../',
+    }),
+  ],
+});
+"
+`;
+
+exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework jest 2`] = `
 "import type { StorybookConfig } from '@storybook/react-vite';
 
 const config: StorybookConfig = {
@@ -25,6 +44,25 @@ export default config;
 `;
 
 exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework none 1`] = `
+"/// <reference types="vitest" />
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import viteTsConfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+  cacheDir: '../../node_modules/.vite/storybook/libs/storybook-test',
+
+  plugins: [
+    react(),
+    viteTsConfigPaths({
+      root: '../../../',
+    }),
+  ],
+});
+"
+`;
+
+exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework none 2`] = `
 "import type { StorybookConfig } from '@storybook/react-vite';
 
 const config: StorybookConfig = {
@@ -49,6 +87,38 @@ export default config;
 `;
 
 exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework vitest 1`] = `
+"import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: '../../node_modules/.vite/libs/storybook-test',
+
+  plugins: [react(), nxViteTsPaths()],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+
+  test: {
+    setupFiles: ['./src/test-setup.ts'],
+    globals: true,
+    cache: { dir: '../../node_modules/.vitest/libs/storybook-test' },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../../coverage/libs/storybook-test',
+      provider: 'v8',
+    },
+  },
+});
+"
+`;
+
+exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework vitest 2`] = `
 "import type { StorybookConfig } from '@storybook/react-vite';
 
 const config: StorybookConfig = {

package/src/generators/storybook-configuration/files/vite.config.ts__tpl__

@@ -4,7 +4,7 @@ import react from '@vitejs/plugin-react';
 import viteTsConfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
-  cacheDir: '../../../node_modules/.vite/storybook-generator-test',
+  cacheDir: '<%= cacheDir %>',
 
   plugins: [
     react(),

package/src/generators/storybook-configuration/storybook-configuration.impl.js

@@ -11,6 +11,10 @@ function remixStorybookConfiguration(tree, schema) {
     });
 }
 exports.remixStorybookConfiguration = remixStorybookConfiguration;
+function normalizedJoinPaths(...paths) {
+    const path = (0, devkit_1.joinPathFragments)(...paths);
+    return path.startsWith('.') ? path : `./${path}`;
+}
 async function remixStorybookConfigurationInternal(tree, schema) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -18,7 +22,8 @@ async function remixStorybookConfigurationInternal(tree, schema) {
     schema.addPlugin ??= addPluginDefault;
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     if (!tree.exists((0, devkit_1.joinPathFragments)(root, 'vite.config.ts'))) {
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), root, { tpl: '' });
+        const cacheDir = normalizedJoinPaths((0, devkit_1.offsetFromRoot)(root), 'node_modules', '.vite', 'storybook', root === '.' ? schema.project : root);
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), root, { cacheDir, tpl: '' });
     }
     const task = await (0, react_1.storybookConfigurationGenerator)(tree, schema);
     return task;