@jsenv/core 27.0.0-alpha.71 → 27.0.0-alpha.74

package/dist/babel_helpers/objectWithoutProperties/objectWithoutProperties.js

@@ -1,4 +1,4 @@
-import objectWithoutPropertiesLoose from "./oose/objectWithoutPropertiesLoose.js";
+import objectWithoutPropertiesLoose from "../objectWithoutPropertiesLoose/objectWithoutPropertiesLoose.js";
 export default ((source, excluded) => {
   if (source === null) return {};
   var target = objectWithoutPropertiesLoose(source, excluded);

package/dist/main.js

@@ -2,8 +2,9 @@ import { parentPort } from "node:worker_threads";
 import { registerFileLifecycle, readFileSync as readFileSync$1, bufferToEtag, writeFileSync, ensureWindowsDriveLetter, collectFiles, assertAndNormalizeDirectoryUrl, registerDirectoryLifecycle, writeFile, ensureEmptyDirectory, writeDirectory } from "@jsenv/filesystem";
 import { createDetailedMessage, createLogger, loggerToLevels } from "@jsenv/logger";
 import { createTaskLog, ANSI, msAsDuration, msAsEllapsedTime, byteAsMemoryUsage, UNICODE, createLog, startSpinner, distributePercentages, byteAsFileSize } from "@jsenv/log";
-import { urlToRelativeUrl, URL_META, generateInlineContentUrl, ensurePathnameTrailingSlash, urlIsInsideOf, urlToFilename, urlToExtension, DataUrl, injectQueryParams, injectQueryParamsIntoSpecifier, fileSystemPathToUrl, urlToFileSystemPath, isFileSystemPath, normalizeUrl, stringifyUrlSite, setUrlFilename, moveUrl, getCallerPosition, resolveUrl, resolveDirectoryUrl, asUrlWithoutSearch, asUrlUntilPathname, urlToBasename } from "@jsenv/urls";
+import { urlToRelativeUrl, generateInlineContentUrl, ensurePathnameTrailingSlash, urlIsInsideOf, urlToFilename, urlToExtension, DATA_URL, injectQueryParams, injectQueryParamsIntoSpecifier, fileSystemPathToUrl, urlToFileSystemPath, isFileSystemPath, normalizeUrl, stringifyUrlSite, setUrlFilename, moveUrl, getCallerPosition, resolveUrl, resolveDirectoryUrl, asUrlWithoutSearch, asUrlUntilPathname, urlToBasename } from "@jsenv/urls";
 import { initReloadableProcess } from "@jsenv/utils/process_reload/process_reload.js";
+import { URL_META } from "@jsenv/url-meta";
 import { parseHtmlString, stringifyHtmlAst, visitHtmlAst, getHtmlNodeAttributeByName, htmlNodePosition, findNode, getHtmlNodeTextNode, removeHtmlNode, setHtmlNodeGeneratedText, removeHtmlNodeAttributeByName, parseScriptNode, injectScriptAsEarlyAsPossible, createHtmlNode, removeHtmlNodeText, assignHtmlNodeAttributes, parseLinkNode } from "@jsenv/utils/html_ast/html_ast.js";
 import { htmlAttributeSrcSet } from "@jsenv/utils/html_ast/html_attribute_src_set.js";
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js";
@@ -1787,7 +1788,7 @@ const jsenvPluginDataUrls = () => {
         contentType,
         base64Flag,
         data: urlData
-      } = DataUrl.parse(urlInfo.url);
+      } = DATA_URL.parse(urlInfo.url);
       urlInfo.data.base64Flag = base64Flag;
       return {
         contentType,
@@ -1817,7 +1818,7 @@ const jsenvPluginDataUrls = () => {
           return reference.generatedUrl;
         }
 
-        const specifier = DataUrl.stringify({
+        const specifier = DATA_URL.stringify({
           contentType: urlInfo.contentType,
           base64Flag: urlInfo.data.base64Flag,
           data: urlInfo.data.base64Flag ? dataToBase64(urlInfo.content) : String(urlInfo.content)
@@ -1883,7 +1884,7 @@ const jsenvPluginInlineQueryParam = () => {
           await context.cook(urlInfo, {
             reference
           });
-          const specifier = DataUrl.stringify({
+          const specifier = DATA_URL.stringify({
             mediaType: urlInfo.contentType,
             base64Flag: true,
             data: Buffer.from(urlInfo.content).toString("base64")
@@ -2724,10 +2725,9 @@ export default inlineContent.text`
   return [asJsonModule, asCssModule, asTextModule];
 };
 
-const require$4 = createRequire(import.meta.url);
-
-const babelPluginPackagePath = require$4.resolve("@jsenv/babel-plugins");
+const requireFromJsenv = createRequire(import.meta.url);
 
+const babelPluginPackagePath = requireFromJsenv.resolve("@jsenv/babel-plugins");
 const babelPluginPackageUrl = pathToFileURL(babelPluginPackagePath);
 const requireBabelPlugin = createRequire(babelPluginPackageUrl);
 
@@ -3111,9 +3111,6 @@ const jsenvPluginAsJsClassicWorkers = ({
  * But ideally babel should not generate this in the first place
  * and prefer to unique identifier based solely on the specifier basename for instance
  */
-
-const require$3 = createRequire(import.meta.url);
-
 const jsenvPluginAsJsClassic = ({
   systemJsInjection
 }) => {
@@ -3253,11 +3250,11 @@ const convertJsModuleToJsClassic = async ({
   } = await applyBabelPlugins({
     babelPlugins: [...(jsClassicFormat === "system" ? [// propposal-dynamic-import required with systemjs for babel8:
     // https://github.com/babel/babel/issues/10746
-    require$3("@babel/plugin-proposal-dynamic-import"), [requireBabelPlugin("babel-plugin-transform-async-to-promises"), {
+    requireFromJsenv("@babel/plugin-proposal-dynamic-import"), [requireBabelPlugin("babel-plugin-transform-async-to-promises"), {
       topLevelAwait: "return"
-    }], require$3("@babel/plugin-transform-modules-systemjs")] : [[requireBabelPlugin("babel-plugin-transform-async-to-promises"), {
+    }], requireFromJsenv("@babel/plugin-transform-modules-systemjs")] : [[requireBabelPlugin("babel-plugin-transform-async-to-promises"), {
       topLevelAwait: "simple"
-    }], babelPluginTransformImportMetaUrl, require$3("@babel/plugin-transform-modules-umd")])],
+    }], babelPluginTransformImportMetaUrl, requireFromJsenv("@babel/plugin-transform-modules-umd")])],
     urlInfo
   });
   let sourcemap = urlInfo.sourcemap;
@@ -5132,9 +5129,6 @@ const jsenvPluginBundling = bundling => {
   };
 };
 
-const require$2 = createRequire(import.meta.url); // https://github.com/kangax/html-minifier#options-quick-reference
-
-
 const minifyHtml = ({
   htmlUrlInfo,
   options
@@ -5143,11 +5137,9 @@ const minifyHtml = ({
     collapseWhitespace = true,
     removeComments = true
   } = options;
-
   const {
     minify
-  } = require$2("html-minifier");
-
+  } = requireFromJsenv("html-minifier");
   const htmlMinified = minify(htmlUrlInfo.content, {
     collapseWhitespace,
     removeComments
@@ -7964,8 +7956,6 @@ const determineFileUrlForOutDirectory = ({
 //   }
 // }
 
-const require$1 = createRequire(import.meta.url);
-
 const parseUserAgentHeader = memoizeByFirstArgument(userAgent => {
   if (userAgent.includes("node-fetch/")) {
     // it's not really node and conceptually we can't assume the node version
@@ -7976,8 +7966,7 @@ const parseUserAgentHeader = memoizeByFirstArgument(userAgent => {
     };
   }
 
-  const UA = require$1("@financial-times/polyfill-useragent-normaliser");
-
+  const UA = requireFromJsenv("@financial-times/polyfill-useragent-normaliser");
   const {
     ua
   } = new UA(userAgent);
@@ -8358,7 +8347,7 @@ const jsenvPluginExplorer = ({
         meta
       }));
       let html = String(readFileSync(new URL(htmlClientFileUrl)));
-      html = html.replace("virtual:FAVICON_HREF", DataUrl.stringify({
+      html = html.replace("virtual:FAVICON_HREF", DATA_URL.stringify({
         contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
         base64Flag: true,
         data: readFileSync(new URL(faviconClientFileUrl)).toString("base64")
@@ -10692,15 +10681,11 @@ const getDebugInfo = processOptions => {
 //   return typeof process.env.VSCODE_PID === "string"
 // }
 
-const require = createRequire(import.meta.url); // see also https://github.com/sindresorhus/execa/issues/96
-
-
 const killProcessTree = async (processId, {
   signal,
   timeout = 2000
 }) => {
-  const pidtree = require("pidtree");
-
+  const pidtree = requireFromJsenv("pidtree");
   let descendantProcessIds;
 
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.71",
+  "version": "27.0.0-alpha.74",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -24,17 +24,16 @@
   "exports": {
     ".": {
       "import": {
-        "development": "./main.js",
+        "development": "./src/main.js",
         "default": "./dist/main.js"
       }
     },
     "./*": "./*"
   },
-  "main": "main.js",
+  "main": "./src/main.js",
   "files": [
     "/dist/",
-    "/src/",
-    "/main.js"
+    "/src/"
   ],
   "workspaces": [
     "./packages/*",
@@ -69,7 +68,7 @@
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/abort": "4.1.2",
     "@jsenv/babel-plugins": "1.0.3",
-    "@jsenv/filesystem": "4.0.2",
+    "@jsenv/filesystem": "4.0.4",
     "@jsenv/importmap": "1.2.0",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "1.6.3",
@@ -77,8 +76,9 @@
     "@jsenv/node-esm-resolution": "0.0.10",
     "@jsenv/server": "12.6.3",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.8.5",
-    "@jsenv/urls": "1.1.2",
+    "@jsenv/utils": "1.8.7",
+    "@jsenv/url-meta": "7.0.0",
+    "@jsenv/urls": "1.2.1",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",

package/src/dev/plugins/explorer/jsenv_plugin_explorer.js

@@ -1,5 +1,5 @@
 import { readFileSync } from "node:fs"
-import { DataUrl } from "@jsenv/urls"
+import { DATA_URL } from "@jsenv/urls"
 import { collectFiles } from "@jsenv/filesystem"
 
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
@@ -38,7 +38,7 @@ export const jsenvPluginExplorer = ({ groups }) => {
       let html = String(readFileSync(new URL(htmlClientFileUrl)))
       html = html.replace(
         "virtual:FAVICON_HREF",
-        DataUrl.stringify({
+        DATA_URL.stringify({
           contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
           base64Flag: true,
           data: readFileSync(new URL(faviconClientFileUrl)).toString("base64"),

package/src/execute/runtimes/node/kill_process_tree.js

@@ -1,13 +1,11 @@
-import { createRequire } from "node:module"
-
-const require = createRequire(import.meta.url)
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 
 // see also https://github.com/sindresorhus/execa/issues/96
 export const killProcessTree = async (
   processId,
   { signal, timeout = 2000 },
 ) => {
-  const pidtree = require("pidtree")
+  const pidtree = requireFromJsenv("pidtree")
 
   let descendantProcessIds
   try {

package/src/main.js

@@ -0,0 +1,27 @@
+// dev
+export { startDevServer } from "./dev/start_dev_server.js"
+// test
+export {
+  executeTestPlan,
+  defaultCoverageConfig,
+} from "./test/execute_test_plan.js"
+export {
+  chromium,
+  chromiumIsolatedTab,
+} from "./execute/runtimes/browsers/chromium.js"
+export {
+  firefox,
+  firefoxIsolatedTab,
+} from "./execute/runtimes/browsers/firefox.js"
+export {
+  webkit,
+  webkitIsolatedTab,
+} from "./execute/runtimes/browsers/webkit.js"
+export { nodeProcess } from "./execute/runtimes/node/node_process.js"
+// build
+export { build } from "./build/build.js"
+export { startBuildServer } from "./build/start_build_server.js"
+
+// advanced
+export { execute } from "./execute/execute.js"
+export { injectGlobals } from "./plugins/inject_globals/jsenv_plugin_inject_globals.js"

package/src/omega/server/user_agent.js

@@ -1,8 +1,5 @@
-import { createRequire } from "node:module"
-
 import { memoizeByFirstArgument } from "@jsenv/utils/memoize/memoize_by_first_argument.js"
-
-const require = createRequire(import.meta.url)
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 
 export const parseUserAgentHeader = memoizeByFirstArgument((userAgent) => {
   if (userAgent.includes("node-fetch/")) {
@@ -13,7 +10,7 @@ export const parseUserAgentHeader = memoizeByFirstArgument((userAgent) => {
       runtimeVersion: process.version.slice(1),
     }
   }
-  const UA = require("@financial-times/polyfill-useragent-normaliser")
+  const UA = requireFromJsenv("@financial-times/polyfill-useragent-normaliser")
   const { ua } = new UA(userAgent)
   const { family, major, minor, patch } = ua
   return {

package/src/plugins/bundling/js_module/bundle_js_module.js

@@ -1,5 +1,6 @@
 import { pathToFileURL } from "node:url"
-import { isFileSystemPath, URL_META } from "@jsenv/urls"
+import { URL_META } from "@jsenv/url-meta"
+import { isFileSystemPath } from "@jsenv/urls"
 import { createDetailedMessage } from "@jsenv/logger"
 
 import { babelHelperNameFromUrl } from "@jsenv/babel-plugins"

package/src/plugins/inline/jsenv_plugin_data_urls.js

@@ -1,4 +1,4 @@
-import { DataUrl } from "@jsenv/urls"
+import { DATA_URL } from "@jsenv/urls"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 
 export const jsenvPluginDataUrls = () => {
@@ -19,7 +19,7 @@ export const jsenvPluginDataUrls = () => {
         contentType,
         base64Flag,
         data: urlData,
-      } = DataUrl.parse(urlInfo.url)
+      } = DATA_URL.parse(urlInfo.url)
       urlInfo.data.base64Flag = base64Flag
       return {
         contentType,
@@ -39,7 +39,7 @@ export const jsenvPluginDataUrls = () => {
         if (urlInfo.originalContent === urlInfo.content) {
           return reference.generatedUrl
         }
-        const specifier = DataUrl.stringify({
+        const specifier = DATA_URL.stringify({
           contentType: urlInfo.contentType,
           base64Flag: urlInfo.data.base64Flag,
           data: urlInfo.data.base64Flag

package/src/plugins/inline/jsenv_plugin_inline_query_param.js

@@ -1,4 +1,4 @@
-import { DataUrl } from "@jsenv/urls"
+import { DATA_URL } from "@jsenv/urls"
 
 export const jsenvPluginInlineQueryParam = () => {
   return {
@@ -26,7 +26,7 @@ export const jsenvPluginInlineQueryParam = () => {
         return (async () => {
           const urlInfo = context.urlGraph.getUrlInfo(reference.url)
           await context.cook(urlInfo, { reference })
-          const specifier = DataUrl.stringify({
+          const specifier = DATA_URL.stringify({
             mediaType: urlInfo.contentType,
             base64Flag: true,
             data: Buffer.from(urlInfo.content).toString("base64"),

package/src/plugins/minification/html/minify_html.js

@@ -1,12 +1,10 @@
-import { createRequire } from "node:module"
-
-const require = createRequire(import.meta.url)
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 
 // https://github.com/kangax/html-minifier#options-quick-reference
 export const minifyHtml = ({ htmlUrlInfo, options } = {}) => {
   const { collapseWhitespace = true, removeComments = true } = options
 
-  const { minify } = require("html-minifier")
+  const { minify } = requireFromJsenv("html-minifier")
   const htmlMinified = minify(htmlUrlInfo.content, {
     collapseWhitespace,
     removeComments,

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js

@@ -11,10 +11,10 @@
  * and prefer to unique identifier based solely on the specifier basename for instance
  */
 
-import { createRequire } from "node:module"
 import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 import { readFileSync } from "@jsenv/filesystem"
 
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
@@ -24,8 +24,6 @@ import { babelPluginTransformImportMetaUrl } from "./helpers/babel_plugin_transf
 import { jsenvPluginAsJsClassicHtml } from "./jsenv_plugin_as_js_classic_html.js"
 import { jsenvPluginAsJsClassicWorkers } from "./jsenv_plugin_as_js_classic_workers.js"
 
-const require = createRequire(import.meta.url)
-
 export const jsenvPluginAsJsClassic = ({ systemJsInjection }) => {
   const systemJsClientFileUrl = new URL(
     "./client/s.js?js_classic",
@@ -171,14 +169,14 @@ const convertJsModuleToJsClassic = async ({
         ? [
             // propposal-dynamic-import required with systemjs for babel8:
             // https://github.com/babel/babel/issues/10746
-            require("@babel/plugin-proposal-dynamic-import"),
+            requireFromJsenv("@babel/plugin-proposal-dynamic-import"),
             [
               requireBabelPlugin("babel-plugin-transform-async-to-promises"),
               {
                 topLevelAwait: "return",
               },
             ],
-            require("@babel/plugin-transform-modules-systemjs"),
+            requireFromJsenv("@babel/plugin-transform-modules-systemjs"),
           ]
         : [
             [
@@ -188,7 +186,7 @@ const convertJsModuleToJsClassic = async ({
               },
             ],
             babelPluginTransformImportMetaUrl,
-            require("@babel/plugin-transform-modules-umd"),
+            requireFromJsenv("@babel/plugin-transform-modules-umd"),
           ]),
     ],
     urlInfo,

package/src/plugins/transpilation/babel/require_babel_plugin.js

@@ -1,8 +1,8 @@
 import { createRequire } from "node:module"
 import { pathToFileURL } from "node:url"
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 
-const require = createRequire(import.meta.url)
-const babelPluginPackagePath = require.resolve("@jsenv/babel-plugins")
+const babelPluginPackagePath = requireFromJsenv.resolve("@jsenv/babel-plugins")
 const babelPluginPackageUrl = pathToFileURL(babelPluginPackagePath)
 
 export const requireBabelPlugin = createRequire(babelPluginPackageUrl)

package/src/plugins/url_analysis/jsenv_plugin_url_analysis.js

@@ -1,4 +1,5 @@
-import { urlToRelativeUrl, URL_META } from "@jsenv/urls"
+import { URL_META } from "@jsenv/url-meta"
+import { urlToRelativeUrl } from "@jsenv/urls"
 
 import { parseAndTransformHtmlUrls } from "./html/html_urls.js"
 import { parseAndTransformCssUrls } from "./css/css_urls.js"

package/src/require_from_jsenv.js

@@ -0,0 +1,3 @@
+import { createRequire } from "node:module"
+
+export const requireFromJsenv = createRequire(import.meta.url)

package/src/test/execute_plan.js

@@ -3,7 +3,8 @@ import { memoryUsage } from "node:process"
 import wrapAnsi from "wrap-ansi"
 import stripAnsi from "strip-ansi"
 import cuid from "cuid"
-import { URL_META, urlToFileSystemPath } from "@jsenv/urls"
+import { URL_META } from "@jsenv/url-meta"
+import { urlToFileSystemPath } from "@jsenv/urls"
 import { createDetailedMessage, loggerToLevels } from "@jsenv/logger"
 import { createLog, startSpinner } from "@jsenv/log"
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"

package/src/test/execute_test_plan.js

@@ -1,4 +1,5 @@
-import { urlToFileSystemPath, resolveDirectoryUrl, URL_META } from "@jsenv/urls"
+import { URL_META } from "@jsenv/url-meta"
+import { urlToFileSystemPath, resolveDirectoryUrl } from "@jsenv/urls"
 import {
   ensureEmptyDirectory,
   assertAndNormalizeDirectoryUrl,

package/main.js

@@ -1,27 +0,0 @@
-// dev
-export { startDevServer } from "./src/dev/start_dev_server.js"
-// test
-export {
-  executeTestPlan,
-  defaultCoverageConfig,
-} from "./src/test/execute_test_plan.js"
-export {
-  chromium,
-  chromiumIsolatedTab,
-} from "./src/execute/runtimes/browsers/chromium.js"
-export {
-  firefox,
-  firefoxIsolatedTab,
-} from "./src/execute/runtimes/browsers/firefox.js"
-export {
-  webkit,
-  webkitIsolatedTab,
-} from "./src/execute/runtimes/browsers/webkit.js"
-export { nodeProcess } from "./src/execute/runtimes/node/node_process.js"
-// build
-export { build } from "./src/build/build.js"
-export { startBuildServer } from "./src/build/start_build_server.js"
-
-// advanced
-export { execute } from "./src/execute/execute.js"
-export { injectGlobals } from "./src/plugins/inject_globals/jsenv_plugin_inject_globals.js"