@jsenv/core 30.0.7 → 30.2.0

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, transpileWithParcel, injectJsImport, analyzeLinkNode, injectHtmlNode, insertHtmlNodeAfter } from "@jsenv/ast";
+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 { createRequire } from "node:module";
 import babelParser from "@babel/parser";
 import { bundleJsModules } from "@jsenv/plugin-bundling";
@@ -17750,17 +17750,16 @@ const babelPluginMetadataImportMetaScenarios = () => {
   };
 };
 
-// https://github.com/parcel-bundler/parcel-css
-const jsenvPluginCssParcel = () => {
+const jsenvPluginCssTranspilation = () => {
   return {
-    name: "jsenv:css_parcel",
+    name: "jsenv:css_transpilation",
     appliesDuring: "*",
     transformUrlContent: {
-      css: (urlInfo, context) => {
+      css: async (urlInfo, context) => {
         const {
           code,
           map
-        } = transpileWithParcel(urlInfo, context);
+        } = await transpileCss(urlInfo, context);
         return {
           content: String(code),
           sourcemap: map
@@ -17769,6 +17768,44 @@ const jsenvPluginCssParcel = () => {
     }
   };
 };
+const transpileCss = async (urlInfo, context) => {
+  // https://lightningcss.dev/docs.html
+  const {
+    transform
+  } = await import("lightningcss");
+  const targets = runtimeCompatToTargets(context.runtimeCompat);
+  const {
+    code,
+    map
+  } = transform({
+    filename: fileURLToPath(urlInfo.originalUrl),
+    code: Buffer.from(urlInfo.content),
+    targets,
+    minify: false,
+    drafts: {
+      nesting: true,
+      customMedia: true
+    }
+  });
+  return {
+    code,
+    map
+  };
+};
+const runtimeCompatToTargets = runtimeCompat => {
+  const targets = {};
+  ["chrome", "firefox", "ie", "opera", "safari"].forEach(runtimeName => {
+    const version = runtimeCompat[runtimeName];
+    if (version) {
+      targets[runtimeName] = versionToBits(version);
+    }
+  });
+  return targets;
+};
+const versionToBits = version => {
+  const [major, minor = 0, patch = 0] = version.split("-")[0].split(".").map(v => parseInt(v, 10));
+  return major << 16 | minor << 8 | patch;
+};
 
 /*
  * Jsenv wont touch code where "specifier" or "type" is dynamic (see code below)
@@ -19206,7 +19243,7 @@ const jsenvPluginTranspilation = ({
   }), jsenvPluginAsJsModule(),
   // topLevelAwait must come after jsenvPluginAsJsClassic because it's related to the module format
   // so we want to wait to know the module format before transforming things related to top level await
-  ...(topLevelAwait ? [jsenvPluginTopLevelAwait()] : []), ...(css ? [jsenvPluginCssParcel()] : [])];
+  ...(topLevelAwait ? [jsenvPluginTopLevelAwait()] : []), ...(css ? [jsenvPluginCssTranspilation()] : [])];
 };
 
 const jsenvPluginNodeRuntime = ({
@@ -20324,36 +20361,16 @@ ${globalName}.__v__ = function (specifier) {
 `;
 };
 
-// https://github.com/rollup/rollup/blob/19e50af3099c2f627451a45a84e2fa90d20246d5/src/utils/FileEmitter.ts#L47
-// https://github.com/rollup/rollup/blob/5a5391971d695c808eed0c5d7d2c6ccb594fc689/src/Chunk.ts#L870
-const createVersionGenerator = () => {
-  const hash = createHash("sha256");
-  return {
-    augmentWithContent: ({
-      content,
-      contentType = "application/octet-stream",
-      lineBreakNormalization = false
-    }) => {
-      hash.update(lineBreakNormalization && CONTENT_TYPE.isTextual(contentType) ? normalizeLineBreaks(content) : content);
-    },
-    augment: value => {
-      hash.update(value);
-    },
-    generate: () => {
-      return hash.digest("hex").slice(0, 8);
-    }
-  };
-};
-const normalizeLineBreaks = stringOrBuffer => {
+const ensureUnixLineBreaks = stringOrBuffer => {
   if (typeof stringOrBuffer === "string") {
     const stringWithLinuxBreaks = stringOrBuffer.replace(/\r\n/g, "\n");
     return stringWithLinuxBreaks;
   }
-  return normalizeLineBreaksForBuffer(stringOrBuffer);
+  return ensureUnixLineBreaksOnBuffer(stringOrBuffer);
 };
 
 // https://github.com/nodejs/help/issues/1738#issuecomment-458460503
-const normalizeLineBreaksForBuffer = buffer => {
+const ensureUnixLineBreaksOnBuffer = buffer => {
   const int32Array = new Int32Array(buffer, 0, buffer.length);
   const int32ArrayWithLineBreaksNormalized = int32Array.filter((element, index, typedArray) => {
     if (element === 0x0d) {
@@ -20369,6 +20386,27 @@ const normalizeLineBreaksForBuffer = buffer => {
   return Buffer.from(int32ArrayWithLineBreaksNormalized);
 };
 
+// https://github.com/rollup/rollup/blob/19e50af3099c2f627451a45a84e2fa90d20246d5/src/utils/FileEmitter.ts#L47
+// https://github.com/rollup/rollup/blob/5a5391971d695c808eed0c5d7d2c6ccb594fc689/src/Chunk.ts#L870
+const createVersionGenerator = () => {
+  const hash = createHash("sha256");
+  return {
+    augmentWithContent: ({
+      content,
+      contentType = "application/octet-stream",
+      lineBreakNormalization = false
+    }) => {
+      hash.update(lineBreakNormalization && CONTENT_TYPE.isTextual(contentType) ? ensureUnixLineBreaks(content) : content);
+    },
+    augment: value => {
+      hash.update(value);
+    },
+    generate: () => {
+      return hash.digest("hex").slice(0, 8);
+    }
+  };
+};
+
 /*
  * Build is split in 3 steps:
  * 1. craft

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "30.0.7",
+  "version": "30.2.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -67,9 +67,9 @@
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "1.4.10",
+    "@jsenv/ast": "2.0.0",
     "@jsenv/babel-plugins": "1.1.2",
-    "@jsenv/plugin-bundling": "1.0.4",
+    "@jsenv/plugin-bundling": "1.1.0",
     "@jsenv/filesystem": "4.1.9",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
@@ -88,6 +88,7 @@
     "istanbul-lib-report": "3.0.0",
     "istanbul-reports": "3.1.5",
     "launch-editor": "2.6.0",
+    "lightningcss": "1.18.0",
     "pidtree": "0.6.0",
     "string-width": "5.1.2",
     "strip-ansi": "7.0.1",

package/src/build/line_break_unix.js

@@ -0,0 +1,26 @@
+export const ensureUnixLineBreaks = (stringOrBuffer) => {
+  if (typeof stringOrBuffer === "string") {
+    const stringWithLinuxBreaks = stringOrBuffer.replace(/\r\n/g, "\n")
+    return stringWithLinuxBreaks
+  }
+  return ensureUnixLineBreaksOnBuffer(stringOrBuffer)
+}
+
+// https://github.com/nodejs/help/issues/1738#issuecomment-458460503
+const ensureUnixLineBreaksOnBuffer = (buffer) => {
+  const int32Array = new Int32Array(buffer, 0, buffer.length)
+  const int32ArrayWithLineBreaksNormalized = int32Array.filter(
+    (element, index, typedArray) => {
+      if (element === 0x0d) {
+        if (typedArray[index + 1] === 0x0a) {
+          // Windows -> Unix
+          return false
+        }
+        // Mac OS -> Unix
+        typedArray[index] = 0x0a
+      }
+      return true
+    },
+  )
+  return Buffer.from(int32ArrayWithLineBreaksNormalized)
+}

package/src/build/version_generator.js

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto"
 
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+import { ensureUnixLineBreaks } from "./line_break_unix.js"
 
 // https://github.com/rollup/rollup/blob/19e50af3099c2f627451a45a84e2fa90d20246d5/src/utils/FileEmitter.ts#L47
 // https://github.com/rollup/rollup/blob/5a5391971d695c808eed0c5d7d2c6ccb594fc689/src/Chunk.ts#L870
@@ -15,7 +16,7 @@ export const createVersionGenerator = () => {
     }) => {
       hash.update(
         lineBreakNormalization && CONTENT_TYPE.isTextual(contentType)
-          ? normalizeLineBreaks(content)
+          ? ensureUnixLineBreaks(content)
           : content,
       )
     },
@@ -27,30 +28,3 @@ export const createVersionGenerator = () => {
     },
   }
 }
-
-const normalizeLineBreaks = (stringOrBuffer) => {
-  if (typeof stringOrBuffer === "string") {
-    const stringWithLinuxBreaks = stringOrBuffer.replace(/\r\n/g, "\n")
-    return stringWithLinuxBreaks
-  }
-  return normalizeLineBreaksForBuffer(stringOrBuffer)
-}
-
-// https://github.com/nodejs/help/issues/1738#issuecomment-458460503
-const normalizeLineBreaksForBuffer = (buffer) => {
-  const int32Array = new Int32Array(buffer, 0, buffer.length)
-  const int32ArrayWithLineBreaksNormalized = int32Array.filter(
-    (element, index, typedArray) => {
-      if (element === 0x0d) {
-        if (typedArray[index + 1] === 0x0a) {
-          // Windows -> Unix
-          return false
-        }
-        // Mac OS -> Unix
-        typedArray[index] = 0x0a
-      }
-      return true
-    },
-  )
-  return Buffer.from(int32ArrayWithLineBreaksNormalized)
-}

package/src/plugins/transpilation/css/jsenv_plugin_css_transpilation.js

@@ -0,0 +1,54 @@
+import { fileURLToPath } from "node:url"
+
+export const jsenvPluginCssTranspilation = () => {
+  return {
+    name: "jsenv:css_transpilation",
+    appliesDuring: "*",
+    transformUrlContent: {
+      css: async (urlInfo, context) => {
+        const { code, map } = await transpileCss(urlInfo, context)
+        return {
+          content: String(code),
+          sourcemap: map,
+        }
+      },
+    },
+  }
+}
+
+const transpileCss = async (urlInfo, context) => {
+  // https://lightningcss.dev/docs.html
+  const { transform } = await import("lightningcss")
+
+  const targets = runtimeCompatToTargets(context.runtimeCompat)
+  const { code, map } = transform({
+    filename: fileURLToPath(urlInfo.originalUrl),
+    code: Buffer.from(urlInfo.content),
+    targets,
+    minify: false,
+    drafts: {
+      nesting: true,
+      customMedia: true,
+    },
+  })
+  return { code, map }
+}
+
+const runtimeCompatToTargets = (runtimeCompat) => {
+  const targets = {}
+  ;["chrome", "firefox", "ie", "opera", "safari"].forEach((runtimeName) => {
+    const version = runtimeCompat[runtimeName]
+    if (version) {
+      targets[runtimeName] = versionToBits(version)
+    }
+  })
+  return targets
+}
+
+const versionToBits = (version) => {
+  const [major, minor = 0, patch = 0] = version
+    .split("-")[0]
+    .split(".")
+    .map((v) => parseInt(v, 10))
+  return (major << 16) | (minor << 8) | patch
+}

package/src/plugins/transpilation/jsenv_plugin_transpilation.js

@@ -7,7 +7,7 @@
  * of this plugin
  */
 
-import { jsenvPluginCssParcel } from "./css_parcel/jsenv_plugin_css_parcel.js"
+import { jsenvPluginCssTranspilation } from "./css/jsenv_plugin_css_transpilation.js"
 import { jsenvPluginImportAssertions } from "./import_assertions/jsenv_plugin_import_assertions.js"
 import { jsenvPluginAsJsClassic } from "./as_js_classic/jsenv_plugin_as_js_classic.js"
 import { jsenvPluginAsJsModule } from "./as_js_module/jsenv_plugin_as_js_module.js"
@@ -52,6 +52,6 @@ export const jsenvPluginTranspilation = ({
     // topLevelAwait must come after jsenvPluginAsJsClassic because it's related to the module format
     // so we want to wait to know the module format before transforming things related to top level await
     ...(topLevelAwait ? [jsenvPluginTopLevelAwait(topLevelAwait)] : []),
-    ...(css ? [jsenvPluginCssParcel()] : []),
+    ...(css ? [jsenvPluginCssTranspilation()] : []),
   ]
 }

package/src/plugins/transpilation/css_parcel/jsenv_plugin_css_parcel.js

@@ -1,18 +0,0 @@
-import { transpileWithParcel } from "@jsenv/ast"
-
-// https://github.com/parcel-bundler/parcel-css
-export const jsenvPluginCssParcel = () => {
-  return {
-    name: "jsenv:css_parcel",
-    appliesDuring: "*",
-    transformUrlContent: {
-      css: (urlInfo, context) => {
-        const { code, map } = transpileWithParcel(urlInfo, context)
-        return {
-          content: String(code),
-          sourcemap: map,
-        }
-      },
-    },
-  }
-}