@nx/vite 19.0.3 → 19.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "19.0.3",
+  "version": "19.1.0-beta.0",
   "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.3",
+    "@nx/devkit": "19.1.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@swc/helpers": "~0.5.0",
     "enquirer": "~2.3.6",
-    "@nx/js": "19.0.3",
+    "@nx/js": "19.1.0-beta.0",
     "tsconfig-paths": "^4.1.2",
-    "@nrwl/vite": "19.0.3"
+    "@nrwl/vite": "19.1.0-beta.0"
   },
   "peerDependencies": {
     "vite": "^5.0.0",

package/src/generators/init/init.js

@@ -61,7 +61,7 @@ async function initGeneratorInternal(tree, schema) {
     var _addPlugin;
     (_addPlugin = (_schema = schema).addPlugin) != null ? _addPlugin : _schema.addPlugin = addPluginDefault;
     if (schema.addPlugin) {
-        await (0, _addplugin.addPlugin)(tree, '@nx/vite/plugin', _plugin.createNodes, {
+        await (0, _addplugin.addPlugin)(tree, await (0, _devkit.createProjectGraphAsync)(), '@nx/vite/plugin', _plugin.createNodes, {
             buildTargetName: [
                 'build',
                 'vite:build',

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n  formatFiles,\n  GeneratorCallback,\n  readNxJson,\n  runTasksInSerial,\n  Tree,\n  updateNxJson,\n} from '@nx/devkit';\nimport { addPlugin } from '@nx/devkit/src/utils/add-plugin';\n\nimport { createNodes } from '../../plugins/plugin';\nimport { InitGeneratorSchema } from './schema';\nimport { checkDependenciesInstalled, moveToDevDependencies } from './lib/utils';\n\nexport function updateNxJsonSettings(tree: Tree) {\n  const nxJson = readNxJson(tree);\n\n  const productionFileSet = nxJson.namedInputs?.production;\n  if (productionFileSet) {\n    productionFileSet.push(\n      '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',\n      '!{projectRoot}/tsconfig.spec.json'\n    );\n\n    nxJson.namedInputs.production = Array.from(new Set(productionFileSet));\n  }\n\n  const hasPlugin = nxJson.plugins?.some((p) =>\n    typeof p === 'string'\n      ? p === '@nx/vite/plugin'\n      : p.plugin === '@nx/vite/plugin'\n  );\n\n  if (!hasPlugin) {\n    nxJson.targetDefaults ??= {};\n    nxJson.targetDefaults['@nx/vite:test'] ??= {};\n    nxJson.targetDefaults['@nx/vite:test'].cache ??= true;\n    nxJson.targetDefaults['@nx/vite:test'].inputs ??= [\n      'default',\n      productionFileSet ? '^production' : '^default',\n    ];\n  }\n\n  updateNxJson(tree, nxJson);\n}\n\nexport function initGenerator(tree: Tree, schema: InitGeneratorSchema) {\n  return initGeneratorInternal(tree, { addPlugin: false, ...schema });\n}\n\nexport async function initGeneratorInternal(\n  tree: Tree,\n  schema: InitGeneratorSchema\n) {\n  const nxJson = readNxJson(tree);\n  const addPluginDefault =\n    process.env.NX_ADD_PLUGINS !== 'false' &&\n    nxJson.useInferencePlugins !== false;\n  schema.addPlugin ??= addPluginDefault;\n\n  if (schema.addPlugin) {\n    await addPlugin(\n      tree,\n      '@nx/vite/plugin',\n      createNodes,\n      {\n        buildTargetName: ['build', 'vite:build', 'vite-build'],\n        testTargetName: ['test', 'vite:test', 'vite-test'],\n        serveTargetName: ['serve', 'vite:serve', 'vite-serve'],\n        previewTargetName: ['preview', 'vite:preview', 'vite-preview'],\n        serveStaticTargetName: [\n          'serve-static',\n          'vite:serve-static',\n          'vite-serve-static',\n        ],\n      },\n      schema.updatePackageScripts\n    );\n  }\n\n  updateNxJsonSettings(tree);\n\n  const tasks: GeneratorCallback[] = [];\n  if (!schema.skipPackageJson) {\n    tasks.push(moveToDevDependencies(tree));\n    tasks.push(checkDependenciesInstalled(tree, schema));\n  }\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return runTasksInSerial(...tasks);\n}\n\nexport default initGenerator;\n"],"names":["updateNxJsonSettings","initGenerator","initGeneratorInternal","tree","nxJson","readNxJson","productionFileSet","namedInputs","production","push","Array","from","Set","hasPlugin","plugins","some","p","plugin","targetDefaults","cache","inputs","updateNxJson","schema","addPlugin","addPluginDefault","process","env","NX_ADD_PLUGINS","useInferencePlugins","createNodes","buildTargetName","testTargetName","serveTargetName","previewTargetName","serveStaticTargetName","updatePackageScripts","tasks","skipPackageJson","moveToDevDependencies","checkDependenciesInstalled","skipFormat","formatFiles","runTasksInSerial"],"mappings":";;;;;;;;IAcgBA,oBAAoB;eAApBA;;IAgCAC,aAAa;eAAbA;;IAIMC,qBAAqB;eAArBA;;IA6CtB,OAA6B;eAA7B;;;;wBAxFO;2BACmB;wBAEE;uBAEsC;AAE3D,SAASF,qBAAqBG,IAAU;QAGnBC,qBAURA;IAZlB,MAAMA,SAASC,IAAAA,kBAAU,EAACF;IAE1B,MAAMG,qBAAoBF,sBAAAA,OAAOG,WAAW,qBAAlBH,oBAAoBI,UAAU;IACxD,IAAIF,mBAAmB;QACrBA,kBAAkBG,IAAI,CACpB,yDACA;QAGFL,OAAOG,WAAW,CAACC,UAAU,GAAGE,MAAMC,IAAI,CAAC,IAAIC,IAAIN;IACrD;IAEA,MAAMO,aAAYT,kBAAAA,OAAOU,OAAO,qBAAdV,gBAAgBW,IAAI,CAAC,CAACC,IACtC,OAAOA,MAAM,WACTA,MAAM,oBACNA,EAAEC,MAAM,KAAK;IAGnB,IAAI,CAACJ,WAAW;YACdT,SACAA,wBAAsB,aACtBA,mCACAA;;QAHAA,oBAAAA,UAAAA,QAAOc,4CAAPd,QAAOc,iBAAmB,CAAC;;QAC3Bd,MAAAA,yBAAAA,OAAOc,cAAc,CAAA,CAAC,cAAA,gBAAgB,gBAAtCd,sBAAqB,CAAC,YAAgB,GAAK,CAAC;;QAC5CA,WAAAA,oCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACC,0BAAvCf,kCAAuCe,QAAU;;QACjDf,YAAAA,qCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACE,4BAAvChB,mCAAuCgB,SAAW;YAChD;YACAd,oBAAoB,gBAAgB;SACrC;IACH;IAEAe,IAAAA,oBAAY,EAAClB,MAAMC;AACrB;AAEO,SAASH,cAAcE,IAAU,EAAEmB,MAA2B;IACnE,OAAOpB,sBAAsBC,MAAM;QAAEoB,WAAW;OAAUD;AAC5D;AAEO,eAAepB,sBACpBC,IAAU,EACVmB,MAA2B;QAM3BA;IAJA,MAAMlB,SAASC,IAAAA,kBAAU,EAACF;IAC1B,MAAMqB,mBACJC,QAAQC,GAAG,CAACC,cAAc,KAAK,WAC/BvB,OAAOwB,mBAAmB,KAAK;;IACjCN,eAAAA,UAAAA,QAAOC,kCAAPD,QAAOC,YAAcC;IAErB,IAAIF,OAAOC,SAAS,EAAE;QACpB,MAAMA,IAAAA,oBAAS,EACbpB,MACA,mBACA0B,mBAAW,EACX;YACEC,iBAAiB;gBAAC;gBAAS;gBAAc;aAAa;YACtDC,gBAAgB;gBAAC;gBAAQ;gBAAa;aAAY;YAClDC,iBAAiB;gBAAC;gBAAS;gBAAc;aAAa;YACtDC,mBAAmB;gBAAC;gBAAW;gBAAgB;aAAe;YAC9DC,uBAAuB;gBACrB;gBACA;gBACA;aACD;QACH,GACAZ,OAAOa,oBAAoB;IAE/B;IAEAnC,qBAAqBG;IAErB,MAAMiC,QAA6B,EAAE;IACrC,IAAI,CAACd,OAAOe,eAAe,EAAE;QAC3BD,MAAM3B,IAAI,CAAC6B,IAAAA,4BAAqB,EAACnC;QACjCiC,MAAM3B,IAAI,CAAC8B,IAAAA,iCAA0B,EAACpC,MAAMmB;IAC9C;IAEA,IAAI,CAACA,OAAOkB,UAAU,EAAE;QACtB,MAAMC,IAAAA,mBAAW,EAACtC;IACpB;IAEA,OAAOuC,IAAAA,wBAAgB,KAAIN;AAC7B;MAEA,WAAenC"}
+{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n  createProjectGraphAsync,\n  formatFiles,\n  GeneratorCallback,\n  readNxJson,\n  runTasksInSerial,\n  Tree,\n  updateNxJson,\n} from '@nx/devkit';\nimport { addPlugin } from '@nx/devkit/src/utils/add-plugin';\n\nimport { createNodes } from '../../plugins/plugin';\nimport { InitGeneratorSchema } from './schema';\nimport { checkDependenciesInstalled, moveToDevDependencies } from './lib/utils';\n\nexport function updateNxJsonSettings(tree: Tree) {\n  const nxJson = readNxJson(tree);\n\n  const productionFileSet = nxJson.namedInputs?.production;\n  if (productionFileSet) {\n    productionFileSet.push(\n      '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',\n      '!{projectRoot}/tsconfig.spec.json'\n    );\n\n    nxJson.namedInputs.production = Array.from(new Set(productionFileSet));\n  }\n\n  const hasPlugin = nxJson.plugins?.some((p) =>\n    typeof p === 'string'\n      ? p === '@nx/vite/plugin'\n      : p.plugin === '@nx/vite/plugin'\n  );\n\n  if (!hasPlugin) {\n    nxJson.targetDefaults ??= {};\n    nxJson.targetDefaults['@nx/vite:test'] ??= {};\n    nxJson.targetDefaults['@nx/vite:test'].cache ??= true;\n    nxJson.targetDefaults['@nx/vite:test'].inputs ??= [\n      'default',\n      productionFileSet ? '^production' : '^default',\n    ];\n  }\n\n  updateNxJson(tree, nxJson);\n}\n\nexport function initGenerator(tree: Tree, schema: InitGeneratorSchema) {\n  return initGeneratorInternal(tree, { addPlugin: false, ...schema });\n}\n\nexport async function initGeneratorInternal(\n  tree: Tree,\n  schema: InitGeneratorSchema\n) {\n  const nxJson = readNxJson(tree);\n  const addPluginDefault =\n    process.env.NX_ADD_PLUGINS !== 'false' &&\n    nxJson.useInferencePlugins !== false;\n  schema.addPlugin ??= addPluginDefault;\n\n  if (schema.addPlugin) {\n    await addPlugin(\n      tree,\n      await createProjectGraphAsync(),\n      '@nx/vite/plugin',\n      createNodes,\n      {\n        buildTargetName: ['build', 'vite:build', 'vite-build'],\n        testTargetName: ['test', 'vite:test', 'vite-test'],\n        serveTargetName: ['serve', 'vite:serve', 'vite-serve'],\n        previewTargetName: ['preview', 'vite:preview', 'vite-preview'],\n        serveStaticTargetName: [\n          'serve-static',\n          'vite:serve-static',\n          'vite-serve-static',\n        ],\n      },\n      schema.updatePackageScripts\n    );\n  }\n\n  updateNxJsonSettings(tree);\n\n  const tasks: GeneratorCallback[] = [];\n  if (!schema.skipPackageJson) {\n    tasks.push(moveToDevDependencies(tree));\n    tasks.push(checkDependenciesInstalled(tree, schema));\n  }\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return runTasksInSerial(...tasks);\n}\n\nexport default initGenerator;\n"],"names":["updateNxJsonSettings","initGenerator","initGeneratorInternal","tree","nxJson","readNxJson","productionFileSet","namedInputs","production","push","Array","from","Set","hasPlugin","plugins","some","p","plugin","targetDefaults","cache","inputs","updateNxJson","schema","addPlugin","addPluginDefault","process","env","NX_ADD_PLUGINS","useInferencePlugins","createProjectGraphAsync","createNodes","buildTargetName","testTargetName","serveTargetName","previewTargetName","serveStaticTargetName","updatePackageScripts","tasks","skipPackageJson","moveToDevDependencies","checkDependenciesInstalled","skipFormat","formatFiles","runTasksInSerial"],"mappings":";;;;;;;;IAegBA,oBAAoB;eAApBA;;IAgCAC,aAAa;eAAbA;;IAIMC,qBAAqB;eAArBA;;IA8CtB,OAA6B;eAA7B;;;;wBAzFO;2BACmB;wBAEE;uBAEsC;AAE3D,SAASF,qBAAqBG,IAAU;QAGnBC,qBAURA;IAZlB,MAAMA,SAASC,IAAAA,kBAAU,EAACF;IAE1B,MAAMG,qBAAoBF,sBAAAA,OAAOG,WAAW,qBAAlBH,oBAAoBI,UAAU;IACxD,IAAIF,mBAAmB;QACrBA,kBAAkBG,IAAI,CACpB,yDACA;QAGFL,OAAOG,WAAW,CAACC,UAAU,GAAGE,MAAMC,IAAI,CAAC,IAAIC,IAAIN;IACrD;IAEA,MAAMO,aAAYT,kBAAAA,OAAOU,OAAO,qBAAdV,gBAAgBW,IAAI,CAAC,CAACC,IACtC,OAAOA,MAAM,WACTA,MAAM,oBACNA,EAAEC,MAAM,KAAK;IAGnB,IAAI,CAACJ,WAAW;YACdT,SACAA,wBAAsB,aACtBA,mCACAA;;QAHAA,oBAAAA,UAAAA,QAAOc,4CAAPd,QAAOc,iBAAmB,CAAC;;QAC3Bd,MAAAA,yBAAAA,OAAOc,cAAc,CAAA,CAAC,cAAA,gBAAgB,gBAAtCd,sBAAqB,CAAC,YAAgB,GAAK,CAAC;;QAC5CA,WAAAA,oCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACC,0BAAvCf,kCAAuCe,QAAU;;QACjDf,YAAAA,qCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACE,4BAAvChB,mCAAuCgB,SAAW;YAChD;YACAd,oBAAoB,gBAAgB;SACrC;IACH;IAEAe,IAAAA,oBAAY,EAAClB,MAAMC;AACrB;AAEO,SAASH,cAAcE,IAAU,EAAEmB,MAA2B;IACnE,OAAOpB,sBAAsBC,MAAM;QAAEoB,WAAW;OAAUD;AAC5D;AAEO,eAAepB,sBACpBC,IAAU,EACVmB,MAA2B;QAM3BA;IAJA,MAAMlB,SAASC,IAAAA,kBAAU,EAACF;IAC1B,MAAMqB,mBACJC,QAAQC,GAAG,CAACC,cAAc,KAAK,WAC/BvB,OAAOwB,mBAAmB,KAAK;;IACjCN,eAAAA,UAAAA,QAAOC,kCAAPD,QAAOC,YAAcC;IAErB,IAAIF,OAAOC,SAAS,EAAE;QACpB,MAAMA,IAAAA,oBAAS,EACbpB,MACA,MAAM0B,IAAAA,+BAAuB,KAC7B,mBACAC,mBAAW,EACX;YACEC,iBAAiB;gBAAC;gBAAS;gBAAc;aAAa;YACtDC,gBAAgB;gBAAC;gBAAQ;gBAAa;aAAY;YAClDC,iBAAiB;gBAAC;gBAAS;gBAAc;aAAa;YACtDC,mBAAmB;gBAAC;gBAAW;gBAAgB;aAAe;YAC9DC,uBAAuB;gBACrB;gBACA;gBACA;aACD;QACH,GACAb,OAAOc,oBAAoB;IAE/B;IAEApC,qBAAqBG;IAErB,MAAMkC,QAA6B,EAAE;IACrC,IAAI,CAACf,OAAOgB,eAAe,EAAE;QAC3BD,MAAM5B,IAAI,CAAC8B,IAAAA,4BAAqB,EAACpC;QACjCkC,MAAM5B,IAAI,CAAC+B,IAAAA,iCAA0B,EAACrC,MAAMmB;IAC9C;IAEA,IAAI,CAACA,OAAOmB,UAAU,EAAE;QACtB,MAAMC,IAAAA,mBAAW,EAACvC;IACpB;IAEA,OAAOwC,IAAAA,wBAAgB,KAAIN;AAC7B;MAEA,WAAepC"}

package/src/migrations/update-17-2-0/lib/vite-config-with-additional-js.fixture.d.ts

@@ -0,0 +1 @@
+export declare const viteConfigFixture = "/// <reference types=\"vitest\" />\nimport react from '@vitejs/plugin-react';\nimport dns from 'dns';\nimport { PluginOption, defineConfig } from 'vite';\nimport { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n\ndns.setDefaultResultOrder('verbatim');\nconst BASE_HREF = '/app';\n\n/**\n * Adds <base href=\"/app\">` to the head of the index.html\n * The reason why the `base` configuration property doesn't work is because it makes\n * all assets served under `/app` of `/` and this impacts the download zip service worker\n * We only want to the service worker to listen to events related to downloads, but not capture any other events\n * and the only way to do this is make sure all assets are served from the root, but we still want our app path to be `/app`\n *\n * This mimics the same behavior we had with webpack before migrating to vite\n */\nconst baseHrefPlugin: () => PluginOption = () => {\n  return {\n    name: 'html-transform',\n    transformIndexHtml(html) {\n      return html.replace('<head>', `<head>\\n    <base href=\"${BASE_HREF}\">`);\n    },\n  };\n};\n\nexport default defineConfig({\n  cacheDir: '../../node_modules/.vite/jetstream',\n  envPrefix: 'NX',\n\n  server: {\n    port: 4200,\n    host: 'localhost',\n  },\n\n  build: {\n    // Put all assets at the root of the app instead of under /assets\n    assetsDir: './',\n    sourcemap: true,\n    rollupOptions: {\n      output: {\n        sourcemap: true,\n      },\n    },\n  },\n\n  plugins: [\n    react({\n      jsxImportSource: '@emotion/react',\n      babel: {\n        plugins: ['@emotion/babel-plugin'],\n      },\n    }),\n    nxViteTsPaths(),\n    baseHrefPlugin(),\n  ],\n\n  worker: {\n    plugins: [\n      nxViteTsPaths(),\n    ],\n  },\n});";

package/src/migrations/update-17-2-0/lib/vite-config-with-additional-js.fixture.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "viteConfigFixture", {
+    enumerable: true,
+    get: function() {
+        return viteConfigFixture;
+    }
+});
+const viteConfigFixture = `/// <reference types="vitest" />
+import react from '@vitejs/plugin-react';
+import dns from 'dns';
+import { PluginOption, defineConfig } from 'vite';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+dns.setDefaultResultOrder('verbatim');
+const BASE_HREF = '/app';
+
+/**
+ * Adds <base href="/app">\` to the head of the index.html
+ * The reason why the \`base\` configuration property doesn't work is because it makes
+ * all assets served under \`/app\` of \`/\` and this impacts the download zip service worker
+ * We only want to the service worker to listen to events related to downloads, but not capture any other events
+ * and the only way to do this is make sure all assets are served from the root, but we still want our app path to be \`/app\`
+ *
+ * This mimics the same behavior we had with webpack before migrating to vite
+ */
+const baseHrefPlugin: () => PluginOption = () => {
+  return {
+    name: 'html-transform',
+    transformIndexHtml(html) {
+      return html.replace('<head>', \`<head>\\n    <base href="\${BASE_HREF}">\`);
+    },
+  };
+};
+
+export default defineConfig({
+  cacheDir: '../../node_modules/.vite/jetstream',
+  envPrefix: 'NX',
+
+  server: {
+    port: 4200,
+    host: 'localhost',
+  },
+
+  build: {
+    // Put all assets at the root of the app instead of under /assets
+    assetsDir: './',
+    sourcemap: true,
+    rollupOptions: {
+      output: {
+        sourcemap: true,
+      },
+    },
+  },
+
+  plugins: [
+    react({
+      jsxImportSource: '@emotion/react',
+      babel: {
+        plugins: ['@emotion/babel-plugin'],
+      },
+    }),
+    nxViteTsPaths(),
+    baseHrefPlugin(),
+  ],
+
+  worker: {
+    plugins: [
+      nxViteTsPaths(),
+    ],
+  },
+});`;
+
+//# sourceMappingURL=vite-config-with-additional-js.fixture.js.map

package/src/migrations/update-17-2-0/lib/vite-config-with-additional-js.fixture.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/vite/src/migrations/update-17-2-0/lib/vite-config-with-additional-js.fixture.ts"],"sourcesContent":["export const viteConfigFixture = `/// <reference types=\"vitest\" />\nimport react from '@vitejs/plugin-react';\nimport dns from 'dns';\nimport { PluginOption, defineConfig } from 'vite';\nimport { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n\ndns.setDefaultResultOrder('verbatim');\nconst BASE_HREF = '/app';\n\n/**\n * Adds <base href=\"/app\">\\` to the head of the index.html\n * The reason why the \\`base\\` configuration property doesn't work is because it makes\n * all assets served under \\`/app\\` of \\`/\\` and this impacts the download zip service worker\n * We only want to the service worker to listen to events related to downloads, but not capture any other events\n * and the only way to do this is make sure all assets are served from the root, but we still want our app path to be \\`/app\\`\n *\n * This mimics the same behavior we had with webpack before migrating to vite\n */\nconst baseHrefPlugin: () => PluginOption = () => {\n  return {\n    name: 'html-transform',\n    transformIndexHtml(html) {\n      return html.replace('<head>', \\`<head>\\\\n    <base href=\"\\${BASE_HREF}\">\\`);\n    },\n  };\n};\n\nexport default defineConfig({\n  cacheDir: '../../node_modules/.vite/jetstream',\n  envPrefix: 'NX',\n\n  server: {\n    port: 4200,\n    host: 'localhost',\n  },\n\n  build: {\n    // Put all assets at the root of the app instead of under /assets\n    assetsDir: './',\n    sourcemap: true,\n    rollupOptions: {\n      output: {\n        sourcemap: true,\n      },\n    },\n  },\n\n  plugins: [\n    react({\n      jsxImportSource: '@emotion/react',\n      babel: {\n        plugins: ['@emotion/babel-plugin'],\n      },\n    }),\n    nxViteTsPaths(),\n    baseHrefPlugin(),\n  ],\n\n  worker: {\n    plugins: [\n      nxViteTsPaths(),\n    ],\n  },\n});`;\n"],"names":["viteConfigFixture"],"mappings":";+BAAaA;;;eAAAA;;;AAAN,MAAMA,oBAAoB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+D/B,CAAC"}

package/src/migrations/update-17-2-0/update-vite-config.js

@@ -44,14 +44,17 @@ async function updateBuildDir(tree) {
     await (0, _devkit.formatFiles)(tree);
 }
 function getConfigNode(configFileContents) {
-    var _tsquery_query, _tsquery_query1;
+    var _tsquery_query;
     if (!configFileContents) {
         return;
     }
-    let configNode = (_tsquery_query = _tsquery.tsquery.query(configFileContents, `ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query[0];
-    const arrowFunctionReturnStatement = (_tsquery_query1 = _tsquery.tsquery.query(configFileContents, `ArrowFunction Block ReturnStatement ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query1[0];
-    if (arrowFunctionReturnStatement) {
-        configNode = arrowFunctionReturnStatement;
+    let configNode = (_tsquery_query = _tsquery.tsquery.query(configFileContents, `CallExpression:has(Identifier[name=defineConfig]) > ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query[0];
+    if (!configNode) {
+        var _tsquery_query1;
+        const arrowFunctionReturnStatement = (_tsquery_query1 = _tsquery.tsquery.query(configFileContents, `ArrowFunction Block ReturnStatement ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query1[0];
+        if (arrowFunctionReturnStatement) {
+            configNode = arrowFunctionReturnStatement;
+        }
     }
     return configNode;
 }

package/src/migrations/update-17-2-0/update-vite-config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-17-2-0/update-vite-config.ts"],"sourcesContent":["import {\n  Tree,\n  formatFiles,\n  getProjects,\n  joinPathFragments,\n  logger,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { ViteBuildExecutorOptions } from '../../executors/build/schema';\nimport { updateBuildOutDirAndRoot } from './lib/edit-build-config';\nimport { updateTestConfig } from './lib/edit-test-config';\nimport { addFileReplacements } from './lib/add-file-replacements';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport ts = require('typescript');\nimport { findViteConfig } from '../../utils/find-vite-config';\n\nexport default async function updateBuildDir(tree: Tree) {\n  const projects = getProjects(tree);\n  forEachExecutorOptions<ViteBuildExecutorOptions>(\n    tree,\n    '@nx/vite:build',\n    (options, projectName, targetName) => {\n      const projectConfig = projects.get(projectName);\n      const config =\n        options.configFile || findViteConfig(tree, projectConfig.root);\n      if (!config || !tree.exists(config)) {\n        return;\n      }\n      let configContents = tree.read(config, 'utf-8');\n\n      configContents = updateBuildOutDirAndRoot(\n        options,\n        configContents,\n        projectConfig,\n        targetName,\n        tree,\n        projectName,\n        config\n      );\n\n      configContents = updateTestConfig(configContents, projectConfig, config);\n\n      if (options['fileReplacements']?.length > 0) {\n        configContents = addFileReplacements(\n          configContents,\n          options['fileReplacements'],\n          config\n        );\n      }\n\n      tree.write(config, configContents);\n    }\n  );\n\n  await formatFiles(tree);\n}\n\nexport function getConfigNode(configFileContents: string): ts.Node | undefined {\n  if (!configFileContents) {\n    return;\n  }\n  let configNode = tsquery.query(\n    configFileContents,\n    `ObjectLiteralExpression`\n  )?.[0];\n\n  const arrowFunctionReturnStatement = tsquery.query(\n    configFileContents,\n    `ArrowFunction Block ReturnStatement ObjectLiteralExpression`\n  )?.[0];\n\n  if (arrowFunctionReturnStatement) {\n    configNode = arrowFunctionReturnStatement;\n  }\n\n  return configNode;\n}\n\nexport function notFoundWarning(configPath: string) {\n  logger.warn(`\n  Could not migrate your ${configPath} file.\n  Please add the build.outDir and root options in your ${configPath} file.\n  You can find more information on how to configure vite for Nx here:\n  \n  https://nx.dev/recipes/vite/configure-vite\n  `);\n}\n"],"names":["updateBuildDir","getConfigNode","notFoundWarning","ts","tree","projects","getProjects","forEachExecutorOptions","options","projectName","targetName","projectConfig","get","config","configFile","findViteConfig","root","exists","configContents","read","updateBuildOutDirAndRoot","updateTestConfig","length","addFileReplacements","write","formatFiles","configFileContents","tsquery","configNode","query","arrowFunctionReturnStatement","configPath","logger","warn"],"mappings":";;;;;;;;IAgBA,OAuCC;eAvC6BA;;IAyCdC,aAAa;eAAbA;;IAqBAC,eAAe;eAAfA;;;wBAxET;sCACgC;iCAEE;gCACR;qCACG;yBACZ;gCAEO;AAD/B,MAAOC,aAAa;AAGL,eAAeH,eAAeI,IAAU;IACrD,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EACpBH,MACA,kBACA,CAACI,SAASC,aAAaC;YAqBjBF;QApBJ,MAAMG,gBAAgBN,SAASO,GAAG,CAACH;QACnC,MAAMI,SACJL,QAAQM,UAAU,IAAIC,IAAAA,8BAAc,EAACX,MAAMO,cAAcK,IAAI;QAC/D,IAAI,CAACH,UAAU,CAACT,KAAKa,MAAM,CAACJ,SAAS;YACnC;QACF;QACA,IAAIK,iBAAiBd,KAAKe,IAAI,CAACN,QAAQ;QAEvCK,iBAAiBE,IAAAA,yCAAwB,EACvCZ,SACAU,gBACAP,eACAD,YACAN,MACAK,aACAI;QAGFK,iBAAiBG,IAAAA,gCAAgB,EAACH,gBAAgBP,eAAeE;QAEjE,IAAIL,EAAAA,4BAAAA,OAAO,CAAC,mBAAmB,qBAA3BA,0BAA6Bc,MAAM,IAAG,GAAG;YAC3CJ,iBAAiBK,IAAAA,wCAAmB,EAClCL,gBACAV,OAAO,CAAC,mBAAmB,EAC3BK;QAEJ;QAEAT,KAAKoB,KAAK,CAACX,QAAQK;IACrB;IAGF,MAAMO,IAAAA,mBAAW,EAACrB;AACpB;AAEO,SAASH,cAAcyB,kBAA0B;QAIrCC,gBAKoBA;IARrC,IAAI,CAACD,oBAAoB;QACvB;IACF;IACA,IAAIE,cAAaD,iBAAAA,gBAAO,CAACE,KAAK,CAC5BH,oBACA,CAAC,uBAAuB,CAAC,sBAFVC,cAGd,CAAC,EAAE;IAEN,MAAMG,gCAA+BH,kBAAAA,gBAAO,CAACE,KAAK,CAChDH,oBACA,CAAC,2DAA2D,CAAC,sBAF1BC,eAGlC,CAAC,EAAE;IAEN,IAAIG,8BAA8B;QAChCF,aAAaE;IACf;IAEA,OAAOF;AACT;AAEO,SAAS1B,gBAAgB6B,UAAkB;IAChDC,cAAM,CAACC,IAAI,CAAC,CAAC;yBACU,EAAEF,WAAW;uDACiB,EAAEA,WAAW;;;;EAIlE,CAAC;AACH"}
+{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-17-2-0/update-vite-config.ts"],"sourcesContent":["import {\n  Tree,\n  formatFiles,\n  getProjects,\n  joinPathFragments,\n  logger,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { ViteBuildExecutorOptions } from '../../executors/build/schema';\nimport { updateBuildOutDirAndRoot } from './lib/edit-build-config';\nimport { updateTestConfig } from './lib/edit-test-config';\nimport { addFileReplacements } from './lib/add-file-replacements';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport ts = require('typescript');\nimport { findViteConfig } from '../../utils/find-vite-config';\n\nexport default async function updateBuildDir(tree: Tree) {\n  const projects = getProjects(tree);\n  forEachExecutorOptions<ViteBuildExecutorOptions>(\n    tree,\n    '@nx/vite:build',\n    (options, projectName, targetName) => {\n      const projectConfig = projects.get(projectName);\n      const config =\n        options.configFile || findViteConfig(tree, projectConfig.root);\n      if (!config || !tree.exists(config)) {\n        return;\n      }\n      let configContents = tree.read(config, 'utf-8');\n\n      configContents = updateBuildOutDirAndRoot(\n        options,\n        configContents,\n        projectConfig,\n        targetName,\n        tree,\n        projectName,\n        config\n      );\n\n      configContents = updateTestConfig(configContents, projectConfig, config);\n\n      if (options['fileReplacements']?.length > 0) {\n        configContents = addFileReplacements(\n          configContents,\n          options['fileReplacements'],\n          config\n        );\n      }\n\n      tree.write(config, configContents);\n    }\n  );\n\n  await formatFiles(tree);\n}\n\nexport function getConfigNode(configFileContents: string): ts.Node | undefined {\n  if (!configFileContents) {\n    return;\n  }\n  let configNode = tsquery.query(\n    configFileContents,\n    `CallExpression:has(Identifier[name=defineConfig]) > ObjectLiteralExpression`\n  )?.[0];\n\n  if (!configNode) {\n    const arrowFunctionReturnStatement = tsquery.query(\n      configFileContents,\n      `ArrowFunction Block ReturnStatement ObjectLiteralExpression`\n    )?.[0];\n\n    if (arrowFunctionReturnStatement) {\n      configNode = arrowFunctionReturnStatement;\n    }\n  }\n\n  return configNode;\n}\n\nexport function notFoundWarning(configPath: string) {\n  logger.warn(`\n  Could not migrate your ${configPath} file.\n  Please add the build.outDir and root options in your ${configPath} file.\n  You can find more information on how to configure vite for Nx here:\n  \n  https://nx.dev/recipes/vite/configure-vite\n  `);\n}\n"],"names":["updateBuildDir","getConfigNode","notFoundWarning","ts","tree","projects","getProjects","forEachExecutorOptions","options","projectName","targetName","projectConfig","get","config","configFile","findViteConfig","root","exists","configContents","read","updateBuildOutDirAndRoot","updateTestConfig","length","addFileReplacements","write","formatFiles","configFileContents","tsquery","configNode","query","arrowFunctionReturnStatement","configPath","logger","warn"],"mappings":";;;;;;;;IAgBA,OAuCC;eAvC6BA;;IAyCdC,aAAa;eAAbA;;IAuBAC,eAAe;eAAfA;;;wBA1ET;sCACgC;iCAEE;gCACR;qCACG;yBACZ;gCAEO;AAD/B,MAAOC,aAAa;AAGL,eAAeH,eAAeI,IAAU;IACrD,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EACpBH,MACA,kBACA,CAACI,SAASC,aAAaC;YAqBjBF;QApBJ,MAAMG,gBAAgBN,SAASO,GAAG,CAACH;QACnC,MAAMI,SACJL,QAAQM,UAAU,IAAIC,IAAAA,8BAAc,EAACX,MAAMO,cAAcK,IAAI;QAC/D,IAAI,CAACH,UAAU,CAACT,KAAKa,MAAM,CAACJ,SAAS;YACnC;QACF;QACA,IAAIK,iBAAiBd,KAAKe,IAAI,CAACN,QAAQ;QAEvCK,iBAAiBE,IAAAA,yCAAwB,EACvCZ,SACAU,gBACAP,eACAD,YACAN,MACAK,aACAI;QAGFK,iBAAiBG,IAAAA,gCAAgB,EAACH,gBAAgBP,eAAeE;QAEjE,IAAIL,EAAAA,4BAAAA,OAAO,CAAC,mBAAmB,qBAA3BA,0BAA6Bc,MAAM,IAAG,GAAG;YAC3CJ,iBAAiBK,IAAAA,wCAAmB,EAClCL,gBACAV,OAAO,CAAC,mBAAmB,EAC3BK;QAEJ;QAEAT,KAAKoB,KAAK,CAACX,QAAQK;IACrB;IAGF,MAAMO,IAAAA,mBAAW,EAACrB;AACpB;AAEO,SAASH,cAAcyB,kBAA0B;QAIrCC;IAHjB,IAAI,CAACD,oBAAoB;QACvB;IACF;IACA,IAAIE,cAAaD,iBAAAA,gBAAO,CAACE,KAAK,CAC5BH,oBACA,CAAC,2EAA2E,CAAC,sBAF9DC,cAGd,CAAC,EAAE;IAEN,IAAI,CAACC,YAAY;YACsBD;QAArC,MAAMG,gCAA+BH,kBAAAA,gBAAO,CAACE,KAAK,CAChDH,oBACA,CAAC,2DAA2D,CAAC,sBAF1BC,eAGlC,CAAC,EAAE;QAEN,IAAIG,8BAA8B;YAChCF,aAAaE;QACf;IACF;IAEA,OAAOF;AACT;AAEO,SAAS1B,gBAAgB6B,UAAkB;IAChDC,cAAM,CAACC,IAAI,CAAC,CAAC;yBACU,EAAEF,WAAW;uDACiB,EAAEA,WAAW;;;;EAIlE,CAAC;AACH"}