@jsenv/core 38.4.20 → 39.0.1

package/dist/jsenv_core.js

@@ -1,4 +1,4 @@
-import { readdir, chmod, stat, lstat, promises, writeFileSync as writeFileSync$1, mkdirSync, unlink, openSync, closeSync, rmdir, watch, readdirSync, statSync, createReadStream, lstatSync, readFile, existsSync, readFileSync, realpathSync } from "node:fs";
+import { readdir, chmod, stat, lstat, promises, readFileSync, writeFileSync as writeFileSync$1, mkdirSync, unlink, openSync, closeSync, rmdir, watch, readdirSync, statSync, createReadStream, lstatSync, readFile, existsSync, realpathSync } from "node:fs";
 import process$1 from "node:process";
 import os, { networkInterfaces } from "node:os";
 import tty from "node:tty";
@@ -3233,6 +3233,9 @@ const writeDirectory = async (
 const writeFileSync = (destination, content = "") => {
   const destinationUrl = assertAndNormalizeFileUrl(destination);
   const destinationUrlObject = new URL(destinationUrl);
+  if (content && content instanceof URL) {
+    content = readFileSync(content);
+  }
   try {
     writeFileSync$1(destinationUrlObject, content);
   } catch (error) {
@@ -4576,7 +4579,7 @@ const stringifyServerTimingHeader = (serverTimingHeader) => {
 // https://www.w3.org/TR/2019/WD-server-timing-20190307/#the-server-timing-header-field
 // https://tools.ietf.org/html/rfc7230#section-3.2.6
 const validateServerTimingName = (name) => {
-  const valid = /^[!#$%&'*+\-.^_`|~0-9a-z]+$/gi.test(name);
+  const valid = /^[!#$%&'*+\-.^_`|~0-9a-z]+$/i.test(name);
   if (!valid) {
     console.warn(`server timing contains invalid symbols`);
     return false;
@@ -5126,7 +5129,7 @@ const onceReadableStreamUsedOrClosed = (readableStream, callback) => {
 
 const normalizeHeaderName = (headerName) => {
   headerName = String(headerName);
-  if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(headerName)) {
+  if (/[^a-z0-9\-#$%&'*+.^_`|~]/i.test(headerName)) {
     throw new TypeError("Invalid character in header field name");
   }
 
@@ -9141,15 +9144,15 @@ const JS_QUOTE_REPLACEMENTS = {
  * ```js
  * const file = "./style.css"
  * const type = "css"
- * import(file, { assert: { type }})
+ * import(file, { with: { type }})
  * ```
  * Jsenv could throw an error when it knows some browsers in runtimeCompat
- * do not support import assertions
+ * do not support import attributes
  * But for now (as it is simpler) we let the browser throw the error
  */
 
 
-const jsenvPluginImportAssertions = ({
+const jsenvPluginImportAttributes = ({
   json = "auto",
   css = "auto",
   text = "auto",
@@ -9172,17 +9175,17 @@ const jsenvPluginImportAssertions = ({
       } else {
         const { importTypeAttributeNode } = reference.astInfo;
         const content = reference.ownerUrlInfo.content;
-        const assertKeyboardStart = content.indexOf(
-          "assert",
-          importTypeAttributeNode.start - " assert { ".length,
+        const withKeywordStart = content.indexOf(
+          "with",
+          importTypeAttributeNode.start - " with { ".length,
         );
-        const assertKeywordEnd = content.indexOf(
+        const withKeywordEnd = content.indexOf(
           "}",
           importTypeAttributeNode.end,
         );
         magicSource.remove({
-          start: assertKeyboardStart,
-          end: assertKeywordEnd + 1,
+          start: withKeywordStart,
+          end: withKeywordEnd + 1,
         });
       }
     };
@@ -10161,7 +10164,7 @@ const analyzeConstructableStyleSheetUsage = (urlInfo) => {
         // import('./' + moduleName)
         return false;
       }
-      if (hasImportTypeCssAssertion(node)) {
+      if (hasImportTypeCssAttribute(node)) {
         return node;
       }
       if (hasCssModuleQueryParam(source)) {
@@ -10174,7 +10177,7 @@ const analyzeConstructableStyleSheetUsage = (urlInfo) => {
       if (hasCssModuleQueryParam(source)) {
         return source;
       }
-      if (hasImportTypeCssAssertion(node)) {
+      if (hasImportTypeCssAttribute(node)) {
         return node;
       }
       return false;
@@ -10236,22 +10239,20 @@ const hasCssModuleQueryParam = (node) => {
   );
 };
 
-const hasImportTypeCssAssertion = (node) => {
-  const importAssertionsDescriptor = getImportAssertionsDescriptor(
-    node.assertions,
-  );
-  return Boolean(importAssertionsDescriptor.type === "css");
+const hasImportTypeCssAttribute = (node) => {
+  const importAttributes = getImportAttributes(node);
+  return Boolean(importAttributes.type === "css");
 };
 
-const getImportAssertionsDescriptor = (importAssertions) => {
-  const importAssertionsDescriptor = {};
-  if (importAssertions) {
-    importAssertions.forEach((importAssertion) => {
-      importAssertionsDescriptor[importAssertion.key.name] =
-        importAssertion.value.value;
+const getImportAttributes = (importNode) => {
+  const importAttributes = {};
+  if (importNode.attributes) {
+    importNode.attributes.forEach((importAttributeNode) => {
+      importAttributes[importAttributeNode.key.name] =
+        importAttributeNode.value.value;
     });
   }
-  return importAssertionsDescriptor;
+  return importAttributes;
 };
 
 const babelPluginNewStylesheetInjector = (
@@ -11111,7 +11112,7 @@ const jsenvPluginCssTranspilation = () => {
 
 
 const jsenvPluginTranspilation = ({
-  importAssertions = true,
+  importAttributes = true,
   css = true, // TODO
   // build sets jsModuleFallback: false during first step of the build
   // and re-enable it in the second phase (when performing the bundling)
@@ -11119,8 +11120,8 @@ const jsenvPluginTranspilation = ({
   jsModuleFallback = true,
   babelHelpersAsImport = true,
 }) => {
-  if (importAssertions === true) {
-    importAssertions = {};
+  if (importAttributes === true) {
+    importAttributes = {};
   }
   if (jsModuleFallback === true) {
     jsModuleFallback = {};
@@ -11132,8 +11133,8 @@ const jsenvPluginTranspilation = ({
     }),
     jsenvPluginAsJsModule(),
     ...(jsModuleFallback ? [jsenvPluginJsModuleFallback()] : []),
-    ...(importAssertions
-      ? [jsenvPluginImportAssertions(importAssertions)]
+    ...(importAttributes
+      ? [jsenvPluginImportAttributes(importAttributes)]
       : []),
 
     ...(css ? [jsenvPluginCssTranspilation()] : []),
@@ -13930,7 +13931,7 @@ const parseAsHashWithOptions = (token) => {
   return { isValid, algo, base64Value, optionExpression };
 };
 
-const BASE64_REGEX = /^[A-Za-z0-9+\/=+]+$/;
+const BASE64_REGEX = /^[A-Za-z0-9+/=]+$/;
 const VCHAR_REGEX = /^[\x21-\x7E]+$/;
 
 // https://www.w3.org/TR/SRI/#does-response-match-metadatalist
@@ -16427,7 +16428,7 @@ const escapeHtml = (string) => {
     .replace(/'/g, "'");
 };
 const replacePlaceholders$2 = (html, replacers) => {
-  return html.replace(/\${([\w]+)}/g, (match, name) => {
+  return html.replace(/\$\{(\w+)\}/g, (match, name) => {
     const replacer = replacers[name];
     if (replacer === undefined) {
       return match;
@@ -18513,7 +18514,7 @@ const generateDirectoryContent = (
   `);
 };
 const replacePlaceholders$1 = (html, replacers) => {
-  return html.replace(/\${([\w]+)}/g, (match, name) => {
+  return html.replace(/\$\{(\w+)\}/g, (match, name) => {
     const replacer = replacers[name];
     if (replacer === undefined) {
       return match;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "38.4.20",
+  "version": "39.0.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -64,19 +64,19 @@
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.3.0",
-    "@jsenv/ast": "6.0.7",
+    "@jsenv/ast": "6.1.1",
     "@jsenv/filesystem": "4.7.2",
     "@jsenv/humanize": "1.1.3",
     "@jsenv/importmap": "1.2.1",
-    "@jsenv/integrity": "0.0.1",
-    "@jsenv/js-module-fallback": "1.3.16",
+    "@jsenv/integrity": "0.0.2",
+    "@jsenv/js-module-fallback": "1.3.18",
     "@jsenv/node-esm-resolution": "1.0.2",
     "@jsenv/plugin-bundling": "2.6.12",
     "@jsenv/plugin-minification": "1.5.4",
-    "@jsenv/plugin-supervisor": "1.4.11",
-    "@jsenv/plugin-transpilation": "1.3.16",
+    "@jsenv/plugin-supervisor": "1.4.13",
+    "@jsenv/plugin-transpilation": "1.4.1",
     "@jsenv/runtime-compat": "1.3.0",
-    "@jsenv/server": "15.2.8",
+    "@jsenv/server": "15.2.9",
     "@jsenv/sourcemap": "1.2.10",
     "@jsenv/url-meta": "8.4.2",
     "@jsenv/urls": "2.2.7",
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.24.7",
-    "@babel/plugin-syntax-import-assertions": "7.24.7",
+    "@babel/plugin-syntax-import-attributes": "7.24.7",
     "@babel/plugin-syntax-optional-chaining-assign": "7.24.7",
     "@jsenv/assert": "./packages/independent/assert/",
     "@jsenv/core": "./",
@@ -104,6 +104,7 @@
     "eslint-plugin-html": "8.1.1",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-react": "7.34.3",
+    "eslint-plugin-regexp": "2.6.0",
     "open": "10.1.0",
     "playwright": "1.45.1",
     "prettier": "3.3.2"

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -366,7 +366,7 @@ const generateDirectoryContent = (
   `);
 };
 const replacePlaceholders = (html, replacers) => {
-  return html.replace(/\${([\w]+)}/g, (match, name) => {
+  return html.replace(/\$\{(\w+)\}/g, (match, name) => {
     const replacer = replacers[name];
     if (replacer === undefined) {
       return match;

package/src/plugins/reference_analysis/html/jsenv_plugin_html_reference_analysis.js

@@ -650,7 +650,7 @@ const escapeHtml = (string) => {
     .replace(/'/g, "'");
 };
 const replacePlaceholders = (html, replacers) => {
-  return html.replace(/\${([\w]+)}/g, (match, name) => {
+  return html.replace(/\$\{(\w+)\}/g, (match, name) => {
     const replacer = replacers[name];
     if (replacer === undefined) {
       return match;