@nx/vite 19.0.0-beta.7 → 19.0.0-beta.9

package/migrations.json

@@ -1,23 +1,5 @@
 {
   "generators": {
-    "update-vite-tsconfig-paths": {
-      "cli": "nx",
-      "version": "15.3.1-beta.0",
-      "description": "Remove projects property from vite-tsconfig-paths plugin in vite.config.ts files.",
-      "factory": "./src/migrations/update-15-3-1/update-vite-tsconfig-paths"
-    },
-    "set-mode-in-configurations": {
-      "cli": "nx",
-      "version": "15.3.4-beta.0",
-      "description": "Set the mode in configurations to match the configurationName.",
-      "factory": "./src/migrations/update-15-3-4/set-mode-in-configuration"
-    },
-    "update-test-path-placeholder-vars": {
-      "cli": "nx",
-      "version": "15.4.3-beta.0",
-      "description": "Update @nrwl/vite:test reportsDirectory and outputs properties to point to correct paths.",
-      "factory": "./src/migrations/update-15-4-3/update-report-directory"
-    },
     "update-16-0-0-add-nx-packages": {
       "cli": "nx",
       "version": "16.0.0-beta.1",
@@ -202,52 +184,6 @@
           "alwaysAddToPackageJson": false
         }
       }
-    },
-    "15.3.1-beta.0": {
-      "version": "15.3.1-beta.0",
-      "packages": {
-        "vite-tsconfig-paths": {
-          "version": "4.0.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "15.3.4-beta.0": {
-      "version": "15.3.4-beta.0",
-      "packages": {
-        "vite": {
-          "version": "^4.0.1",
-          "alwaysAddToPackageJson": false
-        },
-        "vite-tsconfig-paths": {
-          "version": "^4.0.2",
-          "alwaysAddToPackageJson": false
-        },
-        "vitest": {
-          "version": "^0.25.8",
-          "alwaysAddToPackageJson": false
-        },
-        "vite-plugin-dts": {
-          "version": "~1.7.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@vitejs/plugin-react": {
-          "version": "^3.0.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@vitest/coverage-c8": {
-          "version": "^0.25.8",
-          "alwaysAddToPackageJson": false
-        },
-        "@vitest/ui": {
-          "version": "^0.25.8",
-          "alwaysAddToPackageJson": false
-        },
-        "@vitest/coverage-istanbul": {
-          "version": "^0.25.8",
-          "alwaysAddToPackageJson": false
-        }
-      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "19.0.0-beta.7",
+  "version": "19.0.0-beta.9",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -29,13 +29,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.0.0-beta.7",
+    "@nx/devkit": "19.0.0-beta.9",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@swc/helpers": "~0.5.0",
     "enquirer": "~2.3.6",
-    "@nx/js": "19.0.0-beta.7",
+    "@nx/js": "19.0.0-beta.9",
     "tsconfig-paths": "^4.1.2",
-    "@nrwl/vite": "19.0.0-beta.7"
+    "@nrwl/vite": "19.0.0-beta.9"
   },
   "peerDependencies": {
     "vite": "^5.0.0",

package/src/migrations/update-15-3-1/update-vite-tsconfig-paths.d.ts

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

package/src/migrations/update-15-3-1/update-vite-tsconfig-paths.js

@@ -1,67 +0,0 @@
-"use strict";
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    removeProjectsFromViteTsConfigPaths: function() {
-        return removeProjectsFromViteTsConfigPaths;
-    },
-    default: function() {
-        return _default;
-    }
-});
-const _devkit = require("@nx/devkit");
-const _executoroptionsutils = require("@nx/devkit/src/generators/executor-options-utils");
-const _tsquery = require("@phenomnomnominal/tsquery");
-const _js = require("@nx/js");
-const _generatorutils = require("../../utils/generator-utils");
-const ts = require("typescript");
-async function removeProjectsFromViteTsConfigPaths(tree) {
-    findAllProjectsWithViteConfig(tree);
-    await (0, _devkit.formatFiles)(tree);
-}
-const _default = removeProjectsFromViteTsConfigPaths;
-function findAllProjectsWithViteConfig(tree) {
-    (0, _executoroptionsutils.forEachExecutorOptions)(tree, '@nrwl/vite:build', (options, project)=>{
-        const projectConfiguration = (0, _devkit.readProjectConfiguration)(tree, project);
-        const viteConfig = (0, _generatorutils.normalizeViteConfigFilePathWithTree)(tree, projectConfiguration.root, options == null ? void 0 : options['configFile']);
-        if (viteConfig) {
-            var _defineConfig_;
-            const appFileContent = tree.read(viteConfig, 'utf-8');
-            const file = _tsquery.tsquery.ast(appFileContent);
-            let newContents = appFileContent;
-            const defineConfig = _tsquery.tsquery.query(file, 'CallExpression:has(Identifier[name="defineConfig"])');
-            let startOfProjects, endOfProjects;
-            defineConfig == null ? void 0 : (_defineConfig_ = defineConfig[0]) == null ? void 0 : _defineConfig_.getChildren().forEach((defineConfigContentNode)=>{
-                // Make sure it's the one we are looking for
-                // We cannot assume that it's called tsConfigPaths
-                // So make sure it includes `projects` and `root`
-                if (defineConfigContentNode.getText().includes('projects') && defineConfigContentNode.getText().includes('root')) {
-                    (0, _js.findNodes)(defineConfigContentNode, [
-                        ts.SyntaxKind.PropertyAssignment
-                    ]).forEach((nodePA)=>{
-                        if (nodePA.getText().startsWith('projects')) {
-                            startOfProjects = nodePA.getStart();
-                            endOfProjects = nodePA.getEnd();
-                        }
-                    });
-                }
-            });
-            if (startOfProjects && endOfProjects) {
-                newContents = (0, _devkit.applyChangesToString)(newContents, [
-                    {
-                        type: _devkit.ChangeType.Delete,
-                        start: startOfProjects,
-                        length: endOfProjects - startOfProjects + 1
-                    }
-                ]);
-                tree.write(viteConfig, newContents);
-            }
-        }
-    });
-}
-
-//# sourceMappingURL=update-vite-tsconfig-paths.js.map

package/src/migrations/update-15-3-1/update-vite-tsconfig-paths.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-15-3-1/update-vite-tsconfig-paths.ts"],"sourcesContent":["import {\n  applyChangesToString,\n  ChangeType,\n  formatFiles,\n  readProjectConfiguration,\n  Tree,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport { findNodes } from '@nx/js';\nimport { normalizeViteConfigFilePathWithTree } from '../../utils/generator-utils';\nimport ts = require('typescript');\n\nexport async function removeProjectsFromViteTsConfigPaths(tree: Tree) {\n  findAllProjectsWithViteConfig(tree);\n  await formatFiles(tree);\n}\n\nexport default removeProjectsFromViteTsConfigPaths;\n\nfunction findAllProjectsWithViteConfig(tree: Tree): void {\n  forEachExecutorOptions(tree, '@nrwl/vite:build', (options, project) => {\n    const projectConfiguration = readProjectConfiguration(tree, project);\n    const viteConfig = normalizeViteConfigFilePathWithTree(\n      tree,\n      projectConfiguration.root,\n      options?.['configFile']\n    );\n    if (viteConfig) {\n      const appFileContent = tree.read(viteConfig, 'utf-8');\n      const file = tsquery.ast(appFileContent);\n      let newContents = appFileContent;\n      const defineConfig = tsquery.query(\n        file,\n        'CallExpression:has(Identifier[name=\"defineConfig\"])'\n      );\n      let startOfProjects, endOfProjects;\n\n      defineConfig?.[0]\n        ?.getChildren()\n        .forEach((defineConfigContentNode: any) => {\n          // Make sure it's the one we are looking for\n          // We cannot assume that it's called tsConfigPaths\n          // So make sure it includes `projects` and `root`\n          if (\n            defineConfigContentNode.getText().includes('projects') &&\n            defineConfigContentNode.getText().includes('root')\n          ) {\n            findNodes(defineConfigContentNode, [\n              ts.SyntaxKind.PropertyAssignment,\n            ]).forEach((nodePA) => {\n              if (nodePA.getText().startsWith('projects')) {\n                startOfProjects = nodePA.getStart();\n                endOfProjects = nodePA.getEnd();\n              }\n            });\n          }\n        });\n\n      if (startOfProjects && endOfProjects) {\n        newContents = applyChangesToString(newContents, [\n          {\n            type: ChangeType.Delete,\n            start: startOfProjects,\n            length: endOfProjects - startOfProjects + 1,\n          },\n        ]);\n        tree.write(viteConfig, newContents);\n      }\n    }\n  });\n}\n"],"names":["removeProjectsFromViteTsConfigPaths","ts","tree","findAllProjectsWithViteConfig","formatFiles","forEachExecutorOptions","options","project","projectConfiguration","readProjectConfiguration","viteConfig","normalizeViteConfigFilePathWithTree","root","defineConfig","appFileContent","read","file","tsquery","ast","newContents","query","startOfProjects","endOfProjects","getChildren","forEach","defineConfigContentNode","getText","includes","findNodes","SyntaxKind","PropertyAssignment","nodePA","startsWith","getStart","getEnd","applyChangesToString","type","ChangeType","Delete","start","length","write"],"mappings":";;;;;;;;IAasBA,mCAAmC;eAAnCA;;IAKtB,OAAmD;eAAnD;;;wBAZO;sCACgC;yBACf;oBACE;gCAC0B;AACpD,MAAOC,aAAa;AAEb,eAAeD,oCAAoCE,IAAU;IAClEC,8BAA8BD;IAC9B,MAAME,IAAAA,mBAAW,EAACF;AACpB;MAEA,WAAeF;AAEf,SAASG,8BAA8BD,IAAU;IAC/CG,IAAAA,4CAAsB,EAACH,MAAM,oBAAoB,CAACI,SAASC;QACzD,MAAMC,uBAAuBC,IAAAA,gCAAwB,EAACP,MAAMK;QAC5D,MAAMG,aAAaC,IAAAA,mDAAmC,EACpDT,MACAM,qBAAqBI,IAAI,EACzBN,2BAAAA,OAAS,CAAC,aAAa;QAEzB,IAAII,YAAY;gBAUdG;YATA,MAAMC,iBAAiBZ,KAAKa,IAAI,CAACL,YAAY;YAC7C,MAAMM,OAAOC,gBAAO,CAACC,GAAG,CAACJ;YACzB,IAAIK,cAAcL;YAClB,MAAMD,eAAeI,gBAAO,CAACG,KAAK,CAChCJ,MACA;YAEF,IAAIK,iBAAiBC;YAErBT,iCAAAA,iBAAAA,YAAc,CAAC,EAAE,qBAAjBA,eACIU,WAAW,GACZC,OAAO,CAAC,CAACC;gBACR,4CAA4C;gBAC5C,kDAAkD;gBAClD,iDAAiD;gBACjD,IACEA,wBAAwBC,OAAO,GAAGC,QAAQ,CAAC,eAC3CF,wBAAwBC,OAAO,GAAGC,QAAQ,CAAC,SAC3C;oBACAC,IAAAA,aAAS,EAACH,yBAAyB;wBACjCxB,GAAG4B,UAAU,CAACC,kBAAkB;qBACjC,EAAEN,OAAO,CAAC,CAACO;wBACV,IAAIA,OAAOL,OAAO,GAAGM,UAAU,CAAC,aAAa;4BAC3CX,kBAAkBU,OAAOE,QAAQ;4BACjCX,gBAAgBS,OAAOG,MAAM;wBAC/B;oBACF;gBACF;YACF;YAEF,IAAIb,mBAAmBC,eAAe;gBACpCH,cAAcgB,IAAAA,4BAAoB,EAAChB,aAAa;oBAC9C;wBACEiB,MAAMC,kBAAU,CAACC,MAAM;wBACvBC,OAAOlB;wBACPmB,QAAQlB,gBAAgBD,kBAAkB;oBAC5C;iBACD;gBACDnB,KAAKuC,KAAK,CAAC/B,YAAYS;YACzB;QACF;IACF;AACF"}

package/src/migrations/update-15-3-4/set-mode-in-configuration.d.ts

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

package/src/migrations/update-15-3-4/set-mode-in-configuration.js

@@ -1,37 +0,0 @@
-"use strict";
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    setModeInConfiguration: function() {
-        return setModeInConfiguration;
-    },
-    default: function() {
-        return _default;
-    }
-});
-const _extends = require("@swc/helpers/_/_extends");
-const _devkit = require("@nx/devkit");
-const _executoroptionsutils = require("@nx/devkit/src/generators/executor-options-utils");
-async function setModeInConfiguration(tree) {
-    forAllProjectsUsingViteAddMode(tree);
-    await (0, _devkit.formatFiles)(tree);
-}
-const _default = setModeInConfiguration;
-function forAllProjectsUsingViteAddMode(tree) {
-    (0, _executoroptionsutils.forEachExecutorOptions)(tree, '@nrwl/vite:build', (_options, projectName, targetName, configuration)=>{
-        var _projectConfiguration_targets_targetName_configurations_configuration;
-        if (!configuration) {
-            return;
-        }
-        const projectConfiguration = (0, _devkit.readProjectConfiguration)(tree, projectName);
-        var _mode;
-        (_mode = (_projectConfiguration_targets_targetName_configurations_configuration = projectConfiguration.targets[targetName].configurations[configuration]).mode) != null ? _mode : _projectConfiguration_targets_targetName_configurations_configuration.mode = configuration;
-        (0, _devkit.updateProjectConfiguration)(tree, projectName, _extends._({}, projectConfiguration));
-    });
-}
-
-//# sourceMappingURL=set-mode-in-configuration.js.map

package/src/migrations/update-15-3-4/set-mode-in-configuration.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-15-3-4/set-mode-in-configuration.ts"],"sourcesContent":["import {\n  formatFiles,\n  readProjectConfiguration,\n  Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\n\nexport async function setModeInConfiguration(tree: Tree) {\n  forAllProjectsUsingViteAddMode(tree);\n  await formatFiles(tree);\n}\n\nexport default setModeInConfiguration;\n\nfunction forAllProjectsUsingViteAddMode(tree: Tree): void {\n  forEachExecutorOptions(\n    tree,\n    '@nrwl/vite:build',\n    (_options, projectName, targetName, configuration) => {\n      if (!configuration) {\n        return;\n      }\n\n      const projectConfiguration = readProjectConfiguration(tree, projectName);\n      projectConfiguration.targets[targetName].configurations[\n        configuration\n      ].mode ??= configuration;\n\n      updateProjectConfiguration(tree, projectName, {\n        ...projectConfiguration,\n      });\n    }\n  );\n}\n"],"names":["setModeInConfiguration","tree","forAllProjectsUsingViteAddMode","formatFiles","forEachExecutorOptions","_options","projectName","targetName","configuration","projectConfiguration","readProjectConfiguration","targets","configurations","mode","updateProjectConfiguration"],"mappings":";;;;;;;;IAQsBA,sBAAsB;eAAtBA;;IAKtB,OAAsC;eAAtC;;;;wBARO;sCACgC;AAEhC,eAAeA,uBAAuBC,IAAU;IACrDC,+BAA+BD;IAC/B,MAAME,IAAAA,mBAAW,EAACF;AACpB;MAEA,WAAeD;AAEf,SAASE,+BAA+BD,IAAU;IAChDG,IAAAA,4CAAsB,EACpBH,MACA,oBACA,CAACI,UAAUC,aAAaC,YAAYC;YAMlCC;QALA,IAAI,CAACD,eAAe;YAClB;QACF;QAEA,MAAMC,uBAAuBC,IAAAA,gCAAwB,EAACT,MAAMK;;QAC5DG,UAAAA,wEAAAA,qBAAqBE,OAAO,CAACJ,WAAW,CAACK,cAAc,CACrDJ,cACD,EAACK,wBAFFJ,sEAEEI,OAASL;QAEXM,IAAAA,kCAA0B,EAACb,MAAMK,aAAa,eACzCG;IAEP;AAEJ"}

package/src/migrations/update-15-4-3/update-report-directory.d.ts

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

package/src/migrations/update-15-4-3/update-report-directory.js

@@ -1,39 +0,0 @@
-"use strict";
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    updateReportDirectoryPlaceholders: function() {
-        return updateReportDirectoryPlaceholders;
-    },
-    default: function() {
-        return _default;
-    }
-});
-const _devkit = require("@nx/devkit");
-const _executoroptionsutils = require("@nx/devkit/src/generators/executor-options-utils");
-function updateReportDirectoryPlaceholders(tree) {
-    const projects = (0, _devkit.getProjects)(tree);
-    (0, _executoroptionsutils.forEachExecutorOptions)(tree, '@nrwl/vite:test', (options, projectName, targetName, configName)=>{
-        const projectConfig = projects.get(projectName);
-        const coverageOutput = projectConfig.root === '.' ? projectName : projectConfig.root;
-        if (options.reportsDirectory) {
-            options.reportsDirectory = options.reportsDirectory.replace('{workspaceRoot}/', projectConfig.root === '.' ? '' : (0, _devkit.offsetFromRoot)(projectConfig.root)).replace('{projectRoot}', coverageOutput);
-            if (configName) {
-                projectConfig.targets[targetName].configurations[configName] = options;
-            } else {
-                projectConfig.targets[targetName].options = options;
-            }
-            if (projectConfig.targets[targetName].outputs) {
-                projectConfig.targets[targetName].outputs = projectConfig.targets[targetName].outputs.map((output)=>output.replace('{projectRoot}/coverage', `coverage/${coverageOutput}`));
-            }
-            (0, _devkit.updateProjectConfiguration)(tree, projectName, projectConfig);
-        }
-    });
-}
-const _default = updateReportDirectoryPlaceholders;
-
-//# sourceMappingURL=update-report-directory.js.map

package/src/migrations/update-15-4-3/update-report-directory.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-15-4-3/update-report-directory.ts"],"sourcesContent":["import {\n  getProjects,\n  offsetFromRoot,\n  Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { VitestExecutorOptions } from '../../executors/test/schema';\n\nexport function updateReportDirectoryPlaceholders(tree: Tree) {\n  const projects = getProjects(tree);\n  forEachExecutorOptions<VitestExecutorOptions>(\n    tree,\n    '@nrwl/vite:test',\n    (options, projectName, targetName, configName) => {\n      const projectConfig = projects.get(projectName);\n      const coverageOutput =\n        projectConfig.root === '.' ? projectName : projectConfig.root;\n\n      if (options.reportsDirectory) {\n        options.reportsDirectory = options.reportsDirectory\n          .replace(\n            '{workspaceRoot}/',\n            projectConfig.root === '.' ? '' : offsetFromRoot(projectConfig.root)\n          )\n          .replace('{projectRoot}', coverageOutput);\n        if (configName) {\n          projectConfig.targets[targetName].configurations[configName] =\n            options;\n        } else {\n          projectConfig.targets[targetName].options = options;\n        }\n        if (projectConfig.targets[targetName].outputs) {\n          projectConfig.targets[targetName].outputs = projectConfig.targets[\n            targetName\n          ].outputs.map((output) =>\n            output.replace(\n              '{projectRoot}/coverage',\n              `coverage/${coverageOutput}`\n            )\n          );\n        }\n        updateProjectConfiguration(tree, projectName, projectConfig);\n      }\n    }\n  );\n}\n\nexport default updateReportDirectoryPlaceholders;\n"],"names":["updateReportDirectoryPlaceholders","tree","projects","getProjects","forEachExecutorOptions","options","projectName","targetName","configName","projectConfig","get","coverageOutput","root","reportsDirectory","replace","offsetFromRoot","targets","configurations","outputs","map","output","updateProjectConfiguration"],"mappings":";;;;;;;;IASgBA,iCAAiC;eAAjCA;;IAuChB,OAAiD;eAAjD;;;wBA3CO;sCACgC;AAGhC,SAASA,kCAAkCC,IAAU;IAC1D,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EACpBH,MACA,mBACA,CAACI,SAASC,aAAaC,YAAYC;QACjC,MAAMC,gBAAgBP,SAASQ,GAAG,CAACJ;QACnC,MAAMK,iBACJF,cAAcG,IAAI,KAAK,MAAMN,cAAcG,cAAcG,IAAI;QAE/D,IAAIP,QAAQQ,gBAAgB,EAAE;YAC5BR,QAAQQ,gBAAgB,GAAGR,QAAQQ,gBAAgB,CAChDC,OAAO,CACN,oBACAL,cAAcG,IAAI,KAAK,MAAM,KAAKG,IAAAA,sBAAc,EAACN,cAAcG,IAAI,GAEpEE,OAAO,CAAC,iBAAiBH;YAC5B,IAAIH,YAAY;gBACdC,cAAcO,OAAO,CAACT,WAAW,CAACU,cAAc,CAACT,WAAW,GAC1DH;YACJ,OAAO;gBACLI,cAAcO,OAAO,CAACT,WAAW,CAACF,OAAO,GAAGA;YAC9C;YACA,IAAII,cAAcO,OAAO,CAACT,WAAW,CAACW,OAAO,EAAE;gBAC7CT,cAAcO,OAAO,CAACT,WAAW,CAACW,OAAO,GAAGT,cAAcO,OAAO,CAC/DT,WACD,CAACW,OAAO,CAACC,GAAG,CAAC,CAACC,SACbA,OAAON,OAAO,CACZ,0BACA,CAAC,SAAS,EAAEH,eAAe,CAAC;YAGlC;YACAU,IAAAA,kCAA0B,EAACpB,MAAMK,aAAaG;QAChD;IACF;AAEJ;MAEA,WAAeT"}