@nx/vite 16.0.0-beta.2 → 16.0.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -5
- package/src/executors/build/build.impl.js +2 -2
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/executors/dev-server/dev-server.impl.js +2 -2
- package/src/executors/dev-server/dev-server.impl.js.map +1 -1
- package/src/executors/preview-server/preview-server.impl.js +1 -1
- package/src/executors/preview-server/preview-server.impl.js.map +1 -1
- package/src/generators/configuration/configuration.js +2 -2
- package/src/generators/configuration/configuration.js.map +1 -1
- package/src/generators/init/init.js +4 -4
- package/src/generators/init/init.js.map +1 -1
- package/src/migrations/update-15-3-1/update-vite-tsconfig-paths.js +2 -2
- package/src/migrations/update-15-3-1/update-vite-tsconfig-paths.js.map +1 -1
- package/src/utils/generator-utils.js +42 -22
- package/src/utils/generator-utils.js.map +1 -1
- package/src/utils/test-files/angular-project.config.json +2 -2
- package/src/utils/test-files/react-lib-non-buildable-jest.json +2 -2
- package/src/utils/test-files/react-lib-non-buildable-vitest.json +2 -2
- package/src/utils/test-files/react-mixed-project.config.json +5 -5
- package/src/utils/test-files/react-project.config.json +5 -5
- package/src/utils/test-files/web-project.config.json +4 -4
- package/src/utils/test-utils.js +10 -10
- package/src/utils/test-utils.js.map +1 -1
- package/src/utils/vite-config-edit-utils.js +2 -2
- package/src/utils/vite-config-edit-utils.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/vite",
|
|
3
|
-
"version": "16.0.0-beta.
|
|
3
|
+
"version": "16.0.0-beta.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for building and testing applications using Vite",
|
|
6
6
|
"repository": {
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"migrations": "./migrations.json"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@nrwl/vite": "16.0.0-beta.
|
|
33
|
-
"@nx/devkit": "16.0.0-beta.
|
|
34
|
-
"@nx/js": "16.0.0-beta.
|
|
32
|
+
"@nrwl/vite": "16.0.0-beta.3",
|
|
33
|
+
"@nx/devkit": "16.0.0-beta.3",
|
|
34
|
+
"@nx/js": "16.0.0-beta.3",
|
|
35
35
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
36
36
|
"@swc/helpers": "~0.5.0",
|
|
37
37
|
"dotenv": "~10.0.0",
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"./src/executors/*.impl": "./src/executors/*.impl.js",
|
|
57
57
|
"./src/executors/*/compat": "./src/executors/*/compat.js"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "27344019a2a23403a7ac7fd2c94b1412d86458ba"
|
|
60
60
|
}
|
|
@@ -21,10 +21,10 @@ const _js = require("@nx/js");
|
|
|
21
21
|
const _fs = require("fs");
|
|
22
22
|
const _path = require("path");
|
|
23
23
|
const _asynciterable = require("@nx/devkit/src/utils/async-iterable");
|
|
24
|
-
const
|
|
24
|
+
const _internal = require("@nx/js/src/internal");
|
|
25
25
|
async function* viteBuildExecutor(options, context) {
|
|
26
26
|
const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
|
|
27
|
-
(0,
|
|
27
|
+
(0, _internal.registerTsConfigPaths)((0, _path.resolve)(projectRoot, 'tsconfig.json'));
|
|
28
28
|
const normalizedOptions = normalizeOptions(options);
|
|
29
29
|
const buildConfig = (0, _vite.mergeConfig)((0, _optionsutils.getViteSharedConfig)(normalizedOptions, false, context), {
|
|
30
30
|
build: (0, _optionsutils.getViteBuildOptions)(normalizedOptions, context)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../packages/vite/src/executors/build/build.impl.ts"],"sourcesContent":["import 'dotenv/config';\nimport { ExecutorContext } from '@nx/devkit';\nimport { build, InlineConfig, mergeConfig } from 'vite';\nimport {\n getViteBuildOptions,\n getViteSharedConfig,\n} from '../../utils/options-utils';\nimport { ViteBuildExecutorOptions } from './schema';\nimport { copyAssets } from '@nx/js';\nimport { existsSync } from 'fs';\nimport { resolve } from 'path';\nimport { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';\n\nimport { registerTsConfigPaths } from 'nx/src/
|
|
1
|
+
{"version":3,"sources":["../../../../../../packages/vite/src/executors/build/build.impl.ts"],"sourcesContent":["import 'dotenv/config';\nimport { ExecutorContext } from '@nx/devkit';\nimport { build, InlineConfig, mergeConfig } from 'vite';\nimport {\n getViteBuildOptions,\n getViteSharedConfig,\n} from '../../utils/options-utils';\nimport { ViteBuildExecutorOptions } from './schema';\nimport { copyAssets } from '@nx/js';\nimport { existsSync } from 'fs';\nimport { resolve } from 'path';\nimport { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';\n\nimport { registerTsConfigPaths } from '@nx/js/src/internal';\n\nexport async function* viteBuildExecutor(\n options: ViteBuildExecutorOptions,\n context: ExecutorContext\n) {\n const projectRoot =\n context.projectsConfigurations.projects[context.projectName].root;\n\n registerTsConfigPaths(resolve(projectRoot, 'tsconfig.json'));\n\n const normalizedOptions = normalizeOptions(options);\n\n const buildConfig = mergeConfig(\n getViteSharedConfig(normalizedOptions, false, context),\n {\n build: getViteBuildOptions(normalizedOptions, context),\n }\n );\n\n const watcherOrOutput = await runInstance(buildConfig);\n\n const libraryPackageJson = resolve(projectRoot, 'package.json');\n const rootPackageJson = resolve(context.root, 'package.json');\n\n // For buildable libs, copy package.json if it exists.\n if (\n existsSync(libraryPackageJson) &&\n rootPackageJson !== libraryPackageJson\n ) {\n await copyAssets(\n {\n outputPath: normalizedOptions.outputPath,\n assets: [\n {\n input: projectRoot,\n output: '.',\n glob: 'package.json',\n },\n ],\n },\n context\n );\n }\n\n if ('on' in watcherOrOutput) {\n const iterable = createAsyncIterable<{ success: boolean }>(({ next }) => {\n let success = true;\n watcherOrOutput.on('event', (event) => {\n if (event.code === 'START') {\n success = true;\n } else if (event.code === 'ERROR') {\n success = false;\n } else if (event.code === 'END') {\n next({ success });\n }\n // result must be closed when present.\n // see https://rollupjs.org/guide/en/#rollupwatch\n if ('result' in event) {\n event.result.close();\n }\n });\n });\n yield* iterable;\n } else {\n const output = watcherOrOutput?.['output'] || watcherOrOutput?.[0]?.output;\n const fileName = output?.[0]?.fileName || 'main.cjs';\n const outfile = resolve(normalizedOptions.outputPath, fileName);\n yield { success: true, outfile };\n }\n}\n\nfunction runInstance(options: InlineConfig) {\n return build({\n ...options,\n });\n}\n\nfunction normalizeOptions(options: ViteBuildExecutorOptions) {\n const normalizedOptions = { ...options };\n\n // coerce watch to null or {} to match with Vite's watch config\n if (options.watch === false) {\n normalizedOptions.watch = null;\n } else if (options.watch === true) {\n normalizedOptions.watch = {};\n }\n\n return normalizedOptions;\n}\n\nexport default viteBuildExecutor;\n"],"names":["viteBuildExecutor","options","context","projectRoot","projectsConfigurations","projects","projectName","root","registerTsConfigPaths","resolve","normalizedOptions","normalizeOptions","buildConfig","mergeConfig","getViteSharedConfig","build","getViteBuildOptions","watcherOrOutput","runInstance","libraryPackageJson","rootPackageJson","existsSync","copyAssets","outputPath","assets","input","output","glob","iterable","createAsyncIterable","next","success","on","event","code","result","close","fileName","outfile","watch"],"mappings":";;;;;;;;IAeuBA,iBAAiB;eAAjBA;;IAyFvB,OAAiC;eAAjC;;;;QAxGO;sBAE0C;8BAI1C;oBAEoB;oBACA;sBACH;+BACY;0BAEE;AAE/B,gBAAgBA,kBACrBC,OAAiC,EACjCC,OAAwB,EACxB;IACA,MAAMC,cACJD,QAAQE,sBAAsB,CAACC,QAAQ,CAACH,QAAQI,WAAW,CAAC,CAACC,IAAI;IAEnEC,IAAAA,+BAAqB,EAACC,IAAAA,aAAO,EAACN,aAAa;IAE3C,MAAMO,oBAAoBC,iBAAiBV;IAE3C,MAAMW,cAAcC,IAAAA,iBAAW,EAC7BC,IAAAA,iCAAmB,EAACJ,mBAAmB,KAAK,EAAER,UAC9C;QACEa,OAAOC,IAAAA,iCAAmB,EAACN,mBAAmBR;IAChD;IAGF,MAAMe,kBAAkB,MAAMC,YAAYN;IAE1C,MAAMO,qBAAqBV,IAAAA,aAAO,EAACN,aAAa;IAChD,MAAMiB,kBAAkBX,IAAAA,aAAO,EAACP,QAAQK,IAAI,EAAE;IAE9C,sDAAsD;IACtD,IACEc,IAAAA,cAAU,EAACF,uBACXC,oBAAoBD,oBACpB;QACA,MAAMG,IAAAA,cAAU,EACd;YACEC,YAAYb,kBAAkBa,UAAU;YACxCC,QAAQ;gBACN;oBACEC,OAAOtB;oBACPuB,QAAQ;oBACRC,MAAM;gBACR;aACD;QACH,GACAzB;IAEJ,CAAC;IAED,IAAI,QAAQe,iBAAiB;QAC3B,MAAMW,WAAWC,IAAAA,kCAAmB,EAAuB,CAAC,EAAEC,KAAI,EAAE,GAAK;YACvE,IAAIC,UAAU,IAAI;YAClBd,gBAAgBe,EAAE,CAAC,SAAS,CAACC,QAAU;gBACrC,IAAIA,MAAMC,IAAI,KAAK,SAAS;oBAC1BH,UAAU,IAAI;gBAChB,OAAO,IAAIE,MAAMC,IAAI,KAAK,SAAS;oBACjCH,UAAU,KAAK;gBACjB,OAAO,IAAIE,MAAMC,IAAI,KAAK,OAAO;oBAC/BJ,KAAK;wBAAEC;oBAAQ;gBACjB,CAAC;gBACD,sCAAsC;gBACtC,iDAAiD;gBACjD,IAAI,YAAYE,OAAO;oBACrBA,MAAME,MAAM,CAACC,KAAK;gBACpB,CAAC;YACH;QACF;QACA,OAAOR;IACT,OAAO;YACyCX,mBAC7BS;QADjB,MAAMA,SAAST,CAAAA,0BAAAA,KAAAA,IAAAA,eAAiB,CAAC,SAAS,AAAD,KAAKA,CAAAA,0BAAAA,KAAAA,IAAAA,CAAAA,oBAAAA,eAAiB,CAAC,EAAE,YAApBA,KAAAA,IAAAA,kBAAsBS,MAAF,AAAD;QACjE,MAAMW,WAAWX,CAAAA,iBAAAA,KAAAA,IAAAA,CAAAA,WAAAA,MAAQ,CAAC,EAAE,YAAXA,KAAAA,IAAAA,SAAaW,QAAF,AAAD,KAAe;QAC1C,MAAMC,UAAU7B,IAAAA,aAAO,EAACC,kBAAkBa,UAAU,EAAEc;QACtD,MAAM;YAAEN,SAAS,IAAI;YAAEO;QAAQ;IACjC,CAAC;AACH;AAEA,SAASpB,YAAYjB,OAAqB,EAAE;IAC1C,OAAOc,IAAAA,WAAK,EAAC,eACRd;AAEP;AAEA,SAASU,iBAAiBV,OAAiC,EAAE;IAC3D,MAAMS,oBAAoB,eAAKT;IAE/B,+DAA+D;IAC/D,IAAIA,QAAQsC,KAAK,KAAK,KAAK,EAAE;QAC3B7B,kBAAkB6B,KAAK,GAAG,IAAI;IAChC,OAAO,IAAItC,QAAQsC,KAAK,KAAK,IAAI,EAAE;QACjC7B,kBAAkB6B,KAAK,GAAG,CAAC;IAC7B,CAAC;IAED,OAAO7B;AACT;MAEA,WAAeV"}
|
|
@@ -17,11 +17,11 @@ const _extends = require("@swc/helpers/_/_extends");
|
|
|
17
17
|
require("dotenv/config");
|
|
18
18
|
const _vite = require("vite");
|
|
19
19
|
const _optionsutils = require("../../utils/options-utils");
|
|
20
|
-
const
|
|
20
|
+
const _internal = require("@nx/js/src/internal");
|
|
21
21
|
const _path = require("path");
|
|
22
22
|
async function* viteDevServerExecutor(options, context) {
|
|
23
23
|
const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
|
|
24
|
-
(0,
|
|
24
|
+
(0, _internal.registerTsConfigPaths)((0, _path.resolve)(projectRoot, 'tsconfig.json'));
|
|
25
25
|
// Retrieve the option for the configured buildTarget.
|
|
26
26
|
const buildTargetOptions = (0, _optionsutils.getNxTargetOptions)(options.buildTarget, context);
|
|
27
27
|
// Merge the options from the build and dev-serve targets.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../packages/vite/src/executors/dev-server/dev-server.impl.ts"],"sourcesContent":["import 'dotenv/config';\nimport { ExecutorContext } from '@nx/devkit';\nimport { createServer, InlineConfig, mergeConfig, ViteDevServer } from 'vite';\n\nimport {\n getViteSharedConfig,\n getNxTargetOptions,\n getViteServerOptions,\n getViteBuildOptions,\n} from '../../utils/options-utils';\n\nimport { ViteDevServerExecutorOptions } from './schema';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { registerTsConfigPaths } from 'nx/src/
|
|
1
|
+
{"version":3,"sources":["../../../../../../packages/vite/src/executors/dev-server/dev-server.impl.ts"],"sourcesContent":["import 'dotenv/config';\nimport { ExecutorContext } from '@nx/devkit';\nimport { createServer, InlineConfig, mergeConfig, ViteDevServer } from 'vite';\n\nimport {\n getViteSharedConfig,\n getNxTargetOptions,\n getViteServerOptions,\n getViteBuildOptions,\n} from '../../utils/options-utils';\n\nimport { ViteDevServerExecutorOptions } from './schema';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { registerTsConfigPaths } from '@nx/js/src/internal';\nimport { resolve } from 'path';\n\nexport async function* viteDevServerExecutor(\n options: ViteDevServerExecutorOptions,\n context: ExecutorContext\n): AsyncGenerator<{ success: boolean; baseUrl: string }> {\n const projectRoot =\n context.projectsConfigurations.projects[context.projectName].root;\n\n registerTsConfigPaths(resolve(projectRoot, 'tsconfig.json'));\n\n // Retrieve the option for the configured buildTarget.\n const buildTargetOptions: ViteBuildExecutorOptions = getNxTargetOptions(\n options.buildTarget,\n context\n );\n\n // Merge the options from the build and dev-serve targets.\n // The latter takes precedence.\n const mergedOptions = {\n ...buildTargetOptions,\n ...options,\n };\n\n // Add the server specific configuration.\n const serverConfig: InlineConfig = mergeConfig(\n getViteSharedConfig(mergedOptions, options.clearScreen, context),\n {\n build: getViteBuildOptions(mergedOptions, context),\n server: getViteServerOptions(mergedOptions, context),\n }\n );\n\n try {\n const server = await createServer(serverConfig);\n await runViteDevServer(server);\n const resolvedUrls = [\n ...server.resolvedUrls.local,\n ...server.resolvedUrls.network,\n ];\n\n yield {\n success: true,\n baseUrl: resolvedUrls[0] ?? '',\n };\n } catch (e) {\n console.error(e);\n yield {\n success: false,\n baseUrl: '',\n };\n }\n\n await new Promise<void>((resolve) => {\n process.once('SIGINT', () => resolve());\n process.once('SIGTERM', () => resolve());\n process.once('exit', () => resolve());\n });\n}\n\nasync function runViteDevServer(server: ViteDevServer): Promise<void> {\n await server.listen();\n server.printUrls();\n\n const processOnExit = async () => {\n await server.close();\n };\n\n process.once('SIGINT', processOnExit);\n process.once('SIGTERM', processOnExit);\n process.once('exit', processOnExit);\n}\n\nexport default viteDevServerExecutor;\n"],"names":["viteDevServerExecutor","options","context","projectRoot","projectsConfigurations","projects","projectName","root","registerTsConfigPaths","resolve","buildTargetOptions","getNxTargetOptions","buildTarget","mergedOptions","serverConfig","mergeConfig","getViteSharedConfig","clearScreen","build","getViteBuildOptions","server","getViteServerOptions","createServer","runViteDevServer","resolvedUrls","local","network","success","baseUrl","e","console","error","Promise","process","once","listen","printUrls","processOnExit","close"],"mappings":";;;;;;;;IAgBuBA,qBAAqB;eAArBA;;IAuEvB,OAAqC;eAArC;;;;QAvFO;sBAEgE;8BAOhE;0BAI+B;sBACd;AAEjB,gBAAgBA,sBACrBC,OAAqC,EACrCC,OAAwB,EAC+B;IACvD,MAAMC,cACJD,QAAQE,sBAAsB,CAACC,QAAQ,CAACH,QAAQI,WAAW,CAAC,CAACC,IAAI;IAEnEC,IAAAA,+BAAqB,EAACC,IAAAA,aAAO,EAACN,aAAa;IAE3C,sDAAsD;IACtD,MAAMO,qBAA+CC,IAAAA,gCAAkB,EACrEV,QAAQW,WAAW,EACnBV;IAGF,0DAA0D;IAC1D,+BAA+B;IAC/B,MAAMW,gBAAgB,eACjBH,oBACAT;IAGL,yCAAyC;IACzC,MAAMa,eAA6BC,IAAAA,iBAAW,EAC5CC,IAAAA,iCAAmB,EAACH,eAAeZ,QAAQgB,WAAW,EAAEf,UACxD;QACEgB,OAAOC,IAAAA,iCAAmB,EAACN,eAAeX;QAC1CkB,QAAQC,IAAAA,kCAAoB,EAACR,eAAeX;IAC9C;IAGF,IAAI;QACF,MAAMkB,SAAS,MAAME,IAAAA,kBAAY,EAACR;QAClC,MAAMS,iBAAiBH;QACvB,MAAMI,eAAe;eAChBJ,OAAOI,YAAY,CAACC,KAAK;eACzBL,OAAOI,YAAY,CAACE,OAAO;SAC/B;YAIUF;QAFX,MAAM;YACJG,SAAS,IAAI;YACbC,SAASJ,CAAAA,iBAAAA,YAAY,CAAC,EAAE,YAAfA,iBAAmB,EAAE;QAChC;IACF,EAAE,OAAOK,GAAG;QACVC,QAAQC,KAAK,CAACF;QACd,MAAM;YACJF,SAAS,KAAK;YACdC,SAAS;QACX;IACF;IAEA,MAAM,IAAII,QAAc,CAACvB,UAAY;QACnCwB,QAAQC,IAAI,CAAC,UAAU,IAAMzB;QAC7BwB,QAAQC,IAAI,CAAC,WAAW,IAAMzB;QAC9BwB,QAAQC,IAAI,CAAC,QAAQ,IAAMzB;IAC7B;AACF;AAEA,eAAec,iBAAiBH,MAAqB,EAAiB;IACpE,MAAMA,OAAOe,MAAM;IACnBf,OAAOgB,SAAS;IAEhB,MAAMC,gBAAgB,UAAY;QAChC,MAAMjB,OAAOkB,KAAK;IACpB;IAEAL,QAAQC,IAAI,CAAC,UAAUG;IACvBJ,QAAQC,IAAI,CAAC,WAAWG;IACxBJ,QAAQC,IAAI,CAAC,QAAQG;AACvB;MAEA,WAAerC"}
|
|
@@ -24,7 +24,7 @@ async function* vitePreviewServerExecutor(options, context) {
|
|
|
24
24
|
if (!targetConfiguration) {
|
|
25
25
|
throw new Error(`Invalid buildTarget: ${options.buildTarget}`);
|
|
26
26
|
}
|
|
27
|
-
const isCustomBuildTarget = targetConfiguration.executor !== '@nrwl/vite:build';
|
|
27
|
+
const isCustomBuildTarget = targetConfiguration.executor !== '@nx/vite:build' && targetConfiguration.executor !== '@nrwl/vite:build';
|
|
28
28
|
// Retrieve the option for the configured buildTarget.
|
|
29
29
|
const buildTargetOptions = (0, _optionsutils.getNxTargetOptions)(options.buildTarget, context);
|
|
30
30
|
var _options_staticFilePath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../packages/vite/src/executors/preview-server/preview-server.impl.ts"],"sourcesContent":["import { ExecutorContext, parseTargetString, runExecutor } from '@nx/devkit';\nimport { InlineConfig, mergeConfig, preview, PreviewServer } from 'vite';\nimport {\n getNxTargetOptions,\n getViteSharedConfig,\n getViteBuildOptions,\n getVitePreviewOptions,\n} from '../../utils/options-utils';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { VitePreviewServerExecutorOptions } from './schema';\n\ninterface CustomBuildTargetOptions {\n outputPath: string;\n}\n\nexport async function* vitePreviewServerExecutor(\n options: VitePreviewServerExecutorOptions,\n context: ExecutorContext\n) {\n const target = parseTargetString(options.buildTarget, context.projectGraph);\n const targetConfiguration =\n context.projectsConfigurations.projects[target.project]?.targets[\n target.target\n ];\n if (!targetConfiguration) {\n throw new Error(`Invalid buildTarget: ${options.buildTarget}`);\n }\n\n const isCustomBuildTarget =\n targetConfiguration.executor !== '@nrwl/vite:build';\n\n // Retrieve the option for the configured buildTarget.\n const buildTargetOptions:\n | ViteBuildExecutorOptions\n | CustomBuildTargetOptions = getNxTargetOptions(\n options.buildTarget,\n context\n );\n\n const outputPath = options.staticFilePath ?? buildTargetOptions.outputPath;\n\n if (!outputPath) {\n throw new Error(\n `Could not infer the \"outputPath\". It should either be a property of the \"${options.buildTarget}\" buildTarget or provided explicitly as a \"staticFilePath\" option.`\n );\n }\n\n // Merge the options from the build and preview-serve targets.\n // The latter takes precedence.\n const mergedOptions = {\n ...{ watch: {} },\n ...(isCustomBuildTarget ? {} : buildTargetOptions),\n ...options,\n outputPath,\n };\n\n // Retrieve the server configuration.\n const serverConfig: InlineConfig = mergeConfig(\n getViteSharedConfig(mergedOptions, options.clearScreen, context),\n {\n build: getViteBuildOptions(mergedOptions, context),\n preview: getVitePreviewOptions(mergedOptions, context),\n }\n );\n\n if (serverConfig.mode === 'production') {\n console.warn('WARNING: preview is not meant to be run in production!');\n }\n\n let server: PreviewServer | undefined;\n\n const processOnExit = async () => {\n await closeServer(server);\n };\n\n process.once('SIGINT', processOnExit);\n process.once('SIGTERM', processOnExit);\n process.once('exit', processOnExit);\n\n // Launch the build target.\n // If customBuildTarget is set to true, do not provide any overrides to it\n const buildTargetOverrides = isCustomBuildTarget ? {} : mergedOptions;\n const build = await runExecutor(target, buildTargetOverrides, context);\n\n for await (const result of build) {\n if (result.success) {\n try {\n if (!server) {\n server = await preview(serverConfig);\n }\n server.printUrls();\n\n const resolvedUrls = [\n ...server.resolvedUrls.local,\n ...server.resolvedUrls.network,\n ];\n\n yield {\n success: true,\n baseUrl: resolvedUrls[0] ?? '',\n };\n } catch (e) {\n console.error(e);\n yield {\n success: false,\n baseUrl: '',\n };\n }\n } else {\n yield {\n success: false,\n baseUrl: '',\n };\n }\n }\n\n await new Promise<void>((resolve) => {\n process.once('SIGINT', () => resolve());\n process.once('SIGTERM', () => resolve());\n process.once('exit', () => resolve());\n });\n}\n\nfunction closeServer(server?: PreviewServer): Promise<void> {\n return new Promise((resolve) => {\n if (!server) {\n resolve();\n } else {\n const { httpServer } = server;\n // closeAllConnections was added in Node v18.2.0\n httpServer.closeAllConnections && httpServer.closeAllConnections();\n httpServer.close(() => resolve());\n }\n });\n}\n\nexport default vitePreviewServerExecutor;\n"],"names":["vitePreviewServerExecutor","options","context","target","parseTargetString","buildTarget","projectGraph","targetConfiguration","projectsConfigurations","projects","project","targets","Error","isCustomBuildTarget","executor","buildTargetOptions","getNxTargetOptions","outputPath","staticFilePath","mergedOptions","watch","serverConfig","mergeConfig","getViteSharedConfig","clearScreen","build","getViteBuildOptions","preview","getVitePreviewOptions","mode","console","warn","server","processOnExit","closeServer","process","once","buildTargetOverrides","runExecutor","result","success","printUrls","resolvedUrls","local","network","baseUrl","e","error","Promise","resolve","httpServer","closeAllConnections","close"],"mappings":";;;;;;;;IAeuBA,yBAAyB;eAAzBA;;
|
|
1
|
+
{"version":3,"sources":["../../../../../../packages/vite/src/executors/preview-server/preview-server.impl.ts"],"sourcesContent":["import { ExecutorContext, parseTargetString, runExecutor } from '@nx/devkit';\nimport { InlineConfig, mergeConfig, preview, PreviewServer } from 'vite';\nimport {\n getNxTargetOptions,\n getViteSharedConfig,\n getViteBuildOptions,\n getVitePreviewOptions,\n} from '../../utils/options-utils';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { VitePreviewServerExecutorOptions } from './schema';\n\ninterface CustomBuildTargetOptions {\n outputPath: string;\n}\n\nexport async function* vitePreviewServerExecutor(\n options: VitePreviewServerExecutorOptions,\n context: ExecutorContext\n) {\n const target = parseTargetString(options.buildTarget, context.projectGraph);\n const targetConfiguration =\n context.projectsConfigurations.projects[target.project]?.targets[\n target.target\n ];\n if (!targetConfiguration) {\n throw new Error(`Invalid buildTarget: ${options.buildTarget}`);\n }\n\n const isCustomBuildTarget =\n targetConfiguration.executor !== '@nx/vite:build' &&\n targetConfiguration.executor !== '@nrwl/vite:build';\n\n // Retrieve the option for the configured buildTarget.\n const buildTargetOptions:\n | ViteBuildExecutorOptions\n | CustomBuildTargetOptions = getNxTargetOptions(\n options.buildTarget,\n context\n );\n\n const outputPath = options.staticFilePath ?? buildTargetOptions.outputPath;\n\n if (!outputPath) {\n throw new Error(\n `Could not infer the \"outputPath\". It should either be a property of the \"${options.buildTarget}\" buildTarget or provided explicitly as a \"staticFilePath\" option.`\n );\n }\n\n // Merge the options from the build and preview-serve targets.\n // The latter takes precedence.\n const mergedOptions = {\n ...{ watch: {} },\n ...(isCustomBuildTarget ? {} : buildTargetOptions),\n ...options,\n outputPath,\n };\n\n // Retrieve the server configuration.\n const serverConfig: InlineConfig = mergeConfig(\n getViteSharedConfig(mergedOptions, options.clearScreen, context),\n {\n build: getViteBuildOptions(mergedOptions, context),\n preview: getVitePreviewOptions(mergedOptions, context),\n }\n );\n\n if (serverConfig.mode === 'production') {\n console.warn('WARNING: preview is not meant to be run in production!');\n }\n\n let server: PreviewServer | undefined;\n\n const processOnExit = async () => {\n await closeServer(server);\n };\n\n process.once('SIGINT', processOnExit);\n process.once('SIGTERM', processOnExit);\n process.once('exit', processOnExit);\n\n // Launch the build target.\n // If customBuildTarget is set to true, do not provide any overrides to it\n const buildTargetOverrides = isCustomBuildTarget ? {} : mergedOptions;\n const build = await runExecutor(target, buildTargetOverrides, context);\n\n for await (const result of build) {\n if (result.success) {\n try {\n if (!server) {\n server = await preview(serverConfig);\n }\n server.printUrls();\n\n const resolvedUrls = [\n ...server.resolvedUrls.local,\n ...server.resolvedUrls.network,\n ];\n\n yield {\n success: true,\n baseUrl: resolvedUrls[0] ?? '',\n };\n } catch (e) {\n console.error(e);\n yield {\n success: false,\n baseUrl: '',\n };\n }\n } else {\n yield {\n success: false,\n baseUrl: '',\n };\n }\n }\n\n await new Promise<void>((resolve) => {\n process.once('SIGINT', () => resolve());\n process.once('SIGTERM', () => resolve());\n process.once('exit', () => resolve());\n });\n}\n\nfunction closeServer(server?: PreviewServer): Promise<void> {\n return new Promise((resolve) => {\n if (!server) {\n resolve();\n } else {\n const { httpServer } = server;\n // closeAllConnections was added in Node v18.2.0\n httpServer.closeAllConnections && httpServer.closeAllConnections();\n httpServer.close(() => resolve());\n }\n });\n}\n\nexport default vitePreviewServerExecutor;\n"],"names":["vitePreviewServerExecutor","options","context","target","parseTargetString","buildTarget","projectGraph","targetConfiguration","projectsConfigurations","projects","project","targets","Error","isCustomBuildTarget","executor","buildTargetOptions","getNxTargetOptions","outputPath","staticFilePath","mergedOptions","watch","serverConfig","mergeConfig","getViteSharedConfig","clearScreen","build","getViteBuildOptions","preview","getVitePreviewOptions","mode","console","warn","server","processOnExit","closeServer","process","once","buildTargetOverrides","runExecutor","result","success","printUrls","resolvedUrls","local","network","baseUrl","e","error","Promise","resolve","httpServer","closeAllConnections","close"],"mappings":"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"}
|
|
@@ -51,10 +51,10 @@ async function viteConfigurationGenerator(tree, schema) {
|
|
|
51
51
|
*
|
|
52
52
|
* So we only throw if we found a target, but it is unsupported.
|
|
53
53
|
*/ if (!validFoundTargetName.build && projectContainsUnsupportedExecutor) {
|
|
54
|
-
throw new Error(`The project ${schema.project} cannot be converted to use the @
|
|
54
|
+
throw new Error(`The project ${schema.project} cannot be converted to use the @nx/vite executors.`);
|
|
55
55
|
}
|
|
56
56
|
if (alreadyHasNxViteTargets.build && (alreadyHasNxViteTargets.serve || projectType === 'library') && alreadyHasNxViteTargets.test) {
|
|
57
|
-
throw new Error(`The project ${schema.project} is already configured to use the @
|
|
57
|
+
throw new Error(`The project ${schema.project} is already configured to use the @nx/vite executors.
|
|
58
58
|
Please try a different project, or remove the existing targets
|
|
59
59
|
and re-run this generator to reset the existing Vite Configuration.
|
|
60
60
|
`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../packages/vite/src/generators/configuration/configuration.ts"],"sourcesContent":["import {\n convertNxGenerator,\n formatFiles,\n GeneratorCallback,\n readProjectConfiguration,\n runTasksInSerial,\n Tree,\n} from '@nx/devkit';\n\nimport {\n addOrChangeBuildTarget,\n addOrChangeServeTarget,\n addPreviewTarget,\n createOrEditViteConfig,\n deleteWebpackConfig,\n editTsConfig,\n findExistingTargetsInProject,\n handleUnknownExecutors,\n handleUnsupportedUserProvidedTargets,\n moveAndEditIndexHtml,\n TargetFlags,\n UserProvidedTargetName,\n} from '../../utils/generator-utils';\n\nimport initGenerator from '../init/init';\nimport vitestGenerator from '../vitest/vitest-generator';\nimport { ViteConfigurationGeneratorSchema } from './schema';\n\nexport async function viteConfigurationGenerator(\n tree: Tree,\n schema: ViteConfigurationGeneratorSchema\n) {\n const tasks: GeneratorCallback[] = [];\n\n const { targets, projectType, root } = readProjectConfiguration(\n tree,\n schema.project\n );\n let buildTargetName = 'build';\n let serveTargetName = 'serve';\n let testTargetName = 'test';\n\n schema.includeLib ??= projectType === 'library';\n\n /**\n * This is for when we are converting an existing project\n * to use the vite executors.\n */\n let projectAlreadyHasViteTargets: TargetFlags = {};\n\n if (!schema.newProject) {\n const userProvidedTargetName: UserProvidedTargetName = {\n build: schema.buildTarget,\n serve: schema.serveTarget,\n test: schema.testTarget,\n };\n\n const {\n validFoundTargetName,\n projectContainsUnsupportedExecutor,\n userProvidedTargetIsUnsupported,\n alreadyHasNxViteTargets,\n } = findExistingTargetsInProject(targets, userProvidedTargetName);\n projectAlreadyHasViteTargets = alreadyHasNxViteTargets;\n /**\n * This means that we only found unsupported build targets in that project.\n * The only way that buildTarget is defined, means that it is supported.\n *\n * If the `unsupported` flag was false, it would mean that we did not find\n * a build target at all, so we can create a new one.\n *\n * So we only throw if we found a target, but it is unsupported.\n */\n if (!validFoundTargetName.build && projectContainsUnsupportedExecutor) {\n throw new Error(\n `The project ${schema.project} cannot be converted to use the @
|
|
1
|
+
{"version":3,"sources":["../../../../../../packages/vite/src/generators/configuration/configuration.ts"],"sourcesContent":["import {\n convertNxGenerator,\n formatFiles,\n GeneratorCallback,\n readProjectConfiguration,\n runTasksInSerial,\n Tree,\n} from '@nx/devkit';\n\nimport {\n addOrChangeBuildTarget,\n addOrChangeServeTarget,\n addPreviewTarget,\n createOrEditViteConfig,\n deleteWebpackConfig,\n editTsConfig,\n findExistingTargetsInProject,\n handleUnknownExecutors,\n handleUnsupportedUserProvidedTargets,\n moveAndEditIndexHtml,\n TargetFlags,\n UserProvidedTargetName,\n} from '../../utils/generator-utils';\n\nimport initGenerator from '../init/init';\nimport vitestGenerator from '../vitest/vitest-generator';\nimport { ViteConfigurationGeneratorSchema } from './schema';\n\nexport async function viteConfigurationGenerator(\n tree: Tree,\n schema: ViteConfigurationGeneratorSchema\n) {\n const tasks: GeneratorCallback[] = [];\n\n const { targets, projectType, root } = readProjectConfiguration(\n tree,\n schema.project\n );\n let buildTargetName = 'build';\n let serveTargetName = 'serve';\n let testTargetName = 'test';\n\n schema.includeLib ??= projectType === 'library';\n\n /**\n * This is for when we are converting an existing project\n * to use the vite executors.\n */\n let projectAlreadyHasViteTargets: TargetFlags = {};\n\n if (!schema.newProject) {\n const userProvidedTargetName: UserProvidedTargetName = {\n build: schema.buildTarget,\n serve: schema.serveTarget,\n test: schema.testTarget,\n };\n\n const {\n validFoundTargetName,\n projectContainsUnsupportedExecutor,\n userProvidedTargetIsUnsupported,\n alreadyHasNxViteTargets,\n } = findExistingTargetsInProject(targets, userProvidedTargetName);\n projectAlreadyHasViteTargets = alreadyHasNxViteTargets;\n /**\n * This means that we only found unsupported build targets in that project.\n * The only way that buildTarget is defined, means that it is supported.\n *\n * If the `unsupported` flag was false, it would mean that we did not find\n * a build target at all, so we can create a new one.\n *\n * So we only throw if we found a target, but it is unsupported.\n */\n if (!validFoundTargetName.build && projectContainsUnsupportedExecutor) {\n throw new Error(\n `The project ${schema.project} cannot be converted to use the @nx/vite executors.`\n );\n }\n\n if (\n alreadyHasNxViteTargets.build &&\n (alreadyHasNxViteTargets.serve || projectType === 'library') &&\n alreadyHasNxViteTargets.test\n ) {\n throw new Error(\n `The project ${schema.project} is already configured to use the @nx/vite executors.\n Please try a different project, or remove the existing targets \n and re-run this generator to reset the existing Vite Configuration.\n `\n );\n }\n\n /**\n * This means that we did not find any supported executors\n * so we don't have any valid target names.\n *\n * However, the executors that we may have found are not in the\n * list of the specifically unsupported executors either.\n *\n * So, we should warn the user about it.\n */\n\n if (\n !projectContainsUnsupportedExecutor &&\n !validFoundTargetName.build &&\n !validFoundTargetName.serve &&\n !validFoundTargetName.test\n ) {\n await handleUnknownExecutors(schema.project);\n }\n\n /**\n * There is a possibility at this stage that the user has provided\n * targets with unsupported executors.\n * We keep track here of which of the targets that the user provided\n * are unsupported.\n * We do this with the `userProvidedTargetIsUnsupported` object,\n * which contains flags for each target (whether it is supported or not).\n *\n * We also keep track of the targets that we found in the project,\n * through the findExistingTargetsInProject function, which returns\n * targets for build/serve/test that use supported executors, and\n * can be converted to use the vite executors. These are the\n * kept in the validFoundTargetName object.\n */\n await handleUnsupportedUserProvidedTargets(\n userProvidedTargetIsUnsupported,\n userProvidedTargetName,\n validFoundTargetName\n );\n\n /**\n * Once the user is at this stage, then they can go ahead and convert.\n */\n\n buildTargetName = validFoundTargetName.build ?? buildTargetName;\n serveTargetName = validFoundTargetName.serve ?? serveTargetName;\n\n if (projectType === 'application') {\n moveAndEditIndexHtml(tree, schema, buildTargetName);\n }\n\n deleteWebpackConfig(\n tree,\n root,\n targets?.[buildTargetName]?.options?.webpackConfig\n );\n\n editTsConfig(tree, schema);\n }\n\n const initTask = await initGenerator(tree, {\n uiFramework: schema.uiFramework,\n includeLib: schema.includeLib,\n });\n tasks.push(initTask);\n\n if (!projectAlreadyHasViteTargets.build) {\n addOrChangeBuildTarget(tree, schema, buildTargetName);\n }\n\n if (!schema.includeLib) {\n if (!projectAlreadyHasViteTargets.serve) {\n addOrChangeServeTarget(tree, schema, serveTargetName);\n }\n if (!projectAlreadyHasViteTargets.preview) {\n addPreviewTarget(tree, schema, serveTargetName);\n }\n }\n\n createOrEditViteConfig(tree, schema, false, projectAlreadyHasViteTargets);\n\n if (schema.includeVitest) {\n const vitestTask = await vitestGenerator(tree, {\n project: schema.project,\n uiFramework: schema.uiFramework,\n inSourceTests: schema.inSourceTests,\n coverageProvider: 'c8',\n skipViteConfig: true,\n testTarget: testTargetName,\n skipFormat: true,\n });\n tasks.push(vitestTask);\n }\n\n if (!schema.skipFormat) {\n await formatFiles(tree);\n }\n\n return runTasksInSerial(...tasks);\n}\n\nexport default viteConfigurationGenerator;\nexport const configurationSchematic = convertNxGenerator(\n viteConfigurationGenerator\n);\n"],"names":["viteConfigurationGenerator","configurationSchematic","tree","schema","tasks","targets","projectType","root","readProjectConfiguration","project","buildTargetName","serveTargetName","testTargetName","includeLib","projectAlreadyHasViteTargets","newProject","userProvidedTargetName","build","buildTarget","serve","serveTarget","test","testTarget","validFoundTargetName","projectContainsUnsupportedExecutor","userProvidedTargetIsUnsupported","alreadyHasNxViteTargets","findExistingTargetsInProject","Error","handleUnknownExecutors","handleUnsupportedUserProvidedTargets","moveAndEditIndexHtml","deleteWebpackConfig","options","webpackConfig","editTsConfig","initTask","initGenerator","uiFramework","push","addOrChangeBuildTarget","addOrChangeServeTarget","preview","addPreviewTarget","createOrEditViteConfig","includeVitest","vitestTask","vitestGenerator","inSourceTests","coverageProvider","skipViteConfig","skipFormat","formatFiles","runTasksInSerial","convertNxGenerator"],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ function checkDependenciesInstalled(host, schema) {
|
|
|
30
30
|
packageJson.dependencies = packageJson.dependencies || {};
|
|
31
31
|
packageJson.devDependencies = packageJson.devDependencies || {};
|
|
32
32
|
// base deps
|
|
33
|
-
devDependencies['@
|
|
33
|
+
devDependencies['@nx/vite'] = _versions.nxVersion;
|
|
34
34
|
devDependencies['vite'] = _versions.viteVersion;
|
|
35
35
|
devDependencies['vite-plugin-eslint'] = _versions.vitePluginEslintVersion;
|
|
36
36
|
devDependencies['vite-tsconfig-paths'] = _versions.viteTsConfigPathsVersion;
|
|
@@ -49,9 +49,9 @@ function moveToDevDependencies(tree) {
|
|
|
49
49
|
(0, _devkit.updateJson)(tree, 'package.json', (packageJson)=>{
|
|
50
50
|
packageJson.dependencies = packageJson.dependencies || {};
|
|
51
51
|
packageJson.devDependencies = packageJson.devDependencies || {};
|
|
52
|
-
if (packageJson.dependencies['@
|
|
53
|
-
packageJson.devDependencies['@
|
|
54
|
-
delete packageJson.dependencies['@
|
|
52
|
+
if (packageJson.dependencies['@nx/vite']) {
|
|
53
|
+
packageJson.devDependencies['@nx/vite'] = packageJson.dependencies['@nx/vite'];
|
|
54
|
+
delete packageJson.dependencies['@nx/vite'];
|
|
55
55
|
}
|
|
56
56
|
return packageJson;
|
|
57
57
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n addDependenciesToPackageJson,\n convertNxGenerator,\n readJson,\n readNxJson,\n runTasksInSerial,\n Tree,\n updateJson,\n updateNxJson,\n} from '@nx/devkit';\n\nimport { initGenerator as jsInitGenerator } from '@nx/js';\n\nimport {\n jsdomVersion,\n nxVersion,\n vitePluginDtsVersion,\n vitePluginEslintVersion,\n vitePluginReactVersion,\n vitestUiVersion,\n vitestVersion,\n viteTsConfigPathsVersion,\n viteVersion,\n} from '../../utils/versions';\nimport { InitGeneratorSchema } from './schema';\n\nfunction checkDependenciesInstalled(host: Tree, schema: InitGeneratorSchema) {\n const packageJson = readJson(host, 'package.json');\n const devDependencies = {};\n const dependencies = {};\n packageJson.dependencies = packageJson.dependencies || {};\n packageJson.devDependencies = packageJson.devDependencies || {};\n\n // base deps\n devDependencies['@
|
|
1
|
+
{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n addDependenciesToPackageJson,\n convertNxGenerator,\n readJson,\n readNxJson,\n runTasksInSerial,\n Tree,\n updateJson,\n updateNxJson,\n} from '@nx/devkit';\n\nimport { initGenerator as jsInitGenerator } from '@nx/js';\n\nimport {\n jsdomVersion,\n nxVersion,\n vitePluginDtsVersion,\n vitePluginEslintVersion,\n vitePluginReactVersion,\n vitestUiVersion,\n vitestVersion,\n viteTsConfigPathsVersion,\n viteVersion,\n} from '../../utils/versions';\nimport { InitGeneratorSchema } from './schema';\n\nfunction checkDependenciesInstalled(host: Tree, schema: InitGeneratorSchema) {\n const packageJson = readJson(host, 'package.json');\n const devDependencies = {};\n const dependencies = {};\n packageJson.dependencies = packageJson.dependencies || {};\n packageJson.devDependencies = packageJson.devDependencies || {};\n\n // base deps\n devDependencies['@nx/vite'] = nxVersion;\n devDependencies['vite'] = viteVersion;\n devDependencies['vite-plugin-eslint'] = vitePluginEslintVersion;\n devDependencies['vite-tsconfig-paths'] = viteTsConfigPathsVersion;\n devDependencies['vitest'] = vitestVersion;\n devDependencies['@vitest/ui'] = vitestUiVersion;\n devDependencies['jsdom'] = jsdomVersion;\n\n if (schema.uiFramework === 'react') {\n devDependencies['@vitejs/plugin-react'] = vitePluginReactVersion;\n }\n\n if (schema.includeLib) {\n devDependencies['vite-plugin-dts'] = vitePluginDtsVersion;\n }\n\n return addDependenciesToPackageJson(host, dependencies, devDependencies);\n}\n\nfunction moveToDevDependencies(tree: Tree) {\n updateJson(tree, 'package.json', (packageJson) => {\n packageJson.dependencies = packageJson.dependencies || {};\n packageJson.devDependencies = packageJson.devDependencies || {};\n\n if (packageJson.dependencies['@nx/vite']) {\n packageJson.devDependencies['@nx/vite'] =\n packageJson.dependencies['@nx/vite'];\n delete packageJson.dependencies['@nx/vite'];\n }\n return packageJson;\n });\n}\n\nexport function createVitestConfig(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 nxJson.targetDefaults ??= {};\n nxJson.targetDefaults.test ??= {};\n nxJson.targetDefaults.test.inputs ??= [\n 'default',\n productionFileSet ? '^production' : '^default',\n ];\n\n updateNxJson(tree, nxJson);\n}\n\nexport async function initGenerator(tree: Tree, schema: InitGeneratorSchema) {\n moveToDevDependencies(tree);\n createVitestConfig(tree);\n const tasks = [];\n\n tasks.push(\n await jsInitGenerator(tree, {\n ...schema,\n skipFormat: true,\n })\n );\n\n tasks.push(checkDependenciesInstalled(tree, schema));\n return runTasksInSerial(...tasks);\n}\n\nexport default initGenerator;\nexport const initSchematic = convertNxGenerator(initGenerator);\n"],"names":["createVitestConfig","initGenerator","initSchematic","checkDependenciesInstalled","host","schema","packageJson","readJson","devDependencies","dependencies","nxVersion","viteVersion","vitePluginEslintVersion","viteTsConfigPathsVersion","vitestVersion","vitestUiVersion","jsdomVersion","uiFramework","vitePluginReactVersion","includeLib","vitePluginDtsVersion","addDependenciesToPackageJson","moveToDevDependencies","tree","updateJson","nxJson","readNxJson","productionFileSet","namedInputs","production","push","Array","from","Set","targetDefaults","test","inputs","updateNxJson","tasks","jsInitGenerator","skipFormat","runTasksInSerial","convertNxGenerator"],"mappings":";;;;;;;;IAmEgBA,kBAAkB;eAAlBA;;IAuBMC,aAAa;eAAbA;;IAgBtB,OAA6B;eAA7B;;IACaC,aAAa;eAAbA;;;;wBAlGN;oBAE0C;0BAY1C;AAGP,SAASC,2BAA2BC,IAAU,EAAEC,MAA2B,EAAE;IAC3E,MAAMC,cAAcC,IAAAA,gBAAQ,EAACH,MAAM;IACnC,MAAMI,kBAAkB,CAAC;IACzB,MAAMC,eAAe,CAAC;IACtBH,YAAYG,YAAY,GAAGH,YAAYG,YAAY,IAAI,CAAC;IACxDH,YAAYE,eAAe,GAAGF,YAAYE,eAAe,IAAI,CAAC;IAE9D,YAAY;IACZA,eAAe,CAAC,WAAW,GAAGE,mBAAS;IACvCF,eAAe,CAAC,OAAO,GAAGG,qBAAW;IACrCH,eAAe,CAAC,qBAAqB,GAAGI,iCAAuB;IAC/DJ,eAAe,CAAC,sBAAsB,GAAGK,kCAAwB;IACjEL,eAAe,CAAC,SAAS,GAAGM,uBAAa;IACzCN,eAAe,CAAC,aAAa,GAAGO,yBAAe;IAC/CP,eAAe,CAAC,QAAQ,GAAGQ,sBAAY;IAEvC,IAAIX,OAAOY,WAAW,KAAK,SAAS;QAClCT,eAAe,CAAC,uBAAuB,GAAGU,gCAAsB;IAClE,CAAC;IAED,IAAIb,OAAOc,UAAU,EAAE;QACrBX,eAAe,CAAC,kBAAkB,GAAGY,8BAAoB;IAC3D,CAAC;IAED,OAAOC,IAAAA,oCAA4B,EAACjB,MAAMK,cAAcD;AAC1D;AAEA,SAASc,sBAAsBC,IAAU,EAAE;IACzCC,IAAAA,kBAAU,EAACD,MAAM,gBAAgB,CAACjB,cAAgB;QAChDA,YAAYG,YAAY,GAAGH,YAAYG,YAAY,IAAI,CAAC;QACxDH,YAAYE,eAAe,GAAGF,YAAYE,eAAe,IAAI,CAAC;QAE9D,IAAIF,YAAYG,YAAY,CAAC,WAAW,EAAE;YACxCH,YAAYE,eAAe,CAAC,WAAW,GACrCF,YAAYG,YAAY,CAAC,WAAW;YACtC,OAAOH,YAAYG,YAAY,CAAC,WAAW;QAC7C,CAAC;QACD,OAAOH;IACT;AACF;AAEO,SAASN,mBAAmBuB,IAAU,EAAE;QAGnBE;QAU1BA,SACAA,wBACAA;IAdA,MAAMA,SAASC,IAAAA,kBAAU,EAACH;IAE1B,MAAMI,oBAAoBF,CAAAA,sBAAAA,OAAOG,WAAW,YAAlBH,KAAAA,IAAAA,oBAAoBI,UAAU;IACxD,IAAIF,mBAAmB;QACrBA,kBAAkBG,IAAI,CACpB,yDACA;QAGFL,OAAOG,WAAW,CAACC,UAAU,GAAGE,MAAMC,IAAI,CAAC,IAAIC,IAAIN;IACrD,CAAC;;IAEDF,oBAAAA,UAAAA,QAAOS,4CAAPT,QAAOS,iBAAmB,CAAC,CAAC;;IAC5BT,UAAAA,yBAAAA,OAAOS,cAAc,EAACC,wBAAtBV,uBAAsBU,OAAS,CAAC,CAAC;;IACjCV,YAAAA,8BAAAA,OAAOS,cAAc,CAACC,IAAI,EAACC,4BAA3BX,4BAA2BW,SAAW;QACpC;QACAT,oBAAoB,gBAAgB,UAAU;KAC/C;IAEDU,IAAAA,oBAAY,EAACd,MAAME;AACrB;AAEO,eAAexB,cAAcsB,IAAU,EAAElB,MAA2B,EAAE;IAC3EiB,sBAAsBC;IACtBvB,mBAAmBuB;IACnB,MAAMe,QAAQ,EAAE;IAEhBA,MAAMR,IAAI,CACR,MAAMS,IAAAA,iBAAe,EAAChB,MAAM,eACvBlB;QACHmC,YAAY,IAAI;;IAIpBF,MAAMR,IAAI,CAAC3B,2BAA2BoB,MAAMlB;IAC5C,OAAOoC,IAAAA,wBAAgB,KAAIH;AAC7B;MAEA,WAAerC;AACR,MAAMC,gBAAgBwC,IAAAA,0BAAkB,EAACzC"}
|
|
@@ -16,7 +16,7 @@ _export(exports, {
|
|
|
16
16
|
const _devkit = require("@nx/devkit");
|
|
17
17
|
const _executoroptionsutils = require("@nx/devkit/src/generators/executor-options-utils");
|
|
18
18
|
const _tsquery = require("@phenomnomnominal/tsquery");
|
|
19
|
-
const
|
|
19
|
+
const _js = require("@nx/js");
|
|
20
20
|
const _generatorutils = require("../../utils/generator-utils");
|
|
21
21
|
const ts = require("typescript");
|
|
22
22
|
async function removeProjectsFromViteTsConfigPaths(tree) {
|
|
@@ -40,7 +40,7 @@ function findAllProjectsWithViteConfig(tree) {
|
|
|
40
40
|
// We cannot assume that it's called tsConfigPaths
|
|
41
41
|
// So make sure it includes `projects` and `root`
|
|
42
42
|
if (defineConfigContentNode.getText().includes('projects') && defineConfigContentNode.getText().includes('root')) {
|
|
43
|
-
(0,
|
|
43
|
+
(0, _js.findNodes)(defineConfigContentNode, [
|
|
44
44
|
ts.SyntaxKind.PropertyAssignment
|
|
45
45
|
]).forEach((nodePA)=>{
|
|
46
46
|
if (nodePA.getText().startsWith('projects')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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/
|
|
1
|
+
{"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]?.getChildren().forEach((defineConfigContentNode) => {\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,EAAE;IACpEC,8BAA8BD;IAC9B,MAAME,IAAAA,mBAAW,EAACF;AACpB;MAEA,WAAeF;AAEf,SAASG,8BAA8BD,IAAU,EAAQ;IACvDG,IAAAA,4CAAsB,EAACH,MAAM,oBAAoB,CAACI,SAASC,UAAY;QACrE,MAAMC,uBAAuBC,IAAAA,gCAAwB,EAACP,MAAMK;QAC5D,MAAMG,aAAaC,IAAAA,mDAAmC,EACpDT,MACAM,qBAAqBI,IAAI,EACzBN,kBAAAA,KAAAA,IAAAA,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,uBAAAA,KAAAA,IAAAA,CAAAA,iBAAAA,YAAc,CAAC,EAAE,YAAjBA,KAAAA,IAAAA,eAAmBU,cAAcC,OAAO,CAAC,CAACC,0BAA4B;gBACpE,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,SAAW;wBACrB,IAAIA,OAAOL,OAAO,GAAGM,UAAU,CAAC,aAAa;4BAC3CX,kBAAkBU,OAAOE,QAAQ;4BACjCX,gBAAgBS,OAAOG,MAAM;wBAC/B,CAAC;oBACH;gBACF,CAAC;YACH,EAAE;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,CAAC;QACH,CAAC;IACH;AACF"}
|
|
@@ -59,6 +59,11 @@ function findExistingTargetsInProject(targets, userProvidedTargets) {
|
|
|
59
59
|
const supportedExecutors = {
|
|
60
60
|
build: [
|
|
61
61
|
'@nxext/vite:build',
|
|
62
|
+
'@nx/js:babel',
|
|
63
|
+
'@nx/js:swc',
|
|
64
|
+
'@nx/webpack:webpack',
|
|
65
|
+
'@nx/rollup:rollup',
|
|
66
|
+
'@nx/web:rollup',
|
|
62
67
|
'@nrwl/js:babel',
|
|
63
68
|
'@nrwl/js:swc',
|
|
64
69
|
'@nrwl/webpack:webpack',
|
|
@@ -67,19 +72,32 @@ function findExistingTargetsInProject(targets, userProvidedTargets) {
|
|
|
67
72
|
],
|
|
68
73
|
serve: [
|
|
69
74
|
'@nxext/vite:dev',
|
|
75
|
+
'@nx/webpack:dev-server',
|
|
70
76
|
'@nrwl/webpack:dev-server'
|
|
71
77
|
],
|
|
72
78
|
test: [
|
|
79
|
+
'@nx/jest:jest',
|
|
73
80
|
'@nrwl/jest:jest',
|
|
74
81
|
'@nxext/vitest:vitest'
|
|
75
82
|
]
|
|
76
83
|
};
|
|
77
84
|
const unsupportedExecutors = [
|
|
85
|
+
'@nx/angular:ng-packagr-lite',
|
|
86
|
+
'@nx/angular:package',
|
|
87
|
+
'@nx/angular:webpack-browser',
|
|
88
|
+
'@nx/esbuild:esbuild',
|
|
89
|
+
'@nx/react-native:run-ios',
|
|
90
|
+
'@nx/react-native:start',
|
|
91
|
+
'@nx/react-native:run-android',
|
|
92
|
+
'@nx/react-native:bundle',
|
|
93
|
+
'@nx/react-native:build-android',
|
|
94
|
+
'@nx/react-native:bundle',
|
|
95
|
+
'@nx/next:build',
|
|
96
|
+
'@nx/next:server',
|
|
97
|
+
'@nx/js:tsc',
|
|
78
98
|
'@nrwl/angular:ng-packagr-lite',
|
|
79
99
|
'@nrwl/angular:package',
|
|
80
100
|
'@nrwl/angular:webpack-browser',
|
|
81
|
-
'@angular-devkit/build-angular:browser',
|
|
82
|
-
'@angular-devkit/build-angular:dev-server',
|
|
83
101
|
'@nrwl/esbuild:esbuild',
|
|
84
102
|
'@nrwl/react-native:run-ios',
|
|
85
103
|
'@nrwl/react-native:start',
|
|
@@ -89,7 +107,9 @@ function findExistingTargetsInProject(targets, userProvidedTargets) {
|
|
|
89
107
|
'@nrwl/react-native:bundle',
|
|
90
108
|
'@nrwl/next:build',
|
|
91
109
|
'@nrwl/next:server',
|
|
92
|
-
'@nrwl/js:tsc'
|
|
110
|
+
'@nrwl/js:tsc',
|
|
111
|
+
'@angular-devkit/build-angular:browser',
|
|
112
|
+
'@angular-devkit/build-angular:dev-server'
|
|
93
113
|
];
|
|
94
114
|
// First, we check if the user has provided a target
|
|
95
115
|
// If they have, we check if the executor the target is using is supported
|
|
@@ -117,10 +137,10 @@ function findExistingTargetsInProject(targets, userProvidedTargets) {
|
|
|
117
137
|
var _hasViteTargets, _hasViteTargets1, _hasViteTargets2, _hasViteTargets3, _output;
|
|
118
138
|
const executorName = targets[target].executor;
|
|
119
139
|
const hasViteTargets = output.alreadyHasNxViteTargets;
|
|
120
|
-
(_hasViteTargets = hasViteTargets).build || (_hasViteTargets.build = executorName === '@nrwl/vite:build');
|
|
121
|
-
(_hasViteTargets1 = hasViteTargets).serve || (_hasViteTargets1.serve = executorName === '@nrwl/vite:dev-server');
|
|
122
|
-
(_hasViteTargets2 = hasViteTargets).test || (_hasViteTargets2.test = executorName === '@nrwl/vite:test');
|
|
123
|
-
(_hasViteTargets3 = hasViteTargets).preview || (_hasViteTargets3.preview = executorName === '@nrwl/vite:preview-server');
|
|
140
|
+
(_hasViteTargets = hasViteTargets).build || (_hasViteTargets.build = executorName === '@nx/vite:build' || executorName === '@nrwl/vite:build');
|
|
141
|
+
(_hasViteTargets1 = hasViteTargets).serve || (_hasViteTargets1.serve = executorName === '@nx/vite:dev-server' || executorName === '@nrwl/vite:dev-server');
|
|
142
|
+
(_hasViteTargets2 = hasViteTargets).test || (_hasViteTargets2.test = executorName === '@nx/vite:test' || executorName === '@nrwl/vite:test');
|
|
143
|
+
(_hasViteTargets3 = hasViteTargets).preview || (_hasViteTargets3.preview = executorName === '@nx/vite:preview-server' || executorName === '@nrwl/vite:preview-server');
|
|
124
144
|
const foundTargets = output.validFoundTargetName;
|
|
125
145
|
if (!foundTargets.build && supportedExecutors.build.includes(executorName)) {
|
|
126
146
|
foundTargets.build = target;
|
|
@@ -148,11 +168,11 @@ function addOrChangeTestTarget(tree, options, target) {
|
|
|
148
168
|
(_targets = (_project = project).targets) != null ? _targets : _project.targets = {};
|
|
149
169
|
if (project.targets[target]) {
|
|
150
170
|
var _project_targets_target_options;
|
|
151
|
-
project.targets[target].executor = '@
|
|
171
|
+
project.targets[target].executor = '@nx/vite:test';
|
|
152
172
|
(_project_targets_target_options = project.targets[target].options) == null ? void 0 : delete _project_targets_target_options.jestConfig;
|
|
153
173
|
} else {
|
|
154
174
|
project.targets[target] = {
|
|
155
|
-
executor: '@
|
|
175
|
+
executor: '@nx/vite:test',
|
|
156
176
|
outputs: [
|
|
157
177
|
coveragePath
|
|
158
178
|
],
|
|
@@ -178,10 +198,10 @@ function addOrChangeBuildTarget(tree, options, target) {
|
|
|
178
198
|
buildOptions.sourcemap = (_project_targets_target_options2 = project.targets[target].options) == null ? void 0 : _project_targets_target_options2.sourcemaps;
|
|
179
199
|
}
|
|
180
200
|
project.targets[target].options = _extends._({}, buildOptions);
|
|
181
|
-
project.targets[target].executor = '@
|
|
201
|
+
project.targets[target].executor = '@nx/vite:build';
|
|
182
202
|
} else {
|
|
183
203
|
project.targets[target] = {
|
|
184
|
-
executor: '@
|
|
204
|
+
executor: '@nx/vite:build',
|
|
185
205
|
outputs: [
|
|
186
206
|
'{options.outputPath}'
|
|
187
207
|
],
|
|
@@ -216,11 +236,11 @@ function addOrChangeServeTarget(tree, options, target) {
|
|
|
216
236
|
if (serveTarget.executor === '@nxext/vite:dev') {
|
|
217
237
|
serveOptions.proxyConfig = project.targets[target].options.proxyConfig;
|
|
218
238
|
}
|
|
219
|
-
serveTarget.executor = '@
|
|
239
|
+
serveTarget.executor = '@nx/vite:dev-server';
|
|
220
240
|
serveTarget.options = serveOptions;
|
|
221
241
|
} else {
|
|
222
242
|
project.targets[target] = {
|
|
223
|
-
executor: '@
|
|
243
|
+
executor: '@nx/vite:dev-server',
|
|
224
244
|
defaultConfiguration: 'development',
|
|
225
245
|
options: {
|
|
226
246
|
buildTarget: `${options.project}:build`
|
|
@@ -259,7 +279,7 @@ function addPreviewTarget(tree, options, serveTarget) {
|
|
|
259
279
|
}
|
|
260
280
|
// Adds a preview target.
|
|
261
281
|
project.targets.preview = {
|
|
262
|
-
executor: '@
|
|
282
|
+
executor: '@nx/vite:preview-server',
|
|
263
283
|
defaultConfiguration: 'development',
|
|
264
284
|
options: previewOptions,
|
|
265
285
|
configurations: {
|
|
@@ -481,7 +501,7 @@ function getViteConfigPathForProject(tree, projectName, target) {
|
|
|
481
501
|
viteConfigPath = targets == null ? void 0 : (_targets_target = targets[target]) == null ? void 0 : (_targets_target_options = _targets_target.options) == null ? void 0 : _targets_target_options.configFile;
|
|
482
502
|
} else {
|
|
483
503
|
var _config_options;
|
|
484
|
-
const config = Object.values(targets).find((config)=>config.executor === '@nrwl/vite:build');
|
|
504
|
+
const config = Object.values(targets).find((config)=>config.executor === '@nrwl/nx:build' || config.executor === '@nrwl/vite:build');
|
|
485
505
|
viteConfigPath = config == null ? void 0 : (_config_options = config.options) == null ? void 0 : _config_options.configFile;
|
|
486
506
|
}
|
|
487
507
|
return normalizeViteConfigFilePathWithTree(tree, root, viteConfigPath);
|
|
@@ -498,7 +518,7 @@ async function handleUnsupportedUserProvidedTargets(userProvidedTargetIsUnsuppor
|
|
|
498
518
|
}
|
|
499
519
|
}
|
|
500
520
|
async function handleUnsupportedUserProvidedTargetsErrors(userProvidedTargetName, validFoundTargetName, target, executor) {
|
|
501
|
-
_devkit.logger.warn(`The custom ${target} target you provided (${userProvidedTargetName}) cannot be converted to use the @
|
|
521
|
+
_devkit.logger.warn(`The custom ${target} target you provided (${userProvidedTargetName}) cannot be converted to use the @nx/vite:${executor} executor.
|
|
502
522
|
However, we found the following ${target} target in your project that can be converted: ${validFoundTargetName}
|
|
503
523
|
|
|
504
524
|
Please note that converting a potentially non-compatible project to use Vite.js may result in unexpected behavior. Always commit
|
|
@@ -507,12 +527,12 @@ async function handleUnsupportedUserProvidedTargetsErrors(userProvidedTargetName
|
|
|
507
527
|
const { Confirm } = require('enquirer');
|
|
508
528
|
const prompt = new Confirm({
|
|
509
529
|
name: 'question',
|
|
510
|
-
message: `Should we convert the ${validFoundTargetName} target to use the @
|
|
530
|
+
message: `Should we convert the ${validFoundTargetName} target to use the @nx/vite:${executor} executor?`,
|
|
511
531
|
initial: true
|
|
512
532
|
});
|
|
513
533
|
const shouldConvert = await prompt.run();
|
|
514
534
|
if (!shouldConvert) {
|
|
515
|
-
throw new Error(`The ${target} target ${userProvidedTargetName} cannot be converted to use the @
|
|
535
|
+
throw new Error(`The ${target} target ${userProvidedTargetName} cannot be converted to use the @nx/vite:${executor} executor.
|
|
516
536
|
Please try again, either by providing a different ${target} target or by not providing a target at all (Nx will
|
|
517
537
|
convert the first one it finds, most probably this one: ${validFoundTargetName})
|
|
518
538
|
|
|
@@ -524,25 +544,25 @@ async function handleUnsupportedUserProvidedTargetsErrors(userProvidedTargetName
|
|
|
524
544
|
async function handleUnknownExecutors(projectName) {
|
|
525
545
|
_devkit.logger.warn(`
|
|
526
546
|
We could not find any targets in project ${projectName} that use executors which
|
|
527
|
-
can be converted to the @
|
|
547
|
+
can be converted to the @nx/vite executors.
|
|
528
548
|
|
|
529
549
|
This either means that your project may not have a target
|
|
530
550
|
for building, serving, or testing at all, or that your targets are
|
|
531
551
|
using executors that are not known to Nx.
|
|
532
552
|
|
|
533
|
-
If you still want to convert your project to use the @
|
|
553
|
+
If you still want to convert your project to use the @nx/vite executors,
|
|
534
554
|
please make sure to commit your changes before running this generator.
|
|
535
555
|
`);
|
|
536
556
|
const { Confirm } = require('enquirer');
|
|
537
557
|
const prompt = new Confirm({
|
|
538
558
|
name: 'question',
|
|
539
|
-
message: `Should Nx convert your project to use the @
|
|
559
|
+
message: `Should Nx convert your project to use the @nx/vite executors?`,
|
|
540
560
|
initial: true
|
|
541
561
|
});
|
|
542
562
|
const shouldConvert = await prompt.run();
|
|
543
563
|
if (!shouldConvert) {
|
|
544
564
|
throw new Error(`
|
|
545
|
-
Nx could not verify that the executors you are using can be converted to the @
|
|
565
|
+
Nx could not verify that the executors you are using can be converted to the @nx/vite executors.
|
|
546
566
|
Please try again with a different project.
|
|
547
567
|
`);
|
|
548
568
|
}
|