@jsenv/core 27.0.0-alpha.72 → 27.0.0-alpha.73

package/dist/main.js

@@ -2725,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);
 
@@ -3112,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
 }) => {
@@ -3254,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;
@@ -5133,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
@@ -5144,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
@@ -7965,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
@@ -7977,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);
@@ -10693,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.72",
+  "version": "27.0.0-alpha.73",
   "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/*",
@@ -119,4 +118,4 @@
     "redux": "4.1.2",
     "rollup": "2.70.1"
   }
-}
+}

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/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/require_from_jsenv.js

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

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"