@jsenv/core 30.0.0-alpha.1 → 30.0.1

package/dist/main.js

@@ -24813,7 +24813,7 @@ const registerEvent = ({
 
 const chromium = createRuntimeFromPlaywright({
   browserName: "chromium",
-  browserVersion: "108.0.5359.29",
+  browserVersion: "109.0.5414.46",
   // to update, check https://github.com/microsoft/playwright/releases
   coveragePlaywrightAPIAvailable: true
 });
@@ -24821,7 +24821,7 @@ const chromiumIsolatedTab = chromium.isolatedTab;
 
 const firefox = createRuntimeFromPlaywright({
   browserName: "firefox",
-  browserVersion: "106.0" // to update, check https://github.com/microsoft/playwright/releases
+  browserVersion: "107.0" // to update, check https://github.com/microsoft/playwright/releases
 });
 
 const firefoxIsolatedTab = firefox.isolatedTab;
@@ -25903,132 +25903,6 @@ const createBuildFilesService = ({
 };
 const SECONDS_IN_30_DAYS = 60 * 60 * 24 * 30;
 
-const injectGlobals = (urlInfo, globals) => {
-  if (urlInfo.type === "html") {
-    return globalInjectorOnHtml(urlInfo, globals);
-  }
-  if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
-    return globalsInjectorOnJs(urlInfo, globals);
-  }
-  throw new Error(`cannot inject globals into "${urlInfo.type}"`);
-};
-const globalInjectorOnHtml = async (urlInfo, globals) => {
-  // ideally we would inject an importmap but browser support is too low
-  // (even worse for worker/service worker)
-  // so for now we inject code into entry points
-  const htmlAst = parseHtmlString(urlInfo.content, {
-    storeOriginalPositions: false
-  });
-  const clientCode = generateClientCodeForGlobals({
-    globals,
-    isWebWorker: false
-  });
-  injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
-    tagName: "script",
-    textContent: clientCode
-  }), "jsenv:inject_globals");
-  return stringifyHtmlAst(htmlAst);
-};
-const globalsInjectorOnJs = async (urlInfo, globals) => {
-  const clientCode = generateClientCodeForGlobals({
-    globals,
-    isWebWorker: urlInfo.subtype === "worker" || urlInfo.subtype === "service_worker" || urlInfo.subtype === "shared_worker"
-  });
-  const magicSource = createMagicSource(urlInfo.content);
-  magicSource.prepend(clientCode);
-  return magicSource.toContentAndSourcemap();
-};
-const generateClientCodeForGlobals = ({
-  isWebWorker = false,
-  globals
-}) => {
-  const globalName = isWebWorker ? "self" : "window";
-  return `Object.assign(${globalName}, ${JSON.stringify(globals, null, "  ")});`;
-};
-
-const jsenvPluginInjectGlobals = rawAssociations => {
-  let resolvedAssociations;
-  return {
-    name: "jsenv:inject_globals",
-    appliesDuring: "*",
-    init: context => {
-      resolvedAssociations = URL_META.resolveAssociations({
-        injector: rawAssociations
-      }, context.rootDirectoryUrl);
-    },
-    transformUrlContent: async (urlInfo, context) => {
-      const {
-        injector
-      } = URL_META.applyAssociations({
-        url: asUrlWithoutSearch(urlInfo.url),
-        associations: resolvedAssociations
-      });
-      if (!injector) {
-        return null;
-      }
-      if (typeof injector !== "function") {
-        throw new TypeError("injector must be a function");
-      }
-      const globals = await injector(urlInfo, context);
-      if (!globals || Object.keys(globals).length === 0) {
-        return null;
-      }
-      return injectGlobals(urlInfo, globals);
-    }
-  };
-};
-
-const replacePlaceholders = (urlInfo, replacements) => {
-  const content = urlInfo.content;
-  const magicSource = createMagicSource(content);
-  Object.keys(replacements).forEach(key => {
-    let index = content.indexOf(key);
-    while (index !== -1) {
-      const start = index;
-      const end = index + key.length;
-      magicSource.replace({
-        start,
-        end,
-        replacement: urlInfo.type === "js_classic" || urlInfo.type === "js_module" || urlInfo.type === "html" ? JSON.stringify(replacements[key], null, "  ") : replacements[key]
-      });
-      index = content.indexOf(key, end);
-    }
-  });
-  return magicSource.toContentAndSourcemap();
-};
-
-const jsenvPluginPlaceholders = rawAssociations => {
-  let resolvedAssociations;
-  return {
-    name: "jsenv:placeholders",
-    appliesDuring: "*",
-    init: context => {
-      resolvedAssociations = URL_META.resolveAssociations({
-        replacer: rawAssociations
-      }, context.rootDirectoryUrl);
-    },
-    transformUrlContent: async (urlInfo, context) => {
-      const {
-        replacer
-      } = URL_META.applyAssociations({
-        url: asUrlWithoutSearch(urlInfo.url),
-        associations: resolvedAssociations
-      });
-      if (!replacer) {
-        return null;
-      }
-      if (typeof replacer !== "function") {
-        throw new TypeError("replacer must be a function");
-      }
-      const replacements = await replacer(urlInfo, context);
-      if (!replacements || Object.keys(replacements).length === 0) {
-        return null;
-      }
-      return replacePlaceholders(urlInfo, replacements);
-    }
-  };
-};
-
 const execute = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,
@@ -26114,4 +25988,4 @@ const execute = async ({
   }
 };
 
-export { build, chromium, chromiumIsolatedTab, execute, executeTestPlan, firefox, firefoxIsolatedTab, jsenvPluginInjectGlobals, jsenvPluginPlaceholders, nodeChildProcess, nodeWorkerThread, pingServer, startBuildServer, startDevServer, webkit, webkitIsolatedTab };
+export { build, chromium, chromiumIsolatedTab, execute, executeTestPlan, firefox, firefoxIsolatedTab, nodeChildProcess, nodeWorkerThread, pingServer, startBuildServer, startDevServer, webkit, webkitIsolatedTab };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "30.0.0-alpha.1",
+  "version": "30.0.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -102,13 +102,15 @@
     "@jsenv/file-size-impact": "13.0.2",
     "@jsenv/https-local": "3.0.1",
     "@jsenv/package-workspace": "0.5.1",
-    "@jsenv/plugin-minification": "1.0.0",
+    "@jsenv/plugin-minification": "./packages/jsenv-plugin-minification/",
+    "@jsenv/plugin-globals": "./packages/jsenv-plugin-globals/",
+    "@jsenv/plugin-placeholders": "./packages/jsenv-plugin-placeholders/",
     "@jsenv/performance-impact": "4.1.0",
-    "eslint": "8.29.0",
+    "eslint": "8.30.0",
     "eslint-plugin-html": "7.1.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-react": "7.31.11",
-    "playwright": "1.28.1",
+    "playwright": "1.29.1",
     "prettier": "2.8.1"
   }
 }

package/src/execute/runtimes/browsers/chromium.js

@@ -2,7 +2,7 @@ import { createRuntimeFromPlaywright } from "./from_playwright.js"
 
 export const chromium = createRuntimeFromPlaywright({
   browserName: "chromium",
-  browserVersion: "108.0.5359.29", // to update, check https://github.com/microsoft/playwright/releases
+  browserVersion: "109.0.5414.46", // to update, check https://github.com/microsoft/playwright/releases
   coveragePlaywrightAPIAvailable: true,
 })
 export const chromiumIsolatedTab = chromium.isolatedTab

package/src/execute/runtimes/browsers/firefox.js

@@ -2,6 +2,6 @@ import { createRuntimeFromPlaywright } from "./from_playwright.js"
 
 export const firefox = createRuntimeFromPlaywright({
   browserName: "firefox",
-  browserVersion: "106.0", // to update, check https://github.com/microsoft/playwright/releases
+  browserVersion: "107.0", // to update, check https://github.com/microsoft/playwright/releases
 })
 export const firefoxIsolatedTab = firefox.isolatedTab

package/src/main.js

@@ -25,6 +25,4 @@ export { startBuildServer } from "./build/start_build_server.js"
 export { pingServer } from "./ping_server.js"
 
 // advanced
-export { jsenvPluginInjectGlobals } from "./plugins/inject_globals/jsenv_plugin_inject_globals.js"
-export { jsenvPluginPlaceholders } from "./plugins/placeholders/jsenv_plugin_placeholders.js"
 export { execute } from "./execute/execute.js"

package/src/plugins/inject_globals/inject_globals.js

@@ -1,57 +0,0 @@
-import { createMagicSource } from "@jsenv/sourcemap"
-import {
-  parseHtmlString,
-  injectScriptNodeAsEarlyAsPossible,
-  createHtmlNode,
-  stringifyHtmlAst,
-} from "@jsenv/ast"
-
-export const injectGlobals = (urlInfo, globals) => {
-  if (urlInfo.type === "html") {
-    return globalInjectorOnHtml(urlInfo, globals)
-  }
-  if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
-    return globalsInjectorOnJs(urlInfo, globals)
-  }
-  throw new Error(`cannot inject globals into "${urlInfo.type}"`)
-}
-
-const globalInjectorOnHtml = async (urlInfo, globals) => {
-  // ideally we would inject an importmap but browser support is too low
-  // (even worse for worker/service worker)
-  // so for now we inject code into entry points
-  const htmlAst = parseHtmlString(urlInfo.content, {
-    storeOriginalPositions: false,
-  })
-  const clientCode = generateClientCodeForGlobals({
-    globals,
-    isWebWorker: false,
-  })
-  injectScriptNodeAsEarlyAsPossible(
-    htmlAst,
-    createHtmlNode({
-      tagName: "script",
-      textContent: clientCode,
-    }),
-    "jsenv:inject_globals",
-  )
-  return stringifyHtmlAst(htmlAst)
-}
-
-const globalsInjectorOnJs = async (urlInfo, globals) => {
-  const clientCode = generateClientCodeForGlobals({
-    globals,
-    isWebWorker:
-      urlInfo.subtype === "worker" ||
-      urlInfo.subtype === "service_worker" ||
-      urlInfo.subtype === "shared_worker",
-  })
-  const magicSource = createMagicSource(urlInfo.content)
-  magicSource.prepend(clientCode)
-  return magicSource.toContentAndSourcemap()
-}
-
-const generateClientCodeForGlobals = ({ isWebWorker = false, globals }) => {
-  const globalName = isWebWorker ? "self" : "window"
-  return `Object.assign(${globalName}, ${JSON.stringify(globals, null, "  ")});`
-}

package/src/plugins/inject_globals/jsenv_plugin_inject_globals.js

@@ -1,36 +0,0 @@
-import { URL_META } from "@jsenv/url-meta"
-import { asUrlWithoutSearch } from "@jsenv/urls"
-
-import { injectGlobals } from "./inject_globals.js"
-
-export const jsenvPluginInjectGlobals = (rawAssociations) => {
-  let resolvedAssociations
-
-  return {
-    name: "jsenv:inject_globals",
-    appliesDuring: "*",
-    init: (context) => {
-      resolvedAssociations = URL_META.resolveAssociations(
-        { injector: rawAssociations },
-        context.rootDirectoryUrl,
-      )
-    },
-    transformUrlContent: async (urlInfo, context) => {
-      const { injector } = URL_META.applyAssociations({
-        url: asUrlWithoutSearch(urlInfo.url),
-        associations: resolvedAssociations,
-      })
-      if (!injector) {
-        return null
-      }
-      if (typeof injector !== "function") {
-        throw new TypeError("injector must be a function")
-      }
-      const globals = await injector(urlInfo, context)
-      if (!globals || Object.keys(globals).length === 0) {
-        return null
-      }
-      return injectGlobals(urlInfo, globals)
-    },
-  }
-}

package/src/plugins/placeholders/jsenv_plugin_placeholders.js

@@ -1,36 +0,0 @@
-import { URL_META } from "@jsenv/url-meta"
-import { asUrlWithoutSearch } from "@jsenv/urls"
-
-import { replacePlaceholders } from "./replace_placeholders.js"
-
-export const jsenvPluginPlaceholders = (rawAssociations) => {
-  let resolvedAssociations
-
-  return {
-    name: "jsenv:placeholders",
-    appliesDuring: "*",
-    init: (context) => {
-      resolvedAssociations = URL_META.resolveAssociations(
-        { replacer: rawAssociations },
-        context.rootDirectoryUrl,
-      )
-    },
-    transformUrlContent: async (urlInfo, context) => {
-      const { replacer } = URL_META.applyAssociations({
-        url: asUrlWithoutSearch(urlInfo.url),
-        associations: resolvedAssociations,
-      })
-      if (!replacer) {
-        return null
-      }
-      if (typeof replacer !== "function") {
-        throw new TypeError("replacer must be a function")
-      }
-      const replacements = await replacer(urlInfo, context)
-      if (!replacements || Object.keys(replacements).length === 0) {
-        return null
-      }
-      return replacePlaceholders(urlInfo, replacements)
-    },
-  }
-}

package/src/plugins/placeholders/replace_placeholders.js

@@ -1,25 +0,0 @@
-import { createMagicSource } from "@jsenv/sourcemap"
-
-export const replacePlaceholders = (urlInfo, replacements) => {
-  const content = urlInfo.content
-  const magicSource = createMagicSource(content)
-  Object.keys(replacements).forEach((key) => {
-    let index = content.indexOf(key)
-    while (index !== -1) {
-      const start = index
-      const end = index + key.length
-      magicSource.replace({
-        start,
-        end,
-        replacement:
-          urlInfo.type === "js_classic" ||
-          urlInfo.type === "js_module" ||
-          urlInfo.type === "html"
-            ? JSON.stringify(replacements[key], null, "  ")
-            : replacements[key],
-      })
-      index = content.indexOf(key, end)
-    }
-  })
-  return magicSource.toContentAndSourcemap()
-}