@nx/remix 22.1.0 → 22.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "22.1.0",
+  "version": "22.1.1",
   "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",
@@ -29,16 +29,16 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.1.0",
-    "@nx/js": "22.1.0",
-    "@nx/react": "22.1.0",
-    "@nx/workspace": "22.1.0",
+    "@nx/devkit": "22.1.1",
+    "@nx/js": "22.1.1",
+    "@nx/react": "22.1.1",
+    "@nx/workspace": "22.1.1",
     "tslib": "^2.3.0",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "devDependencies": {
-    "nx": "22.1.0",
-    "@nx/vitest": "22.1.0"
+    "nx": "22.1.1",
+    "@nx/vitest": "22.1.1"
   },
   "peerDependencies": {
     "@remix-run/dev": "^2.14.0"

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

@@ -253,7 +253,7 @@ import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
-  root: __dirname,
+  root: import.meta.dirname,
   cacheDir: '../node_modules/.vite/test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
   // Uncomment this if you are using workers.
@@ -299,7 +299,9 @@ exports[`Remix Application Integrated Repo --unitTestRunner should generate the
   },
   "include": [
     "vite.config.ts",
+    "vite.config.mts",
     "vitest.config.ts",
+    "vitest.config.mts",
     "app/**/*.ts",
     "app/**/*.tsx",
     "app/**/*.js",
@@ -457,7 +459,7 @@ import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
-  root: __dirname,
+  root: import.meta.dirname,
   cacheDir: './node_modules/.vite/test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
   // Uncomment this if you are using workers.
@@ -517,7 +519,9 @@ exports[`Remix Application Standalone Project Repo --unitTestRunner should gener
   },
   "include": [
     "vite.config.ts",
+    "vite.config.mts",
     "vitest.config.ts",
+    "vitest.config.mts",
     "app/**/*.ts",
     "app/**/*.tsx",
     "app/**/*.js",
@@ -641,7 +645,7 @@ declare module '@remix-run/node' {
 }
 
 export default defineConfig({
-  root: __dirname,
+  root: import.meta.dirname,
   plugins: [
     remix({
       future: {

package/src/generators/application/application.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA6BpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAQlD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BAOhC;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,sBAAsB,8BA8SjC;AAED,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"application.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA6BpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAQlD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BAOhC;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,sBAAsB,8BA+SjC;AAED,eAAe,yBAAyB,CAAC"}

package/src/generators/application/application.impl.js

@@ -119,6 +119,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
                 testEnvironment: 'jsdom',
                 imports: [`import react from '@vitejs/plugin-react';`],
                 plugins: [`react()`],
+                useEsmExtension: true,
             }, true, undefined, true);
             tasks.push(vitestTask);
         }

package/src/generators/application/files/common/{vite.config.ts__tmpl__ → vite.config.mts__tmpl__}

@@ -9,7 +9,7 @@ declare module '@remix-run/node' {
 }
 
 export default defineConfig({
-  root: __dirname,
+  root: import.meta.dirname,
   plugins: [
     remix({
       future: {

package/src/generators/application/lib/update-unit-test-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-unit-test-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/application/lib/update-unit-test-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAcpB,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,QAAQ,GAAG,MAAM,EACjC,WAAW,EAAE,OAAO,0CA0ErB"}
+{"version":3,"file":"update-unit-test-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/application/lib/update-unit-test-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAcpB,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,QAAQ,GAAG,MAAM,EACjC,WAAW,EAAE,OAAO,0CA4ErB"}

package/src/generators/application/lib/update-unit-test-config.js

@@ -11,7 +11,7 @@ function updateUnitTestConfig(tree, pathToRoot, unitTestRunner, rootProject) {
   import '@testing-library/jest-dom/matchers';
   installGlobals();`);
     if (unitTestRunner === 'vitest') {
-        const pathToViteConfig = (0, devkit_1.joinPathFragments)(pathToRoot, 'vitest.config.ts');
+        const pathToViteConfig = (0, devkit_1.joinPathFragments)(pathToRoot, 'vitest.config.mts');
         (0, testing_config_utils_1.updateVitestTestIncludes)(tree, pathToViteConfig, './app/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
         (0, testing_config_utils_1.updateVitestTestIncludes)(tree, pathToViteConfig, './tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
         (0, testing_config_utils_1.updateVitestTestSetup)(tree, pathToViteConfig, 'test-setup.ts');
@@ -28,7 +28,9 @@ function updateUnitTestConfig(tree, pathToRoot, unitTestRunner, rootProject) {
     (0, devkit_1.updateJson)(tree, pathToTsConfigSpec, (json) => {
         json.include = [
             'vite.config.ts',
+            'vite.config.mts',
             'vitest.config.ts',
+            'vitest.config.mts',
             'app/**/*.ts',
             'app/**/*.tsx',
             'app/**/*.js',

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

@@ -22,36 +22,7 @@ installGlobals();
 "
 `;
 
-exports[`Remix Library Generator --unitTestRunner should create the correct config files for testing with vitest 1`] = `
-"import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
-import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
-import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../node_modules/.vite/test',
-  plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
-  // Uncomment this if you are using workers.
-  // worker: {
-  //  plugins: [ nxViteTsPaths() ],
-  // },
-  test: {
-    setupFiles: ['./src/test-setup.ts'],
-    name: 'test',
-    watch: false,
-    globals: true,
-    environment: 'jsdom',
-    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: '../coverage/test',
-      provider: 'v8' as const,
-    },
-  },
-}));
-"
-`;
+exports[`Remix Library Generator --unitTestRunner should create the correct config files for testing with vitest 1`] = `null`;
 
 exports[`Remix Library Generator --unitTestRunner should create the correct config files for testing with vitest 2`] = `
 "import { installGlobals } from '@remix-run/node';

package/src/generators/library/lib/add-unit-testing.js

@@ -15,7 +15,7 @@ function addUnitTestingSetup(tree, options) {
     import "@testing-library/jest-dom/matchers";
   installGlobals();`);
     if (options.unitTestRunner === 'vitest') {
-        const pathToVitestConfig = (0, devkit_1.joinPathFragments)(options.projectRoot, `vite.config.ts`);
+        const pathToVitestConfig = (0, devkit_1.joinPathFragments)(options.projectRoot, `vite.config.mts`);
         (0, testing_config_utils_1.updateVitestTestSetup)(tree, pathToVitestConfig, './src/test-setup.ts');
     }
     else if (options.unitTestRunner === 'jest') {

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

@@ -86,36 +86,7 @@ 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';
-import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/libs/storybook-test',
-  plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
-  // Uncomment this if you are using workers.
-  // worker: {
-  //  plugins: [ nxViteTsPaths() ],
-  // },
-  test: {
-    setupFiles: ['./src/test-setup.ts'],
-    name: 'storybook-test',
-    watch: false,
-    globals: true,
-    environment: 'jsdom',
-    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: '../../coverage/libs/storybook-test',
-      provider: 'v8' as const,
-    },
-  },
-}));
-"
-`;
+exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework vitest 1`] = `null`;
 
 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';
@@ -127,7 +98,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'vite.config.ts',
+        viteConfigPath: 'vite.config.mts',
       },
     },
   },

package/src/generators/storybook-configuration/storybook-configuration.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storybook-configuration.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/storybook-configuration/storybook-configuration.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAG7D,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,4BAA4B,mDAMrC;AAQD,wBAA8B,mCAAmC,CAC/D,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,4BAA4B,mDAuBrC"}
+{"version":3,"file":"storybook-configuration.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/storybook-configuration/storybook-configuration.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAG7D,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,4BAA4B,mDAMrC;AAQD,wBAA8B,mCAAmC,CAC/D,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,4BAA4B,mDA0BrC"}

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

@@ -21,7 +21,8 @@ async function remixStorybookConfigurationInternal(tree, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-    if (!tree.exists((0, devkit_1.joinPathFragments)(root, 'vite.config.ts'))) {
+    if (!tree.exists((0, devkit_1.joinPathFragments)(root, 'vite.config.mts')) &&
+        !tree.exists((0, devkit_1.joinPathFragments)(root, 'vite.config.ts'))) {
         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: '' });
     }