@jsenv/core 30.3.1 → 30.3.2

package/dist/main.js

@@ -16,7 +16,7 @@ import { Readable, Stream, Writable } from "node:stream";
 import { Http2ServerResponse } from "node:http2";
 import { lookup } from "node:dns";
 import { SOURCEMAP, generateSourcemapFileUrl, composeTwoSourcemaps, generateSourcemapDataUrl, createMagicSource, getOriginalPosition } from "@jsenv/sourcemap";
-import { parseHtmlString, stringifyHtmlAst, getHtmlNodeAttribute, visitHtmlNodes, analyzeScriptNode, setHtmlNodeAttributes, parseSrcSet, getHtmlNodePosition, getHtmlNodeAttributePosition, applyPostCss, postCssPluginUrlVisitor, parseJsUrls, getHtmlNodeText, setHtmlNodeText, applyBabelPlugins, injectScriptNodeAsEarlyAsPossible, createHtmlNode, findHtmlNode, removeHtmlNode, removeHtmlNodeText, injectJsImport, analyzeLinkNode, injectHtmlNode, insertHtmlNodeAfter } from "@jsenv/ast";
+import { parseHtmlString, stringifyHtmlAst, getHtmlNodeAttribute, visitHtmlNodes, analyzeScriptNode, setHtmlNodeAttributes, parseSrcSet, getHtmlNodePosition, getHtmlNodeAttributePosition, parseCssUrls, parseJsUrls, getHtmlNodeText, setHtmlNodeText, applyBabelPlugins, injectScriptNodeAsEarlyAsPossible, createHtmlNode, findHtmlNode, removeHtmlNode, removeHtmlNodeText, injectJsImport, analyzeLinkNode, injectHtmlNode, insertHtmlNodeAfter } from "@jsenv/ast";
 import { createRequire } from "node:module";
 import babelParser from "@babel/parser";
 import { bundleJsModules } from "@jsenv/plugin-bundling";
@@ -9668,21 +9668,22 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
     url,
     htmlAst
   });
-  const actions = [];
   const mutations = [];
-  mentions.forEach(({
-    type,
-    subtype,
-    expectedType,
-    line,
-    column,
-    originalLine,
-    originalColumn,
-    node,
-    attributeName,
-    debug,
-    specifier
-  }) => {
+  const actions = [];
+  for (const mention of mentions) {
+    const {
+      type,
+      subtype,
+      expectedType,
+      line,
+      column,
+      originalLine,
+      originalColumn,
+      node,
+      attributeName,
+      debug,
+      specifier
+    } = mention;
     const {
       crossorigin,
       integrity
@@ -9704,13 +9705,13 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
     });
     actions.push(async () => {
       await context.referenceUtils.readGeneratedSpecifier(reference);
-    });
-    mutations.push(() => {
-      setHtmlNodeAttributes(node, {
-        [attributeName]: reference.generatedSpecifier
+      mutations.push(() => {
+        setHtmlNodeAttributes(node, {
+          [attributeName]: reference.generatedSpecifier
+        });
       });
     });
-  });
+  }
   if (actions.length > 0) {
     await Promise.all(actions.map(action => action()));
   }
@@ -9958,40 +9959,33 @@ const decideLinkExpectedType = (linkMention, mentions) => {
  * https://github.com/parcel-bundler/parcel/blob/v2/packages/transformers/css/src/CSSTransformer.js
  */
 const parseAndTransformCssUrls = async (urlInfo, context) => {
+  const cssUrls = await parseCssUrls({
+    css: urlInfo.content,
+    url: urlInfo.originalUrl
+  });
   const actions = [];
   const magicSource = createMagicSource(urlInfo.content);
-  await applyPostCss({
-    sourcemaps: false,
-    plugins: [postCssPluginUrlVisitor({
-      urlVisitor: ({
-        type,
-        specifier,
-        specifierStart,
-        specifierEnd,
-        specifierLine,
-        specifierColumn
-      }) => {
-        const [reference] = context.referenceUtils.found({
-          type: `css_${type}`,
-          specifier,
-          specifierStart,
-          specifierEnd,
-          specifierLine,
-          specifierColumn
-        });
-        actions.push(async () => {
-          magicSource.replace({
-            start: specifierStart,
-            end: specifierEnd,
-            replacement: await context.referenceUtils.readGeneratedSpecifier(reference)
-          });
-        });
-      }
-    })],
-    url: urlInfo.originalUrl,
-    content: urlInfo.content
-  });
-  await Promise.all(actions.map(action => action()));
+  for (const cssUrl of cssUrls) {
+    const [reference] = context.referenceUtils.found({
+      type: cssUrl.type,
+      specifier: cssUrl.specifier,
+      specifierStart: cssUrl.start,
+      specifierEnd: cssUrl.end,
+      specifierLine: cssUrl.line,
+      specifierColumn: cssUrl.column
+    });
+    actions.push(async () => {
+      const replacement = await context.referenceUtils.readGeneratedSpecifier(reference);
+      magicSource.replace({
+        start: cssUrl.start,
+        end: cssUrl.end,
+        replacement
+      });
+    });
+  }
+  if (actions.length > 0) {
+    await Promise.all(actions.map(action => action()));
+  }
   return magicSource.toContentAndSourcemap();
 };
 
@@ -10004,7 +9998,7 @@ const parseAndTransformJsUrls = async (urlInfo, context) => {
   });
   const actions = [];
   const magicSource = createMagicSource(urlInfo.content);
-  jsMentions.forEach(jsMention => {
+  for (const jsMention of jsMentions) {
     if (jsMention.subtype === "import_static" || jsMention.subtype === "import_dynamic") {
       urlInfo.data.usesImport = true;
     }
@@ -10015,10 +10009,10 @@ const parseAndTransformJsUrls = async (urlInfo, context) => {
       expectedType: jsMention.expectedType,
       expectedSubtype: jsMention.expectedSubtype || urlInfo.subtype,
       specifier: jsMention.specifier,
-      specifierStart: jsMention.specifierStart,
-      specifierEnd: jsMention.specifierEnd,
-      specifierLine: jsMention.specifierLine,
-      specifierColumn: jsMention.specifierColumn,
+      specifierStart: jsMention.start,
+      specifierEnd: jsMention.end,
+      specifierLine: jsMention.line,
+      specifierColumn: jsMention.column,
       data: jsMention.data,
       baseUrl: {
         "StringLiteral": jsMention.baseUrl,
@@ -10035,16 +10029,18 @@ const parseAndTransformJsUrls = async (urlInfo, context) => {
     actions.push(async () => {
       const replacement = await context.referenceUtils.readGeneratedSpecifier(reference);
       magicSource.replace({
-        start: jsMention.specifierStart,
-        end: jsMention.specifierEnd,
+        start: jsMention.start,
+        end: jsMention.end,
         replacement
       });
       if (reference.mutation) {
         reference.mutation(magicSource);
       }
     });
-  });
-  await Promise.all(actions.map(action => action()));
+  }
+  if (actions.length > 0) {
+    await Promise.all(actions.map(action => action()));
+  }
   const {
     content,
     sourcemap
@@ -21735,6 +21731,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     const getBuildRelativeUrl = url => {
       const urlObject = new URL(url);
       urlObject.searchParams.delete("as_js_classic");
+      urlObject.searchParams.delete("as_css_module");
+      urlObject.searchParams.delete("as_json_module");
+      urlObject.searchParams.delete("as_text_module");
       url = urlObject.href;
       const buildRelativeUrl = urlToRelativeUrl(url, buildDirectoryUrl);
       return buildRelativeUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "30.3.1",
+  "version": "30.3.2",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -67,7 +67,7 @@
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "2.0.1",
+    "@jsenv/ast": "3.0.0",
     "@jsenv/babel-plugins": "1.1.2",
     "@jsenv/plugin-bundling": "1.1.1",
     "@jsenv/filesystem": "4.1.9",
@@ -100,18 +100,18 @@
     "@babel/plugin-syntax-import-assertions": "7.20.0",
     "@jsenv/assert": "./packages/assert/",
     "@jsenv/eslint-config": "./packages/eslint-config/",
-    "@jsenv/file-size-impact": "13.0.2",
-    "@jsenv/https-local": "3.0.5",
+    "@jsenv/file-size-impact": "14.0.0",
+    "@jsenv/https-local": "3.0.6",
     "@jsenv/package-workspace": "0.5.1",
     "@jsenv/plugin-minification": "./packages/jsenv-plugin-minification/",
     "@jsenv/plugin-globals": "./packages/jsenv-plugin-globals/",
     "@jsenv/plugin-placeholders": "./packages/jsenv-plugin-placeholders/",
     "@jsenv/performance-impact": "4.1.0",
-    "eslint": "8.31.0",
+    "eslint": "8.32.0",
     "eslint-plugin-html": "7.1.0",
-    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-react": "7.31.11",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-react": "7.32.1",
     "playwright": "1.29.2",
-    "prettier": "2.8.2"
+    "prettier": "2.8.3"
   }
 }

package/src/build/build.js

@@ -1539,6 +1539,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     const getBuildRelativeUrl = (url) => {
       const urlObject = new URL(url)
       urlObject.searchParams.delete("as_js_classic")
+      urlObject.searchParams.delete("as_css_module")
+      urlObject.searchParams.delete("as_json_module")
+      urlObject.searchParams.delete("as_text_module")
       url = urlObject.href
       const buildRelativeUrl = urlToRelativeUrl(url, buildDirectoryUrl)
       return buildRelativeUrl

package/src/plugins/url_analysis/css/css_urls.js

@@ -2,47 +2,38 @@
  * https://github.com/parcel-bundler/parcel/blob/v2/packages/transformers/css/src/CSSTransformer.js
  */
 
+import { parseCssUrls } from "@jsenv/ast"
 import { createMagicSource } from "@jsenv/sourcemap"
-import { applyPostCss, postCssPluginUrlVisitor } from "@jsenv/ast"
 
 export const parseAndTransformCssUrls = async (urlInfo, context) => {
-  const actions = []
-  const magicSource = createMagicSource(urlInfo.content)
-  await applyPostCss({
-    sourcemaps: false,
-    plugins: [
-      postCssPluginUrlVisitor({
-        urlVisitor: ({
-          type,
-          specifier,
-          specifierStart,
-          specifierEnd,
-          specifierLine,
-          specifierColumn,
-        }) => {
-          const [reference] = context.referenceUtils.found({
-            type: `css_${type}`,
-            specifier,
-            specifierStart,
-            specifierEnd,
-            specifierLine,
-            specifierColumn,
-          })
-          actions.push(async () => {
-            magicSource.replace({
-              start: specifierStart,
-              end: specifierEnd,
-              replacement: await context.referenceUtils.readGeneratedSpecifier(
-                reference,
-              ),
-            })
-          })
-        },
-      }),
-    ],
+  const cssUrls = await parseCssUrls({
+    css: urlInfo.content,
     url: urlInfo.originalUrl,
-    content: urlInfo.content,
   })
-  await Promise.all(actions.map((action) => action()))
+  const actions = []
+  const magicSource = createMagicSource(urlInfo.content)
+  for (const cssUrl of cssUrls) {
+    const [reference] = context.referenceUtils.found({
+      type: cssUrl.type,
+      specifier: cssUrl.specifier,
+      specifierStart: cssUrl.start,
+      specifierEnd: cssUrl.end,
+      specifierLine: cssUrl.line,
+      specifierColumn: cssUrl.column,
+    })
+    actions.push(async () => {
+      const replacement = await context.referenceUtils.readGeneratedSpecifier(
+        reference,
+      )
+      magicSource.replace({
+        start: cssUrl.start,
+        end: cssUrl.end,
+        replacement,
+      })
+    })
+  }
+  if (actions.length > 0) {
+    await Promise.all(actions.map((action) => action()))
+  }
   return magicSource.toContentAndSourcemap()
 }

package/src/plugins/url_analysis/html/html_urls.js

@@ -20,10 +20,10 @@ export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
     url,
     htmlAst,
   })
-  const actions = []
   const mutations = []
-  mentions.forEach(
-    ({
+  const actions = []
+  for (const mention of mentions) {
+    const {
       type,
       subtype,
       expectedType,
@@ -35,39 +35,38 @@ export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
       attributeName,
       debug,
       specifier,
-    }) => {
-      const { crossorigin, integrity } = readFetchMetas(node)
-      const isResourceHint = [
-        "preconnect",
-        "dns-prefetch",
-        "prefetch",
-        "preload",
-        "modulepreload",
-      ].includes(subtype)
-      const [reference] = context.referenceUtils.found({
-        type,
-        subtype,
-        expectedType,
-        originalLine,
-        originalColumn,
-        specifier,
-        specifierLine: line,
-        specifierColumn: column,
-        isResourceHint,
-        crossorigin,
-        integrity,
-        debug,
-      })
-      actions.push(async () => {
-        await context.referenceUtils.readGeneratedSpecifier(reference)
-      })
+    } = mention
+    const { crossorigin, integrity } = readFetchMetas(node)
+    const isResourceHint = [
+      "preconnect",
+      "dns-prefetch",
+      "prefetch",
+      "preload",
+      "modulepreload",
+    ].includes(subtype)
+    const [reference] = context.referenceUtils.found({
+      type,
+      subtype,
+      expectedType,
+      originalLine,
+      originalColumn,
+      specifier,
+      specifierLine: line,
+      specifierColumn: column,
+      isResourceHint,
+      crossorigin,
+      integrity,
+      debug,
+    })
+    actions.push(async () => {
+      await context.referenceUtils.readGeneratedSpecifier(reference)
       mutations.push(() => {
         setHtmlNodeAttributes(node, {
           [attributeName]: reference.generatedSpecifier,
         })
       })
-    },
-  )
+    })
+  }
   if (actions.length > 0) {
     await Promise.all(actions.map((action) => action()))
   }

package/src/plugins/url_analysis/js/js_urls.js

@@ -12,7 +12,7 @@ export const parseAndTransformJsUrls = async (urlInfo, context) => {
   })
   const actions = []
   const magicSource = createMagicSource(urlInfo.content)
-  jsMentions.forEach((jsMention) => {
+  for (const jsMention of jsMentions) {
     if (
       jsMention.subtype === "import_static" ||
       jsMention.subtype === "import_dynamic"
@@ -26,10 +26,10 @@ export const parseAndTransformJsUrls = async (urlInfo, context) => {
       expectedType: jsMention.expectedType,
       expectedSubtype: jsMention.expectedSubtype || urlInfo.subtype,
       specifier: jsMention.specifier,
-      specifierStart: jsMention.specifierStart,
-      specifierEnd: jsMention.specifierEnd,
-      specifierLine: jsMention.specifierLine,
-      specifierColumn: jsMention.specifierColumn,
+      specifierStart: jsMention.start,
+      specifierEnd: jsMention.end,
+      specifierLine: jsMention.line,
+      specifierColumn: jsMention.column,
       data: jsMention.data,
       baseUrl: {
         "StringLiteral": jsMention.baseUrl,
@@ -48,16 +48,18 @@ export const parseAndTransformJsUrls = async (urlInfo, context) => {
         reference,
       )
       magicSource.replace({
-        start: jsMention.specifierStart,
-        end: jsMention.specifierEnd,
+        start: jsMention.start,
+        end: jsMention.end,
         replacement,
       })
       if (reference.mutation) {
         reference.mutation(magicSource)
       }
     })
-  })
-  await Promise.all(actions.map((action) => action()))
+  }
+  if (actions.length > 0) {
+    await Promise.all(actions.map((action) => action()))
+  }
   const { content, sourcemap } = magicSource.toContentAndSourcemap()
   return { content, sourcemap }
 }