@jsenv/core 36.1.3 → 36.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "36.1.3",
+  "version": "36.2.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -35,10 +35,10 @@
     "/src/"
   ],
   "workspaces": [
+    "./packages/independent/*",
     "./packages/internal/*",
-    "./packages/plugins/*",
-    "./packages/rest/*",
-    "./packages/rest/create-jsenv/*"
+    "./packages/related/*",
+    "./packages/related/create-jsenv/*"
   ],
   "scripts": {
     "eslint": "npx eslint . --ext=.js,.mjs,.cjs,.html",
@@ -60,44 +60,44 @@
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "4.0.2",
-    "@jsenv/babel-plugins": "1.1.6",
+    "@jsenv/ast": "4.0.3",
     "@jsenv/filesystem": "4.2.3",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.3.5",
     "@jsenv/node-esm-resolution": "1.0.1",
-    "@jsenv/plugin-supervisor": "1.0.1",
-    "@jsenv/js-module-fallback": "1.0.1",
+    "@jsenv/js-module-fallback": "1.0.4",
+    "@jsenv/runtime-compat": "1.0.0",
     "@jsenv/server": "15.0.3",
     "@jsenv/sourcemap": "1.0.10",
+    "@jsenv/plugin-transpilation": "1.0.0",
+    "@jsenv/plugin-supervisor": "1.1.0",
     "@jsenv/url-meta": "8.1.0",
     "@jsenv/urls": "2.0.0",
-    "@jsenv/utils": "2.0.1",
-    "construct-style-sheets-polyfill": "3.1.0",
-    "lightningcss": "1.20.0"
+    "@jsenv/utils": "2.0.1"
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.21.8",
     "@babel/plugin-syntax-import-assertions": "7.20.0",
-    "@jsenv/assert": "./packages/rest/assert/",
-    "@jsenv/eslint-config": "./packages/rest/eslint-config/",
-    "@jsenv/file-size-impact": "14.1.1",
+    "babel-plugin-transform-async-to-promises": "0.8.18",
+    "@jsenv/assert": "./packages/independent/assert/",
     "@jsenv/core": "./",
+    "@jsenv/eslint-config": "./packages/independent/eslint-config/",
+    "@jsenv/file-size-impact": "14.1.1",
     "@jsenv/https-local": "3.0.6",
     "@jsenv/package-workspace": "0.5.2",
     "@jsenv/performance-impact": "4.1.1",
-    "@jsenv/plugin-globals": "./packages/plugins/jsenv-plugin-globals/",
-    "@jsenv/plugin-minification": "./packages/plugins/jsenv-plugin-minification/",
-    "@jsenv/plugin-placeholders": "./packages/plugins/jsenv-plugin-placeholders/",
-    "@jsenv/plugin-as-js-classic": "./packages/plugins/jsenv-plugin-as-js-classic/",
-    "@jsenv/test": "./packages/rest/test/",
+    "@jsenv/plugin-globals": "./packages/related/plugin-globals/",
+    "@jsenv/plugin-minification": "./packages/related/plugin-minification/",
+    "@jsenv/plugin-placeholders": "./packages/related/plugin-placeholders/",
+    "@jsenv/plugin-as-js-classic": "./packages/related/plugin-as-js-classic/",
+    "@jsenv/test": "./packages/related/test/",
     "eslint": "8.41.0",
     "eslint-plugin-html": "7.1.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-react": "7.32.2",
     "open": "9.1.0",
-    "playwright": "1.34.2",
+    "playwright": "1.34.3",
     "prettier": "2.8.8"
   }
 }

package/src/build/build.js

@@ -52,22 +52,22 @@ import {
   insertHtmlNodeAfter,
   findHtmlNode,
 } from "@jsenv/ast";
+import { RUNTIME_COMPAT } from "@jsenv/runtime-compat";
+import { jsenvPluginJsModuleFallback } from "@jsenv/plugin-transpilation";
 
 import { lookupPackageDirectory } from "../helpers/lookup_package_directory.js";
 import { watchSourceFiles } from "../helpers/watch_source_files.js";
 import { createUrlGraph } from "../kitchen/url_graph.js";
 import { createKitchen } from "../kitchen/kitchen.js";
-import { RUNTIME_COMPAT } from "../kitchen/compat/runtime_compat.js";
 import { createUrlGraphLoader } from "../kitchen/url_graph/url_graph_loader.js";
 import { createUrlGraphSummary } from "../kitchen/url_graph/url_graph_report.js";
 import {
   isWebWorkerEntryPointReference,
   isWebWorkerUrlInfo,
 } from "../kitchen/web_workers.js";
+import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginReferenceAnalysis } from "../plugins/reference_analysis/jsenv_plugin_reference_analysis.js";
 import { jsenvPluginInlining } from "../plugins/inlining/jsenv_plugin_inlining.js";
-import { jsenvPluginJsModuleFallback } from "../plugins/transpilation/js_module_fallback/jsenv_plugin_js_module_fallback.js";
-import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginLineBreakNormalization } from "./jsenv_plugin_line_break_normalization.js";
 
 import { GRAPH } from "./graph_utils.js";
@@ -343,8 +343,8 @@ build ${entryPointKeys.length} entry points`);
           magicDirectoryIndex,
           directoryReferenceAllowed,
           transpilation: {
-            ...transpilation,
             babelHelpersAsImport: !explicitJsModuleFallback,
+            ...transpilation,
             jsModuleFallbackOnJsClassic: false,
           },
 

package/src/dev/file_service.js

@@ -3,12 +3,12 @@ import { serveDirectory, composeTwoResponses } from "@jsenv/server";
 import { bufferToEtag } from "@jsenv/filesystem";
 import { asUrlWithoutSearch } from "@jsenv/urls";
 import { URL_META } from "@jsenv/url-meta";
+import { RUNTIME_COMPAT } from "@jsenv/runtime-compat";
 
 import { WEB_URL_CONVERTER } from "../helpers/web_url_converter.js";
 import { watchSourceFiles } from "../helpers/watch_source_files.js";
 import { createUrlGraph } from "../kitchen/url_graph.js";
 import { createKitchen } from "../kitchen/kitchen.js";
-import { RUNTIME_COMPAT } from "../kitchen/compat/runtime_compat.js";
 import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginServerEventsClientInjection } from "../plugins/server_events/jsenv_plugin_server_events_client_injection.js";
 import { parseUserAgentHeader } from "./user_agent.js";

package/src/kitchen/client/inline_content.js

@@ -0,0 +1,17 @@
+/* eslint-env browser,node */
+
+/*
+ * This file does not use export const InlineContent = function() {} on purpose:
+ * - An export would be renamed by rollup,
+ *   making it harder to statically detect new InlineContent() calls
+ * - An export would be renamed by terser
+ *   here again it becomes hard to detect new InlineContent() calls
+ * Instead it sets "__InlineContent__" on the global object and terser is configured by jsenv
+ * to preserve the __InlineContent__ global variable name
+ */
+
+const globalObject = typeof self === "object" ? self : process;
+globalObject.__InlineContent__ = function (content, { type = "text/plain" }) {
+  this.text = content;
+  this.type = type;
+};

package/src/kitchen/kitchen.js

@@ -10,11 +10,11 @@ import { URL_META } from "@jsenv/url-meta";
 import { writeFileSync, ensureWindowsDriveLetter } from "@jsenv/filesystem";
 import { createLogger, createDetailedMessage, ANSI } from "@jsenv/log";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
+import { RUNTIME_COMPAT } from "@jsenv/runtime-compat";
 
 import { createPluginController } from "../plugins/plugin_controller.js";
 import { urlSpecifierEncoding } from "./url_specifier_encoding.js";
 import { createUrlInfoTransformer } from "./url_graph/url_info_transformations.js";
-import { RUNTIME_COMPAT } from "./compat/runtime_compat.js";
 import {
   createResolveUrlError,
   createFetchUrlContentError,
@@ -24,6 +24,11 @@ import {
 import { assertFetchedContentCompliance } from "./fetched_content_compliance.js";
 import { isWebWorkerEntryPointReference } from "./web_workers.js";
 
+const inlineContentClientFileUrl = new URL(
+  "./client/inline_content.js",
+  import.meta.url,
+).href;
+
 export const createKitchen = ({
   signal,
   logLevel,
@@ -531,6 +536,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       // references
       const references = [];
       context.referenceUtils = {
+        inlineContentClientFileUrl,
         _references: references,
         find: (predicate) => references.find(predicate),
         readGeneratedSpecifier,

package/src/plugins/commonjs_globals/jsenv_plugin_commonjs_globals.js

@@ -42,7 +42,10 @@ export const jsenvPluginCommonJsGlobals = () => {
           },
         ],
       ],
-      urlInfo,
+      input: urlInfo.content,
+      inputIsJsModule: urlInfo.type === "js_module",
+      inputUrl: urlInfo.originalUrl,
+      outputUrl: urlInfo.generatedUrl,
     });
     const { expressionPaths } = metadata;
     const keys = Object.keys(expressionPaths);

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -55,7 +55,10 @@ export const jsenvPluginImportMetaHot = () => {
         }
         const { metadata } = await applyBabelPlugins({
           babelPlugins: [babelPluginMetadataImportMetaHot],
-          urlInfo,
+          input: urlInfo.content,
+          inputIsJsModule: true,
+          inputUrl: urlInfo.originalUrl,
+          outputUrl: urlInfo.generatedUrl,
         });
         const {
           importMetaHotPaths,

package/src/plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js

@@ -26,7 +26,10 @@ export const jsenvPluginImportMetaScenarios = () => {
         }
         const { metadata } = await applyBabelPlugins({
           babelPlugins: [babelPluginMetadataImportMetaScenarios],
-          urlInfo,
+          input: urlInfo.content,
+          inputIsJsModule: true,
+          inputUrl: urlInfo.originalUrl,
+          outputUrl: urlInfo.generatedUrl,
         });
         const { dev = [], build = [] } = metadata.importMetaScenarios;
         const replacements = [];

package/src/plugins/plugins.js

@@ -1,4 +1,5 @@
 import { jsenvPluginSupervisor } from "@jsenv/plugin-supervisor";
+import { jsenvPluginTranspilation } from "@jsenv/plugin-transpilation";
 
 import { jsenvPluginReferenceAnalysis } from "./reference_analysis/jsenv_plugin_reference_analysis.js";
 import { jsenvPluginImportmap } from "./importmap/jsenv_plugin_importmap.js";
@@ -11,7 +12,6 @@ import { jsenvPluginInlining } from "./inlining/jsenv_plugin_inlining.js";
 import { jsenvPluginCommonJsGlobals } from "./commonjs_globals/jsenv_plugin_commonjs_globals.js";
 import { jsenvPluginImportMetaScenarios } from "./import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js";
 import { jsenvPluginGlobalScenarios } from "./global_scenarios/jsenv_plugin_global_scenarios.js";
-import { jsenvPluginTranspilation } from "./transpilation/jsenv_plugin_transpilation.js";
 import { jsenvPluginNodeRuntime } from "./node_runtime/jsenv_plugin_node_runtime.js";
 // autoreload
 import { jsenvPluginImportMetaHot } from "./import_meta_hot/jsenv_plugin_import_meta_hot.js";

package/src/kitchen/compat/features_compatibility.js

@@ -1,220 +0,0 @@
-export const featuresCompatMap = {
-  script_type_module: {
-    edge: "16",
-    firefox: "60",
-    chrome: "61",
-    safari: "10.1",
-    opera: "48",
-    ios: "10.3",
-    android: "61",
-    samsung: "8.2",
-  },
-  document_current_script: {
-    edge: "12",
-    firefox: "4",
-    chrome: "29",
-    safari: "8",
-    opera: "16",
-    android: "4.4",
-    samsung: "4",
-  },
-  // https://caniuse.com/?search=import.meta
-  import_meta: {
-    android: "9",
-    chrome: "64",
-    edge: "79",
-    firefox: "62",
-    ios: "12",
-    opera: "51",
-    safari: "11.1",
-    samsung: "9.2",
-  },
-  import_meta_resolve: {
-    chrome: "107",
-    edge: "105",
-    firefox: "106",
-  },
-  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import#browser_compatibility
-  import_dynamic: {
-    android: "8",
-    chrome: "63",
-    edge: "79",
-    firefox: "67",
-    ios: "11.3",
-    opera: "50",
-    safari: "11.3",
-    samsung: "8.0",
-    node: "13.2",
-  },
-  top_level_await: {
-    edge: "89",
-    chrome: "89",
-    firefox: "89",
-    opera: "75",
-    safari: "15",
-    samsung: "15",
-    ios: "15",
-    node: "14.8",
-  },
-  // https://caniuse.com/import-maps
-  importmap: {
-    edge: "89",
-    chrome: "89",
-    opera: "76",
-    samsung: "15",
-    firefox: "108",
-    safari: "16.4",
-  },
-  import_type_json: {
-    chrome: "91",
-    edge: "91",
-  },
-  import_type_css: {
-    chrome: "93",
-    edge: "93",
-  },
-  import_type_text: {},
-  // https://developer.mozilla.org/en-US/docs/Web/API/CSSStyleSheet#browser_compatibility
-  new_stylesheet: {
-    chrome: "73",
-    edge: "79",
-    opera: "53",
-    android: "73",
-  },
-  // https://caniuse.com/?search=worker
-  worker: {
-    ie: "10",
-    edge: "12",
-    firefox: "3.5",
-    chrome: "4",
-    opera: "11.5",
-    safari: "4",
-    ios: "5",
-    android: "4.4",
-  },
-  // https://developer.mozilla.org/en-US/docs/Web/API/Worker/Worker#browser_compatibility
-  worker_type_module: {
-    chrome: "80",
-    edge: "80",
-    opera: "67",
-    android: "80",
-  },
-  worker_importmap: {},
-  service_worker: {
-    edge: "17",
-    firefox: "44",
-    chrome: "40",
-    safari: "11.1",
-    opera: "27",
-    ios: "11.3",
-    android: "12.12",
-  },
-  service_worker_type_module: {
-    chrome: "80",
-    edge: "80",
-    opera: "67",
-    android: "80",
-  },
-  shared_worker: {
-    chrome: "4",
-    edge: "79",
-    firefox: "29",
-    opera: "10.6",
-  },
-  shared_worker_type_module: {
-    chrome: "80",
-    edge: "80",
-    opera: "67",
-  },
-  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis#browser_compatibility
-  global_this: {
-    edge: "79",
-    firefox: "65",
-    chrome: "71",
-    safari: "12.1",
-    opera: "58",
-    ios: "12.2",
-    android: "94",
-    node: "12",
-  },
-  async_generator_function: {
-    chrome: "63",
-    opera: "50",
-    edge: "79",
-    firefox: "57",
-    safari: "12",
-    node: "10",
-    ios: "12",
-    samsung: "8",
-    electron: "3",
-  },
-  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#browser_compatibility
-  template_literals: {
-    chrome: "41",
-    edge: "12",
-    firefox: "34",
-    opera: "28",
-    safari: "9",
-    ios: "9",
-    android: "4",
-    node: "4",
-  },
-  arrow_function: {
-    chrome: "47",
-    opera: "34",
-    edge: "13",
-    firefox: "45",
-    safari: "10",
-    node: "6",
-    ios: "10",
-    samsung: "5",
-    electron: "0.36",
-  },
-  const_bindings: {
-    chrome: "41",
-    opera: "28",
-    edge: "12",
-    firefox: "46",
-    safari: "10",
-    node: "4",
-    ie: "11",
-    ios: "10",
-    samsung: "3.4",
-    electron: "0.22",
-  },
-  object_properties_shorthand: {
-    chrome: "43",
-    opera: "30",
-    edge: "12",
-    firefox: "33",
-    safari: "9",
-    node: "4",
-    ios: "9",
-    samsung: "4",
-    electron: "0.28",
-  },
-  reserved_words: {
-    chrome: "13",
-    opera: "10.50",
-    edge: "12",
-    firefox: "2",
-    safari: "3.1",
-    node: "0.10",
-    ie: "9",
-    android: "4.4",
-    ios: "6",
-    phantom: "2",
-    samsung: "1",
-    electron: "0.20",
-  },
-  symbols: {
-    chrome: "38",
-    opera: "25",
-    edge: "12",
-    firefox: "36",
-    safari: "9",
-    ios: "9",
-    samsung: "4",
-    node: "0.12",
-  },
-};

package/src/kitchen/compat/runtime_compat.js

@@ -1,56 +0,0 @@
-import { findHighestVersion } from "@jsenv/utils/src/semantic_versioning/highest_version.js";
-
-import { featuresCompatMap } from "./features_compatibility.js";
-
-export const RUNTIME_COMPAT = {
-  featuresCompatMap,
-
-  add: (originalRuntimeCompat, feature) => {
-    const featureCompat = getFeatureCompat(feature);
-    const runtimeCompat = {
-      ...originalRuntimeCompat,
-    };
-    Object.keys(originalRuntimeCompat).forEach((runtimeName) => {
-      const secondVersion = featureCompat[runtimeName]; // the version supported by the feature
-      if (secondVersion) {
-        const firstVersion = originalRuntimeCompat[runtimeName];
-        runtimeCompat[runtimeName] = findHighestVersion(
-          firstVersion,
-          secondVersion,
-        );
-      }
-    });
-    return runtimeCompat;
-  },
-
-  isSupported: (runtimeCompat, feature) => {
-    const featureCompat = getFeatureCompat(feature);
-    const runtimeNames = Object.keys(runtimeCompat);
-    const runtimeWithoutCompat = runtimeNames.find((runtimeName) => {
-      const runtimeVersion = runtimeCompat[runtimeName];
-      const runtimeVersionCompatible = featureCompat[runtimeName] || "Infinity";
-      const highestVersion = findHighestVersion(
-        runtimeVersion,
-        runtimeVersionCompatible,
-      );
-      return highestVersion !== runtimeVersion;
-    });
-    return !runtimeWithoutCompat;
-  },
-};
-
-const getFeatureCompat = (feature) => {
-  if (typeof feature === "string") {
-    const compat = featuresCompatMap[feature];
-    if (!compat) {
-      throw new Error(`"${feature}" feature is unknown`);
-    }
-    return compat;
-  }
-  if (typeof feature !== "object") {
-    throw new TypeError(
-      `feature must be a string or an object, got ${feature}`,
-    );
-  }
-  return feature;
-};

package/src/plugins/reference_analysis/inline_content.js

@@ -1,7 +0,0 @@
-/* eslint-env browser,node */
-
-const globalObject = typeof self === "object" ? self : process;
-globalObject.__InlineContent__ = function (content, { type = "text/plain" }) {
-  this.text = content;
-  this.type = type;
-};

package/src/plugins/transpilation/as_js_module/convert_js_classic_to_js_module.js

@@ -1,45 +0,0 @@
-import { applyBabelPlugins } from "@jsenv/ast";
-import { composeTwoSourcemaps } from "@jsenv/sourcemap";
-
-import { isWebWorkerUrlInfo } from "@jsenv/core/src/kitchen/web_workers.js";
-
-export const convertJsClassicToJsModule = async ({
-  urlInfo,
-  jsClassicUrlInfo,
-}) => {
-  const { code, map } = await applyBabelPlugins({
-    babelPlugins: [
-      [
-        babelPluginReplaceTopLevelThis,
-        {
-          isWebWorker: isWebWorkerUrlInfo(urlInfo),
-        },
-      ],
-    ],
-    urlInfo: jsClassicUrlInfo,
-  });
-  const sourcemap = await composeTwoSourcemaps(jsClassicUrlInfo.sourcemap, map);
-  return {
-    content: code,
-    sourcemap,
-  };
-};
-
-const babelPluginReplaceTopLevelThis = () => {
-  return {
-    name: "replace-top-level-this",
-    visitor: {
-      Program: (programPath, state) => {
-        const { isWebWorker } = state.opts;
-        programPath.traverse({
-          ThisExpression: (path) => {
-            const closestFunction = path.getFunctionParent();
-            if (!closestFunction) {
-              path.replaceWithSourceString(isWebWorker ? "self" : "window");
-            }
-          },
-        });
-      },
-    },
-  };
-};

package/src/plugins/transpilation/as_js_module/jsenv_plugin_as_js_module.js

@@ -1,78 +0,0 @@
-/*
- * Js modules might not be able to import js meant to be loaded by <script>
- * Among other things this happens for a top level this:
- * - With <script> this is window
- * - With an import this is undefined
- * Example of this: https://github.com/video-dev/hls.js/issues/2911
- *
- * This plugin fix this issue by rewriting top level this into window
- * and can be used like this for instance import("hls?as_js_module")
- */
-
-import { urlToFilename } from "@jsenv/urls";
-
-import { convertJsClassicToJsModule } from "./convert_js_classic_to_js_module.js";
-
-export const jsenvPluginAsJsModule = () => {
-  return {
-    name: "jsenv:as_js_module",
-    appliesDuring: "*",
-    redirectReference: (reference) => {
-      if (reference.searchParams.has("as_js_module")) {
-        reference.expectedType = "js_module";
-        const filename = urlToFilename(reference.url);
-        const [basename] = splitFileExtension(filename);
-        reference.filename = `${basename}.mjs`;
-      }
-    },
-    fetchUrlContent: async (urlInfo, context) => {
-      const [jsClassicReference, jsClassicUrlInfo] =
-        context.getWithoutSearchParam({
-          urlInfo,
-          context,
-          searchParam: "as_js_module",
-          // override the expectedType to "js_classic"
-          // because when there is ?as_js_module it means the underlying resource
-          // is js_classic
-          expectedType: "js_classic",
-        });
-      if (!jsClassicReference) {
-        return null;
-      }
-      await context.fetchUrlContent(jsClassicUrlInfo, {
-        reference: jsClassicReference,
-      });
-      if (context.dev) {
-        context.referenceUtils.found({
-          type: "js_import",
-          subtype: jsClassicReference.subtype,
-          specifier: jsClassicReference.url,
-          expectedType: "js_classic",
-        });
-      } else if (context.build && jsClassicUrlInfo.dependents.size === 0) {
-        context.urlGraph.deleteUrlInfo(jsClassicUrlInfo.url);
-      }
-      const { content, sourcemap } = await convertJsClassicToJsModule({
-        urlInfo,
-        jsClassicUrlInfo,
-      });
-      return {
-        content,
-        contentType: "text/javascript",
-        type: "js_module",
-        originalUrl: jsClassicUrlInfo.originalUrl,
-        originalContent: jsClassicUrlInfo.originalContent,
-        sourcemap,
-        data: jsClassicUrlInfo.data,
-      };
-    },
-  };
-};
-
-const splitFileExtension = (filename) => {
-  const dotLastIndex = filename.lastIndexOf(".");
-  if (dotLastIndex === -1) {
-    return [filename, ""];
-  }
-  return [filename.slice(0, dotLastIndex), filename.slice(dotLastIndex)];
-};