@jsenv/core 39.14.2 → 40.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.14.2",
+  "version": "40.0.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -36,12 +36,13 @@
   "volta": {
     "node": "22.13.1"
   },
+  "packageManager": "npm@10.9.2",
   "workspaces": [
     "./packages/independent/*",
     "./packages/independent/backend/*",
     "./packages/independent/frontend/*",
     "./packages/independent/tooling/*",
-    "./packages/independent/universal/*",
+    "./packages/independent/shared/*",
     "./packages/internal/*",
     "./packages/related/*",
     "./packages/related/cli/*"
@@ -64,31 +65,32 @@
     "test:ci": "CI=1 npm run test",
     "test:packages:ci": "CI=1 npm run workspace:test",
     "test:only_dev_server_errors": "node --conditions=development ./tests/dev_server/errors/dev_errors_snapshots.test.mjs",
-    "dev": "node --conditions=development ./scripts/dev/dev.mjs",
+    "dev": "node --watch --conditions=development ./scripts/dev/dev.mjs",
+    "dev:route-inspector": "node --watch --conditions=development ./packages/independent/backend/server/tests/route_inspector/start_server.js",
     "playwright:install": "npx playwright install-deps && npx playwright install",
     "https:setup": "npx @jsenv/https-local setup",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
-    "@jsenv/abort": "4.3.0",
-    "@jsenv/ast": "6.5.2",
-    "@jsenv/filesystem": "4.13.4",
-    "@jsenv/humanize": "1.2.8",
+    "@jsenv/abort": "4.3.1",
+    "@jsenv/ast": "6.6.0",
+    "@jsenv/filesystem": "4.14.0",
+    "@jsenv/humanize": "1.3.0",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.2",
-    "@jsenv/js-module-fallback": "1.3.59",
-    "@jsenv/node-esm-resolution": "1.0.7",
-    "@jsenv/plugin-bundling": "2.7.25",
-    "@jsenv/plugin-minification": "1.5.13",
-    "@jsenv/plugin-supervisor": "1.6.6",
-    "@jsenv/plugin-transpilation": "1.4.95",
-    "@jsenv/runtime-compat": "1.3.1",
-    "@jsenv/server": "15.5.2",
-    "@jsenv/sourcemap": "1.2.30",
-    "@jsenv/url-meta": "8.5.3",
-    "@jsenv/urls": "2.6.0",
-    "@jsenv/utils": "2.1.2",
+    "@jsenv/js-module-fallback": "1.4.0",
+    "@jsenv/node-esm-resolution": "1.1.0",
+    "@jsenv/plugin-bundling": "2.8.0",
+    "@jsenv/plugin-minification": "1.6.0",
+    "@jsenv/plugin-supervisor": "1.6.7",
+    "@jsenv/plugin-transpilation": "1.5.0",
+    "@jsenv/runtime-compat": "1.3.3",
+    "@jsenv/server": "16.0.0",
+    "@jsenv/sourcemap": "1.3.0",
+    "@jsenv/url-meta": "8.5.4",
+    "@jsenv/urls": "2.6.1",
+    "@jsenv/utils": "2.2.0",
     "string-width": "7.2.0"
   },
   "devDependencies": {
@@ -104,6 +106,7 @@
     "@jsenv/monorepo": "workspace:*",
     "@jsenv/performance-impact": "workspace:*",
     "@jsenv/plugin-as-js-classic": "workspace:*",
+    "@jsenv/router": "workspace:*",
     "@jsenv/snapshot": "workspace:*",
     "@jsenv/test": "workspace:*",
     "@playwright/browser-chromium": "1.50.0",

package/src/build/build.js

@@ -21,6 +21,7 @@ import { parseHtml, stringifyHtmlAst } from "@jsenv/ast";
 import {
   assertAndNormalizeDirectoryUrl,
   ensureEmptyDirectory,
+  lookupPackageDirectory,
   writeFileSync,
 } from "@jsenv/filesystem";
 import { createLogger, createTaskLog } from "@jsenv/humanize";
@@ -28,7 +29,6 @@ import { jsenvPluginBundling } from "@jsenv/plugin-bundling";
 import { jsenvPluginMinification } from "@jsenv/plugin-minification";
 import { jsenvPluginJsModuleFallback } from "@jsenv/plugin-transpilation";
 import { urlIsInsideOf } from "@jsenv/urls";
-import { lookupPackageDirectory } from "../helpers/lookup_package_directory.js";
 import { watchSourceFiles } from "../helpers/watch_source_files.js";
 import { jsenvCoreDirectoryUrl } from "../jsenv_core_directory_url.js";
 import { createKitchen } from "../kitchen/kitchen.js";
@@ -36,6 +36,10 @@ import { createUrlGraphSummary } from "../kitchen/url_graph/url_graph_report.js"
 import { GRAPH_VISITOR } from "../kitchen/url_graph/url_graph_visitor.js";
 import { jsenvPluginDirectoryReferenceEffect } from "../plugins/directory_reference_effect/jsenv_plugin_directory_reference_effect.js";
 import { jsenvPluginInlining } from "../plugins/inlining/jsenv_plugin_inlining.js";
+import {
+  createPluginController,
+  createPluginStore,
+} from "../plugins/plugin_controller.js";
 import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginReferenceAnalysis } from "../plugins/reference_analysis/jsenv_plugin_reference_analysis.js";
 import { createBuildSpecifierManager } from "./build_specifier_manager.js";
@@ -300,46 +304,52 @@ build ${entryPointKeys.length} entry points`);
       build: true,
       runtimeCompat,
       initialContext: contextSharedDuringBuild,
-      plugins: [
-        ...plugins,
-        ...(bundling ? [jsenvPluginBundling(bundling)] : []),
-        ...(minification ? [jsenvPluginMinification(minification)] : []),
-        {
-          appliesDuring: "build",
-          fetchUrlContent: (urlInfo) => {
-            if (urlInfo.firstReference.original) {
-              rawRedirections.set(
-                urlInfo.firstReference.original.url,
-                urlInfo.firstReference.url,
-              );
-            }
-          },
-        },
-        ...getCorePlugins({
-          rootDirectoryUrl: sourceDirectoryUrl,
-          runtimeCompat,
-          referenceAnalysis,
-          nodeEsmResolution,
-          magicExtensions,
-          magicDirectoryIndex,
-          directoryReferenceEffect,
-          injections,
-          transpilation: {
-            babelHelpersAsImport: !explicitJsModuleConversion,
-            ...transpilation,
-            jsModuleFallback: false,
-          },
-          inlining: false,
-          http,
-          scenarioPlaceholders,
-        }),
-      ],
       sourcemaps,
       sourcemapsSourcesContent,
       outDirectoryUrl: outDirectoryUrl
         ? new URL("craft/", outDirectoryUrl)
         : undefined,
     });
+    const rawPluginStore = createPluginStore([
+      ...plugins,
+      ...(bundling ? [jsenvPluginBundling(bundling)] : []),
+      ...(minification ? [jsenvPluginMinification(minification)] : []),
+      {
+        appliesDuring: "build",
+        fetchUrlContent: (urlInfo) => {
+          if (urlInfo.firstReference.original) {
+            rawRedirections.set(
+              urlInfo.firstReference.original.url,
+              urlInfo.firstReference.url,
+            );
+          }
+        },
+      },
+      ...getCorePlugins({
+        rootDirectoryUrl: sourceDirectoryUrl,
+        runtimeCompat,
+        referenceAnalysis,
+        nodeEsmResolution,
+        magicExtensions,
+        magicDirectoryIndex,
+        directoryReferenceEffect,
+        injections,
+        transpilation: {
+          babelHelpersAsImport: !explicitJsModuleConversion,
+          ...transpilation,
+          jsModuleFallback: false,
+        },
+        inlining: false,
+        http,
+        scenarioPlaceholders,
+      }),
+    ]);
+    const rawPluginController = createPluginController(
+      rawPluginStore,
+      rawKitchen,
+    );
+    rawKitchen.setPluginController(rawPluginController);
+
     craft: {
       const generateSourceGraph = createBuildTask("generate source graph");
       try {
@@ -384,37 +394,6 @@ build ${entryPointKeys.length} entry points`);
       build: true,
       runtimeCompat,
       initialContext: contextSharedDuringBuild,
-      initialPluginsMeta: rawKitchen.pluginController.pluginsMeta,
-      plugins: [
-        jsenvPluginReferenceAnalysis({
-          ...referenceAnalysis,
-          fetchInlineUrls: false,
-          // inlineContent: false,
-        }),
-        jsenvPluginDirectoryReferenceEffect(directoryReferenceEffect),
-        ...(lineBreakNormalization
-          ? [jsenvPluginLineBreakNormalization()]
-          : []),
-        jsenvPluginJsModuleFallback({
-          remapImportSpecifier: (specifier, parentUrl) => {
-            return buildSpecifierManager.remapPlaceholder(specifier, parentUrl);
-          },
-        }),
-        jsenvPluginInlining(),
-        {
-          name: "jsenv:optimize",
-          appliesDuring: "build",
-          transformUrlContent: async (urlInfo) => {
-            await rawKitchen.pluginController.callAsyncHooks(
-              "optimizeUrlContent",
-              urlInfo,
-              (optimizeReturnValue) => {
-                urlInfo.mutateContent(optimizeReturnValue);
-              },
-            );
-          },
-        },
-      ],
       sourcemaps,
       sourcemapsComment: "relative",
       sourcemapsSourcesContent,
@@ -422,7 +401,6 @@ build ${entryPointKeys.length} entry points`);
         ? new URL("shape/", outDirectoryUrl)
         : undefined,
     });
-
     const buildSpecifierManager = createBuildSpecifierManager({
       rawKitchen,
       finalKitchen,
@@ -443,9 +421,43 @@ build ${entryPointKeys.length} entry points`);
         }) &&
         rawKitchen.context.isSupportedOnCurrentClients("importmap"),
     });
-    finalKitchen.pluginController.pushPlugin(
+    const finalPluginStore = createPluginStore([
+      jsenvPluginReferenceAnalysis({
+        ...referenceAnalysis,
+        fetchInlineUrls: false,
+        // inlineContent: false,
+      }),
+      jsenvPluginDirectoryReferenceEffect(directoryReferenceEffect),
+      ...(lineBreakNormalization ? [jsenvPluginLineBreakNormalization()] : []),
+      jsenvPluginJsModuleFallback({
+        remapImportSpecifier: (specifier, parentUrl) => {
+          return buildSpecifierManager.remapPlaceholder(specifier, parentUrl);
+        },
+      }),
+      jsenvPluginInlining(),
+      {
+        name: "jsenv:optimize",
+        appliesDuring: "build",
+        transformUrlContent: async (urlInfo) => {
+          await rawKitchen.pluginController.callAsyncHooks(
+            "optimizeUrlContent",
+            urlInfo,
+            (optimizeReturnValue) => {
+              urlInfo.mutateContent(optimizeReturnValue);
+            },
+          );
+        },
+      },
       buildSpecifierManager.jsenvPluginMoveToBuildDirectory,
+    ]);
+    const finalPluginController = createPluginController(
+      finalPluginStore,
+      finalKitchen,
+      {
+        initialPuginsMeta: rawKitchen.pluginController.pluginsMeta,
+      },
     );
+    finalKitchen.setPluginController(finalPluginController);
 
     const bundlers = {};
     bundle: {
@@ -613,27 +625,16 @@ build ${entryPointKeys.length} entry points`);
 
     refine: {
       finalKitchen.context.buildStep = "refine";
+
+      const htmlRefineSet = new Set();
+      const registerHtmlRefine = (htmlRefine) => {
+        htmlRefineSet.add(htmlRefine);
+      };
+
       replace_placeholders: {
         await buildSpecifierManager.replacePlaceholders();
       }
-      cleanup_jsenv_attributes_from_html: {
-        GRAPH_VISITOR.forEach(finalKitchen.graph, (urlInfo) => {
-          if (!urlInfo.url.startsWith("file:")) {
-            return;
-          }
-          if (urlInfo.type === "html") {
-            const htmlAst = parseHtml({
-              html: urlInfo.content,
-              url: urlInfo.url,
-              storeOriginalPositions: false,
-            });
-            urlInfo.content = stringifyHtmlAst(htmlAst, {
-              cleanupJsenvAttributes: true,
-              cleanupPositionAttributes: true,
-            });
-          }
-        });
-      }
+
       /*
        * Update <link rel="preload"> and friends after build (once we know everything)
        * - Used to remove resource hint targeting an url that is no longer used:
@@ -641,14 +642,42 @@ build ${entryPointKeys.length} entry points`);
        *   - because of import assertions transpilation (file is inlined into JS)
        */
       resync_resource_hints: {
-        const resync = buildSpecifierManager.prepareResyncResourceHints();
-        if (resync) {
-          const resyncTask = createBuildTask("resync resource hints");
-          resync();
-          buildOperation.throwIfAborted();
-          resyncTask.done();
-        }
+        buildSpecifierManager.prepareResyncResourceHints({
+          registerHtmlRefine,
+        });
+      }
+
+      mutate_html: {
+        GRAPH_VISITOR.forEach(finalKitchen.graph, (urlInfo) => {
+          if (!urlInfo.url.startsWith("file:")) {
+            return;
+          }
+          if (urlInfo.type !== "html") {
+            return;
+          }
+          const htmlAst = parseHtml({
+            html: urlInfo.content,
+            url: urlInfo.url,
+            storeOriginalPositions: false,
+          });
+          for (const htmlRefine of htmlRefineSet) {
+            const htmlMutationCallbackSet = new Set();
+            const registerHtmlMutation = (callback) => {
+              htmlMutationCallbackSet.add(callback);
+            };
+            htmlRefine(htmlAst, { registerHtmlMutation });
+            for (const htmlMutationCallback of htmlMutationCallbackSet) {
+              htmlMutationCallback();
+            }
+          }
+          // cleanup jsenv attributes from html as a last step
+          urlInfo.content = stringifyHtmlAst(htmlAst, {
+            cleanupJsenvAttributes: true,
+            cleanupPositionAttributes: true,
+          });
+        });
       }
+
       inject_urls_in_service_workers: {
         const inject = buildSpecifierManager.prepareServiceWorkerUrlInjection();
         if (inject) {