@nx/vite 22.1.0-beta.2 → 22.1.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "22.1.0-beta.2",
+  "version": "22.1.0-beta.4",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -30,10 +30,10 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.1.0-beta.2",
+    "@nx/devkit": "22.1.0-beta.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "enquirer": "~2.3.6",
-    "@nx/js": "22.1.0-beta.2",
+    "@nx/js": "22.1.0-beta.4",
     "picomatch": "4.0.2",
     "tsconfig-paths": "^4.1.2",
     "semver": "^7.6.3",
@@ -41,7 +41,7 @@
     "ajv": "^8.0.0"
   },
   "devDependencies": {
-    "nx": "22.1.0-beta.2"
+    "nx": "22.1.0-beta.4"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EASd,MAAM,YAAY,CAAC;AAgBpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAiBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAuGxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAQd,MAAM,YAAY,CAAC;AAgBpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAiBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAuGxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -105,6 +105,18 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
     catch {
         // do nothing
     }
+    // Workaround for race condition with ESM-only Vite plugins (e.g. @vitejs/plugin-vue@6+)
+    // If vite.config.ts is compiled as CJS, then when both require('@vitejs/plugin-vue') and import('@vitejs/plugin-vue')
+    // are pending in the same process, Node will throw an error:
+    // Error [ERR_INTERNAL_ASSERTION]: Cannot require() ES Module @vitejs/plugin-vue/dist/index.js because it is not yet fully loaded.
+    // This may be caused by a race condition if the module is simultaneously dynamically import()-ed via Promise.all().
+    try {
+        const importVuePlugin = () => new Function('return import("@vitejs/plugin-vue")')();
+        await importVuePlugin();
+    }
+    catch {
+        // Plugin not installed or not needed, ignore
+    }
     const { resolveConfig } = await (0, executor_utils_1.loadViteDynamicImport)();
     const viteBuildConfig = await resolveConfig({
         configFile: absoluteConfigFilePath,
@@ -126,7 +138,7 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
                     [groupName]: targetGroup,
                 },
             };
-            const projectRootRelativeTestPaths = await getTestPathsRelativeToProjectRoot(projectRoot);
+            const projectRootRelativeTestPaths = await getTestPathsRelativeToProjectRoot(projectRoot, context.workspaceRoot);
             for (const relativePath of projectRootRelativeTestPaths) {
                 if (relativePath.includes('../')) {
                     throw new Error('@nx/vite/plugin attempted to run tests outside of the project root. This is not supported and should not happen. Please open an issue at https://github.com/nrwl/nx/issues/new/choose with the following information:\n\n' +
@@ -450,8 +462,8 @@ function checkIfConfigFileShouldBeProject(projectRoot, context) {
     }
     return true;
 }
-async function getTestPathsRelativeToProjectRoot(projectRoot) {
-    const fullProjectRoot = (0, node_path_1.join)(devkit_1.workspaceRoot, projectRoot);
+async function getTestPathsRelativeToProjectRoot(projectRoot, workspaceRoot) {
+    const fullProjectRoot = (0, node_path_1.join)(workspaceRoot, projectRoot);
     const { createVitest } = await Promise.resolve().then(() => require('vitest/node'));
     const vitest = await createVitest('test', {
         dir: fullProjectRoot,
@@ -459,5 +471,7 @@ async function getTestPathsRelativeToProjectRoot(projectRoot) {
         watch: false,
     });
     const relevantTestSpecifications = await vitest.getRelevantTestSpecifications();
-    return relevantTestSpecifications.map((ts) => (0, node_path_1.relative)(projectRoot, ts.moduleId));
+    return relevantTestSpecifications
+        .filter((ts) => projectRoot === '.' ? true : ts.moduleId.startsWith(fullProjectRoot))
+        .map((ts) => (0, node_path_1.relative)(projectRoot, ts.moduleId));
 }