@nx/vite 23.0.0-beta.24 → 23.0.0-beta.25

package/migrations.json

@@ -1,41 +1,5 @@
 {
   "generators": {
-    "update-20-0-4": {
-      "version": "20.0.4-beta.0",
-      "description": "Add gitignore entry for temporary vite config files.",
-      "implementation": "./dist/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore",
-      "documentation": "./dist/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.md"
-    },
-    "update-20-0-6": {
-      "version": "20.0.6-beta.0",
-      "description": "Add gitignore entry for temporary vite config files and remove previous incorrect glob.",
-      "implementation": "./dist/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore",
-      "documentation": "./dist/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.md"
-    },
-    "update-20-5-0-install-jiti": {
-      "version": "20.5.0-beta.2",
-      "requires": {
-        "vite": ">=6.0.0"
-      },
-      "description": "Install jiti as a devDependency to allow vite to parse TS postcss files.",
-      "implementation": "./dist/src/migrations/update-20-5-0/install-jiti",
-      "documentation": "./dist/src/migrations/update-20-5-0/install-jiti.md"
-    },
-    "update-20-5-0-update-resolve-conditions": {
-      "version": "20.5.0-beta.3",
-      "requires": {
-        "vite": ">=6.0.0"
-      },
-      "description": "Update resolve.conditions to include defaults that are no longer provided by Vite.",
-      "implementation": "./dist/src/migrations/update-20-5-0/update-resolve-conditions",
-      "documentation": "./dist/src/migrations/update-20-5-0/update-resolve-conditions.md"
-    },
-    "eslint-ignore-vite-temp-files": {
-      "version": "20.5.0-beta.3",
-      "description": "Add vite config temporary files to the ESLint configuration ignore patterns if ESLint is used.",
-      "implementation": "./dist/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files",
-      "documentation": "./dist/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.md"
-    },
     "update-22-2-0": {
       "version": "22.2.0-beta.1",
       "requires": {
@@ -98,43 +62,6 @@
     }
   },
   "packageJsonUpdates": {
-    "20.7.1": {
-      "version": "20.7.1-beta.0",
-      "packages": {
-        "@analogjs/vite-plugin-angular": {
-          "version": "~1.14.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@analogjs/vitest-angular": {
-          "version": "~1.14.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "20.5.0": {
-      "version": "20.5.0-beta.3",
-      "requires": {
-        "vite": ">=5.0.0 <6.0.0"
-      },
-      "packages": {
-        "vite": {
-          "version": "^6.0.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "20.5.0-vite-plugin-dts": {
-      "version": "20.5.0-beta.3",
-      "requires": {
-        "vite-plugin-dts": ">=3.0.0 <4.0.0"
-      },
-      "packages": {
-        "vite-plugin-dts": {
-          "version": "~4.5.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "21.1.2": {
       "version": "21.1.2-beta.0",
       "packages": {

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@nx/vite",
-  "version": "23.0.0-beta.24",
+  "version": "23.0.0-beta.25",
   "private": false,
   "type": "commonjs",
   "files": [
     "dist",
     "!dist/tsconfig.tsbuildinfo",
-    "!dist/spec",
     "migrations.json",
     "executors.json",
     "generators.json"
@@ -91,7 +90,8 @@
   "executors": "./executors.json",
   "ng-update": {
     "requirements": {},
-    "migrations": "./migrations.json"
+    "migrations": "./migrations.json",
+    "supportsOptionalUpdates": true
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~6.2.0",
@@ -101,13 +101,13 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "ajv": "^8.0.0",
-    "@nx/devkit": "23.0.0-beta.24",
-    "@nx/js": "23.0.0-beta.24",
-    "@nx/vitest": "23.0.0-beta.24"
+    "@nx/devkit": "23.0.0-beta.25",
+    "@nx/js": "23.0.0-beta.25",
+    "@nx/vitest": "23.0.0-beta.25"
   },
   "devDependencies": {
-    "@nx/eslint": "23.0.0-beta.24",
-    "nx": "23.0.0-beta.24"
+    "@nx/eslint": "23.0.0-beta.25",
+    "nx": "23.0.0-beta.25"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"

package/dist/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function addViteTempFilesToGitIgnore(tree: Tree): void;

package/dist/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = addViteTempFilesToGitIgnore;
-const ignore_vite_temp_files_1 = require("../../utils/ignore-vite-temp-files");
-function addViteTempFilesToGitIgnore(tree) {
-    // need to check if .gitignore exists before adding to it
-    // then need to check if it contains the following pattern
-    // **/vite.config.{js,ts,mjs,mts,cjs,cts}.timestamp*
-    // if it does, remove just this pattern
-    if (tree.exists('.gitignore')) {
-        const gitIgnoreContents = tree.read('.gitignore', 'utf-8');
-        if (gitIgnoreContents.includes('**/vite.config.{js,ts,mjs,mts,cjs,cts}.timestamp*')) {
-            tree.write('.gitignore', gitIgnoreContents.replace('**/vite.config.{js,ts,mjs,mts,cjs,cts}.timestamp*', ''));
-        }
-    }
-    (0, ignore_vite_temp_files_1.addViteTempFilesToGitIgnore)(tree);
-}

package/dist/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.md

@@ -1,12 +0,0 @@
-#### Add Vite Temp Files to Git Ignore
-
-Add gitignore entry for temporary vite config files.
-
-#### Sample Code Changes
-
-Adds the following entries to the `.gitignore` file.
-
-```text title=".gitignore"
-vite.config.*.timestamp*
-vitest.config.*.timestamp*
-```

package/dist/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.d.ts

@@ -1,2 +0,0 @@
-import { type Tree } from '@nx/devkit';
-export default function (tree: Tree): Promise<void>;

package/dist/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-const ignore_vite_temp_files_1 = require("../../utils/ignore-vite-temp-files");
-const versions_1 = require("../../utils/versions");
-async function default_1(tree) {
-    if (!(0, ignore_vite_temp_files_1.isEslintInstalled)(tree)) {
-        return;
-    }
-    (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
-    // CommonJS `require` instead of dynamic ESM `import` — `ensurePackage`
-    // exposes the temp install via `Module._initPaths`, which ESM ignores.
-    const { addIgnoresToLintConfig, isEslintConfigSupported, useFlatConfig, } = require('@nx/eslint/internal');
-    if (!isEslintConfigSupported(tree)) {
-        return;
-    }
-    const isUsingFlatConfig = useFlatConfig(tree);
-    if (isUsingFlatConfig) {
-        // using flat config, so we update the root eslint config
-        addIgnoresToLintConfig(tree, '', [
-            '**/vite.config.*.timestamp*',
-            '**/vitest.config.*.timestamp*',
-        ]);
-    }
-    else {
-        // not using flat config, so we update each project's eslint config
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [, { root: projectRoot }] of projects) {
-            const viteConfigFiles = await (0, devkit_1.globAsync)(tree, [
-                `${projectRoot}/**/{vite,vitest}.config.{js,ts,mjs,mts,cjs,cts}`,
-            ]);
-            if (!viteConfigFiles.length) {
-                // the project doesn't use vite or vitest, so we skip it
-                continue;
-            }
-            addIgnoresToLintConfig(tree, projectRoot, [
-                '**/vite.config.*.timestamp*',
-                '**/vitest.config.*.timestamp*',
-            ]);
-        }
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}

package/dist/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.md

@@ -1,45 +0,0 @@
-#### Sample Code Changes
-
-Add `vite.config.*.timestamp*` and `vitest.config.*.timestamp*` to the root `eslint.config.mjs` file (using **ESLint Flat Config**).
-
-##### Before
-
-```js title="eslint.config.mjs"
-export default [
-  {
-    ignores: ['dist'],
-  },
-];
-```
-
-##### After
-
-```js title="eslint.config.mjs" {3}
-export default [
-  {
-    ignores: ['dist', 'vite.config.*.timestamp*', 'vitest.config.*.timestamp*'],
-  },
-];
-```
-
-Add `vite.config.*.timestamp*` and `vitest.config.*.timestamp*` to the project's `.eslintrc.json` file (using **eslintrc** format config).
-
-##### Before
-
-```json title="apps/app1/eslintrc.json"
-{
-  "ignorePatterns": ["!**/*"]
-}
-```
-
-##### After
-
-```json title="apps/app1/eslintrc.json" {4-5}
-{
-  "ignorePatterns": [
-    "!**/*",
-    "vite.config.*.timestamp*",
-    "vitest.config.*.timestamp*"
-  ]
-}
-```

package/dist/src/migrations/update-20-5-0/install-jiti.d.ts

@@ -1,2 +0,0 @@
-import { type Tree } from '@nx/devkit';
-export default function installJiti(tree: Tree): Promise<import("@nx/devkit").GeneratorCallback>;

package/dist/src/migrations/update-20-5-0/install-jiti.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = installJiti;
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
-async function installJiti(tree) {
-    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        jiti: versions_1.jitiVersion,
-    });
-    return installTask;
-}

package/dist/src/migrations/update-20-5-0/install-jiti.md

@@ -1,6 +0,0 @@
-#### Installs the `jiti` package
-
-This migration ensures that the [`jiti`](https://github.com/unjs/jiti) package is installed.  
-This is a requirement for Vite to parse `postcss` configuration files that use TypeScript.
-
-Learn more: [https://vite.dev/guide/migration#postcss-load-config](https://vite.dev/guide/migration#postcss-load-config)

package/dist/src/migrations/update-20-5-0/update-resolve-conditions.d.ts

@@ -1,2 +0,0 @@
-import { type Tree } from '@nx/devkit';
-export default function (tree: Tree): Promise<void>;

package/dist/src/migrations/update-20-5-0/update-resolve-conditions.js

@@ -1,68 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-const picomatch = require("picomatch");
-const REMIX_IMPORT_SELECTOR = 'ImportDeclaration:has(StringLiteral[value=@remix-run/dev]),CallExpression:has(Identifier[name=require]) StringLiteral[value=@remix-run/dev]';
-const DEFINE_CONFIG_OBJECT_SELECTOR = `CallExpression:has(Identifier[name=defineConfig]) > ObjectLiteralExpression`;
-const RESOLVE_PROPERTY_SELECTOR = `PropertyAssignment:has(Identifier[name=resolve]) > ObjectLiteralExpression`;
-const CONDITIONS_PROPERTY_SELECTOR = `PropertyAssignment:has(Identifier[name=conditions]) > ArrayLiteralExpression`;
-const _conditions_array_values = [
-    'module',
-    'browser',
-    'development|production',
-];
-const _condition_obj = `conditions: ${JSON.stringify(_conditions_array_values)},`;
-const _resolve = `resolve: {
-  ${_condition_obj}
-},`;
-async function default_1(tree) {
-    const viteFiles = [];
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
-        if (picomatch('**/vite.*config*.{js,ts,mjs,mts,cjs,cts}')(filePath)) {
-            viteFiles.push(filePath);
-        }
-    });
-    for (const file of viteFiles) {
-        const contents = tree.read(file, 'utf-8');
-        const sourceFile = (0, tsquery_1.ast)(contents);
-        const remixImportNodes = (0, tsquery_1.query)(sourceFile, REMIX_IMPORT_SELECTOR);
-        if (remixImportNodes.length > 0) {
-            continue;
-        }
-        const defineConfigObjectNodes = (0, tsquery_1.query)(sourceFile, DEFINE_CONFIG_OBJECT_SELECTOR);
-        if (defineConfigObjectNodes.length === 0) {
-            console.warn(`Could not migrate vite config at ${file}. No "defineConfig" object found. Apply "resolve.conditions: ['module', 'browser', 'development|production']" manually to your vite config.`);
-            continue;
-        }
-        let newContents = contents;
-        const defineConfigObjectNode = defineConfigObjectNodes[0];
-        const resolvePropertyNodes = (0, tsquery_1.query)(defineConfigObjectNode, RESOLVE_PROPERTY_SELECTOR);
-        if (resolvePropertyNodes.length === 0) {
-            // Do not add resolve property if it does not already exist
-            continue;
-        }
-        else {
-            const resolvePropertyNode = resolvePropertyNodes[0];
-            const conditionsPropertyNodes = (0, tsquery_1.query)(resolvePropertyNode, CONDITIONS_PROPERTY_SELECTOR);
-            if (conditionsPropertyNodes.length === 0) {
-                // do not add conditions property if it does not already exist
-                continue;
-            }
-            else {
-                const conditionPropertyNode = conditionsPropertyNodes[0];
-                const conditionsArrayValues = JSON.parse(conditionPropertyNode.getText().replace(/['`]/g, '"'));
-                const newConditionArrayValues = [
-                    ...new Set([...conditionsArrayValues, ..._conditions_array_values]),
-                ];
-                newContents =
-                    newContents.slice(0, conditionPropertyNode.getStart()) +
-                        `${JSON.stringify(newConditionArrayValues)}` +
-                        newContents.slice(conditionPropertyNode.getEnd());
-            }
-        }
-        tree.write(file, newContents);
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}

package/dist/src/migrations/update-20-5-0/update-resolve-conditions.md

@@ -1,42 +0,0 @@
-#### Update `resolve.conditions` to include defaults
-
-In previous Vite versions, the `resolve.conditions` option had defaults that were added internally (i.e. `['module', 'browser', 'development|production']`).  
-This default was removed in Vite 6, so this migration adds it to your existing configuration to ensure that the behavior remains intact.
-
-Learn more: [https://vite.dev/guide/migration#default-value-for-resolve-conditions](https://vite.dev/guide/migration#default-value-for-resolve-conditions)
-
-:::note[Remix]
-Remix does not currently support Vite 6 and therefore any `vite.config` file for Remix will not be migrated.
-:::
-
-#### Sample Code Changes
-
-##### Before
-
-```typescript title="vite.config.ts"
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  resolve: {
-    conditions: ['require'],
-  },
-  build: {
-    outDir: 'dist',
-  },
-});
-```
-
-##### After
-
-```typescript title="vite.config.ts" {4-6}
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  resolve: {
-    conditions: ['require', 'module', 'browser', 'development|production'],
-  },
-  build: {
-    outDir: 'dist',
-  },
-});
-```