nuxt-nightly 4.1.1-29281685.c73957ae → 4.1.1-29282072.39113ab4

package/dist/index.mjs

@@ -35,7 +35,6 @@ import { splitByCase, kebabCase, pascalCase, camelCase } from 'scule';
 import { createUnplugin } from 'unplugin';
 import { findStaticImports, findExports, parseStaticImport, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
 import MagicString from 'magic-string';
-import { stripLiteral } from 'strip-literal';
 import { unheadVueComposablesImports } from '@unhead/vue';
 import { defineUnimportPreset, createUnimport, toExports, scanDirExports } from 'unimport';
 import { glob } from 'tinyglobby';
@@ -1105,8 +1104,6 @@ function resolveEnd(node) {
   return "fnNode" in node ? node.fnNode.end : node.end;
 }
 
-const INJECTION_RE_TEMPLATE = /\b_ctx\.\$route\b/g;
-const INJECTION_RE_SCRIPT = /\bthis\.\$route\b/g;
 const INJECTION_SINGLE_RE = /\bthis\.\$route\b|\b_ctx\.\$route\b/;
 const RouteInjectionPlugin = (nuxt) => createUnplugin(() => {
   return {
@@ -1117,29 +1114,30 @@ const RouteInjectionPlugin = (nuxt) => createUnplugin(() => {
     },
     transform: {
       filter: {
-        code: { include: INJECTION_SINGLE_RE }
-      },
-      handler(code) {
-        if (code.includes("_ctx._.provides[__nuxt_route_symbol") || code.includes("this._.provides[__nuxt_route_symbol")) {
-          return;
+        code: {
+          include: INJECTION_SINGLE_RE,
+          exclude: [
+            `_ctx._.provides[__nuxt_route_symbol`,
+            "this._.provides[__nuxt_route_symbol"
+          ]
         }
-        let replaced = false;
+      },
+      handler(code, id) {
         const s = new MagicString(code);
-        const strippedCode = stripLiteral(code);
-        const replaceMatches = (regExp, replacement) => {
-          for (const match of strippedCode.matchAll(regExp)) {
-            const start = match.index;
-            const end = start + match[0].length;
-            s.overwrite(start, end, replacement);
-            replaced ||= true;
+        parseAndWalk(code, id, (node) => {
+          if (node.type !== "MemberExpression") {
+            return;
           }
-        };
-        replaceMatches(INJECTION_RE_TEMPLATE, "(_ctx._.provides[__nuxt_route_symbol] || _ctx.$route)");
-        replaceMatches(INJECTION_RE_SCRIPT, "(this._.provides[__nuxt_route_symbol] || this.$route)");
-        if (replaced) {
-          s.prepend("import { PageRouteSymbol as __nuxt_route_symbol } from '#app/components/injections';\n");
-        }
+          if (node.object.type === "ThisExpression" && node.property.type === "Identifier" && node.property.name === "$route") {
+            s.overwrite(node.start, node.end, "(this._.provides[__nuxt_route_symbol] || this.$route)");
+            return;
+          }
+          if (node.object.type === "Identifier" && node.object.name === "_ctx" && node.property.type === "Identifier" && node.property.name === "$route") {
+            s.overwrite(node.start, node.end, "(_ctx._.provides[__nuxt_route_symbol] || _ctx.$route)");
+          }
+        });
         if (s.hasChanged()) {
+          s.prepend("import { PageRouteSymbol as __nuxt_route_symbol } from '#app/components/injections';\n");
           return {
             code: s.toString(),
             map: nuxt.options.sourcemap.client || nuxt.options.sourcemap.server ? s.generateMap({ hires: true }) : void 0
@@ -3757,7 +3755,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.1.1-29281685.c73957ae";
+const version = "4.1.1-29282072.39113ab4";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];
@@ -3830,10 +3828,10 @@ const UnctxTransformPlugin = (options) => createUnplugin(() => {
 });
 
 const TreeShakeComposablesPlugin = (options) => createUnplugin(() => {
-  const composableNames = Object.values(options.composables).flat();
-  const regexp = `(^\\s*)(${composableNames.join("|")})(?=\\((?!\\) \\{))`;
-  const COMPOSABLE_RE = new RegExp(regexp, "m");
-  const COMPOSABLE_RE_GLOBAL = new RegExp(regexp, "gm");
+  const allComposableNames = new Set(Object.values(options.composables).flat());
+  if (!allComposableNames.size) {
+    return [];
+  }
   return {
     name: "nuxt:tree-shake-composables:transform",
     enforce: "post",
@@ -3842,14 +3840,44 @@ const TreeShakeComposablesPlugin = (options) => createUnplugin(() => {
     },
     transform: {
       filter: {
-        code: { include: COMPOSABLE_RE }
+        code: { include: new RegExp(`\\b(?:${[...allComposableNames].map((r) => escapeRE(r)).join("|")})\\b`) }
       },
-      handler(code) {
+      handler(code, id) {
         const s = new MagicString(code);
-        const strippedCode = stripLiteral(code);
-        for (const match of strippedCode.matchAll(COMPOSABLE_RE_GLOBAL)) {
-          s.overwrite(match.index, match.index + match[0].length, `${match[1]} false && /*@__PURE__*/ ${match[2]}`);
-        }
+        const scopeTracker = new ScopeTracker({ preserveExitedScopes: true });
+        const parseResult = parseAndWalk(code, id, {
+          scopeTracker
+        });
+        scopeTracker.freeze();
+        walk(parseResult.program, {
+          scopeTracker,
+          enter(node) {
+            if (node.type !== "CallExpression" || node.callee.type !== "Identifier") {
+              return;
+            }
+            const functionName = node.callee.name;
+            const scopeTrackerNode = scopeTracker.getDeclaration(functionName);
+            if (scopeTrackerNode) {
+              if (scopeTrackerNode.type !== "Import") {
+                return;
+              }
+              if (scopeTrackerNode.importNode.type !== "ImportDeclaration") {
+                return;
+              }
+              const importPath = scopeTrackerNode.importNode.source.value;
+              const importSpecifier = scopeTrackerNode.node;
+              const importedName = importSpecifier.type === "ImportSpecifier" && importSpecifier.imported.type === "Identifier" ? importSpecifier.imported.name : importSpecifier.local.name;
+              const isFromAllowedPath = importPath === "#imports" ? allComposableNames.has(importedName) : options.composables[importPath]?.includes(importedName);
+              if (!isFromAllowedPath) {
+                return;
+              }
+            }
+            if (!scopeTrackerNode && !allComposableNames.has(functionName)) {
+              return;
+            }
+            s.overwrite(node.start, node.end, ` false && /*@__PURE__*/ ${functionName}${code.slice(node.callee.end, node.end)}`);
+          }
+        });
         if (s.hasChanged()) {
           return {
             code: s.toString(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.1.1-29281685.c73957ae",
+  "version": "4.1.1-29282072.39113ab4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -67,10 +67,10 @@
     "@nuxt/cli": "npm:@nuxt/cli-nightly@latest",
     "@nuxt/devalue": "^2.0.2",
     "@nuxt/devtools": "^2.6.3",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.1-29281685.c73957ae",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.1-29281685.c73957ae",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.1-29282072.39113ab4",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.1-29282072.39113ab4",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.1-29281685.c73957ae",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.1-29282072.39113ab4",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.20",
     "c12": "^3.2.0",
@@ -113,7 +113,6 @@
     "scule": "^1.3.0",
     "semver": "^7.7.2",
     "std-env": "^3.9.0",
-    "strip-literal": "^3.0.0",
     "tinyglobby": "0.2.14",
     "ufo": "^1.6.1",
     "ultrahtml": "^1.6.0",