@jsenv/core 29.9.2 → 30.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.9.2",
+  "version": "30.0.0-alpha.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -69,6 +69,7 @@
     "@jsenv/abort": "4.2.4",
     "@jsenv/ast": "1.4.8",
     "@jsenv/babel-plugins": "1.1.0",
+    "@jsenv/plugin-bundling": "1.0.0",
     "@jsenv/filesystem": "4.1.6",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
@@ -80,20 +81,16 @@
     "@jsenv/url-meta": "7.0.0",
     "@jsenv/urls": "1.2.8",
     "@jsenv/utils": "2.0.1",
-    "acorn-import-assertions": "1.8.0",
     "construct-style-sheets-polyfill": "3.1.0",
     "cuid": "2.1.8",
-    "html-minifier": "4.0.0",
     "istanbul-lib-coverage": "3.2.0",
     "istanbul-lib-instrument": "5.2.1",
     "istanbul-lib-report": "3.0.0",
     "istanbul-reports": "3.1.5",
     "launch-editor": "2.6.0",
     "pidtree": "0.6.0",
-    "rollup": "3.7.4",
     "string-width": "5.1.2",
     "strip-ansi": "7.0.1",
-    "terser": "5.16.1",
     "v8-to-istanbul": "9.0.1",
     "wrap-ansi": "8.0.1"
   },
@@ -105,7 +102,8 @@
     "@jsenv/file-size-impact": "13.0.2",
     "@jsenv/https-local": "3.0.1",
     "@jsenv/package-workspace": "0.5.1",
-    "@jsenv/performance-impact": "3.0.2",
+    "@jsenv/plugin-minification": "1.0.0",
+    "@jsenv/performance-impact": "4.1.0",
     "eslint": "8.29.0",
     "eslint-plugin-html": "7.1.0",
     "eslint-plugin-import": "2.26.0",

package/src/build/build.js

@@ -32,6 +32,7 @@ import {
   ensureEmptyDirectory,
   writeFileSync,
   registerDirectoryLifecycle,
+  comparePathnames,
 } from "@jsenv/filesystem"
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import {
@@ -97,8 +98,6 @@ export const defaultRuntimeCompat = {
  *        Directory where asset files will be written
  * @param {string|url} [buildParameters.base=""]
  *        Urls in build file contents will be prefixed with this string
- * @param {boolean|object} [buildParameters.minification=true]
- *        Minify build file contents
  * @param {boolean} [buildParameters.versioning=true]
  *        Controls if url in build file contents are versioned
  * @param {('search_param'|'filename')} [buildParameters.versioningMethod="search_param"]
@@ -132,8 +131,6 @@ export const build = async ({
   fileSystemMagicRedirection,
   directoryReferenceAllowed,
   transpilation = {},
-  bundling = true,
-  minification = !runtimeCompat.node,
   versioning = !runtimeCompat.node,
   versioningMethod = "search_param", // "filename", "search_param"
   lineBreakNormalization = process.platform === "win32",
@@ -264,8 +261,6 @@ build ${entryPointKeys.length} entry points`)
             babelHelpersAsImport: !useExplicitJsClassicConversion,
             jsClassicFallback: false,
           },
-          minification,
-          bundling,
         }),
       ],
       sourcemaps,
@@ -1172,7 +1167,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     urlInfo,
                     kitchen: finalGraphKitchen,
                     versionMappings: versionMappingsNeeded,
-                    minification,
+                    minification: plugins.some(
+                      (plugin) => plugin.name === "jsenv:minification",
+                    ),
                   })
                 })
               }
@@ -1428,8 +1425,15 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     }
 
     const buildManifest = {}
-    const buildFileContents = {}
-    const buildInlineContents = {}
+    const buildContents = {}
+    const buildInlineRelativeUrls = []
+    const getBuildRelativeUrl = (url) => {
+      const urlObject = new URL(url)
+      urlObject.searchParams.delete("as_js_classic")
+      url = urlObject.href
+      const buildRelativeUrl = urlToRelativeUrl(url, buildDirectoryUrl)
+      return buildRelativeUrl
+    }
     GRAPH.forEach(finalGraph, (urlInfo) => {
       if (!urlInfo.shouldHandle) {
         return
@@ -1441,33 +1445,39 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         return
       }
       if (urlInfo.isInline) {
-        const buildRelativeUrl = urlToRelativeUrl(
-          urlInfo.url,
-          buildDirectoryUrl,
-        )
-        buildInlineContents[buildRelativeUrl] = urlInfo.content
+        const buildRelativeUrl = getBuildRelativeUrl(urlInfo.url)
+        buildContents[buildRelativeUrl] = urlInfo.content
+        buildInlineRelativeUrls.push(buildRelativeUrl)
       } else {
         const versionedUrl = versionedUrlMap.get(urlInfo.url)
         if (versionedUrl && canUseVersionedUrl(urlInfo)) {
-          const buildRelativeUrl = urlToRelativeUrl(
-            urlInfo.url,
-            buildDirectoryUrl,
-          )
-          const versionedBuildRelativeUrl = urlToRelativeUrl(
-            versionedUrl,
-            buildDirectoryUrl,
-          )
-          buildFileContents[versionedBuildRelativeUrl] = urlInfo.content
+          const buildRelativeUrl = getBuildRelativeUrl(urlInfo.url)
+          const versionedBuildRelativeUrl = getBuildRelativeUrl(versionedUrl)
+          if (versioningMethod === "search_param") {
+            buildContents[buildRelativeUrl] = urlInfo.content
+          } else {
+            buildContents[versionedBuildRelativeUrl] = urlInfo.content
+          }
           buildManifest[buildRelativeUrl] = versionedBuildRelativeUrl
         } else {
-          const buildRelativeUrl = urlToRelativeUrl(
-            urlInfo.url,
-            buildDirectoryUrl,
-          )
-          buildFileContents[buildRelativeUrl] = urlInfo.content
+          const buildRelativeUrl = getBuildRelativeUrl(urlInfo.url)
+          buildContents[buildRelativeUrl] = urlInfo.content
         }
       }
     })
+    const buildFileContents = {}
+    const buildInlineContents = {}
+    Object.keys(buildContents)
+      .sort((a, b) => comparePathnames(a, b))
+      .forEach((buildRelativeUrl) => {
+        if (buildInlineRelativeUrls.includes(buildRelativeUrl)) {
+          buildInlineContents[buildRelativeUrl] =
+            buildContents[buildRelativeUrl]
+        } else {
+          buildFileContents[buildRelativeUrl] = buildContents[buildRelativeUrl]
+        }
+      })
+
     if (writeOnFileSystem) {
       if (directoryToClean) {
         await ensureEmptyDirectory(directoryToClean)

package/src/plugins/plugins.js

@@ -10,9 +10,6 @@ import { jsenvPluginCommonJsGlobals } from "./commonjs_globals/jsenv_plugin_comm
 import { jsenvPluginImportMetaScenarios } from "./import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js"
 import { jsenvPluginTranspilation } from "./transpilation/jsenv_plugin_transpilation.js"
 import { jsenvPluginNodeRuntime } from "./node_runtime/jsenv_plugin_node_runtime.js"
-// build only
-import { jsenvPluginBundling } from "./bundling/jsenv_plugin_bundling.js"
-import { jsenvPluginMinification } from "./minification/jsenv_plugin_minification.js"
 // autoreload
 import { jsenvPluginImportMetaHot } from "./import_meta_hot/jsenv_plugin_import_meta_hot.js"
 import { jsenvPluginAutoreload } from "./autoreload/jsenv_plugin_autoreload.js"
@@ -35,8 +32,6 @@ export const getCorePlugins = ({
   directoryReferenceAllowed,
   supervisor,
   transpilation = true,
-  minification = false,
-  bundling = false,
 
   clientMainFileUrl,
   clientAutoreload = false,
@@ -91,8 +86,6 @@ export const getCorePlugins = ({
     jsenvPluginImportMetaScenarios(),
 
     jsenvPluginNodeRuntime({ runtimeCompat }),
-    jsenvPluginBundling(bundling),
-    jsenvPluginMinification(minification),
 
     jsenvPluginImportMetaHot(),
     ...(clientAutoreload

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

@@ -1,6 +1,6 @@
-import { createUrlGraphLoader } from "@jsenv/core/src/kitchen/url_graph/url_graph_loader.js"
-import { bundleJsModules } from "@jsenv/core/src/plugins/bundling/js_module/bundle_js_modules.js"
+import { bundleJsModules } from "@jsenv/plugin-bundling"
 
+import { createUrlGraphLoader } from "@jsenv/core/src/kitchen/url_graph/url_graph_loader.js"
 import { convertJsModuleToJsClassic } from "./convert_js_module_to_js_classic.js"
 
 export const jsenvPluginAsJsClassicLibrary = ({

package/src/plugins/transpilation/babel/global_this/babel_plugin_global_this_as_jsenv_import.js

@@ -1,15 +1,15 @@
 import { pathToFileURL } from "node:url"
 import { injectJsImport } from "@jsenv/ast"
 
+export const globalThisClientFileUrl = new URL(
+  "./client/global_this.js",
+  import.meta.url,
+).href
+
 export const babelPluginGlobalThisAsJsenvImport = (
   babel,
   { getImportSpecifier },
 ) => {
-  const globalThisClientFileUrl = new URL(
-    "./client/global_this.js",
-    import.meta.url,
-  ).href
-
   return {
     name: "global-this-as-jsenv-import",
     visitor: {

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

@@ -5,9 +5,18 @@ import { babelPluginInstrument } from "@jsenv/core/src/test/coverage/babel_plugi
 import { RUNTIME_COMPAT } from "@jsenv/core/src/kitchen/compat/runtime_compat.js"
 import { getBaseBabelPluginStructure } from "./helpers/babel_plugin_structure.js"
 import { babelPluginBabelHelpersAsJsenvImports } from "./helpers/babel_plugin_babel_helpers_as_jsenv_imports.js"
-import { babelPluginNewStylesheetAsJsenvImport } from "./new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js"
-import { babelPluginGlobalThisAsJsenvImport } from "./global_this/babel_plugin_global_this_as_jsenv_import.js"
-import { babelPluginRegeneratorRuntimeAsJsenvImport } from "./regenerator_runtime/babel_plugin_regenerator_runtime_as_jsenv_import.js"
+import {
+  babelPluginNewStylesheetAsJsenvImport,
+  newStylesheetClientFileUrl,
+} from "./new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js"
+import {
+  babelPluginGlobalThisAsJsenvImport,
+  globalThisClientFileUrl,
+} from "./global_this/babel_plugin_global_this_as_jsenv_import.js"
+import {
+  babelPluginRegeneratorRuntimeAsJsenvImport,
+  regeneratorRuntimeClientFileUrl,
+} from "./regenerator_runtime/babel_plugin_regenerator_runtime_as_jsenv_import.js"
 
 export const jsenvPluginBabel = ({
   getCustomBabelPlugins,
@@ -106,6 +115,17 @@ export const jsenvPluginBabel = ({
   return {
     name: "jsenv:babel",
     appliesDuring: "*",
+    transformUrlContent: (urlInfo) => {
+      if (urlInfo.url === regeneratorRuntimeClientFileUrl) {
+        urlInfo.data.isBabelClientFile = true
+      }
+      if (urlInfo.url === globalThisClientFileUrl) {
+        urlInfo.data.isBabelClientFile = true
+      }
+      if (urlInfo.url === newStylesheetClientFileUrl) {
+        urlInfo.data.isBabelClientFile = true
+      }
+    },
     finalizeUrlContent: {
       js_classic: transformWithBabel,
       js_module: transformWithBabel,

package/src/plugins/transpilation/babel/new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js

@@ -1,15 +1,15 @@
 import { pathToFileURL } from "node:url"
 import { injectJsImport } from "@jsenv/ast"
 
+export const newStylesheetClientFileUrl = new URL(
+  "./client/new_stylesheet.js",
+  import.meta.url,
+).href
+
 export const babelPluginNewStylesheetAsJsenvImport = (
   babel,
   { getImportSpecifier },
 ) => {
-  const newStylesheetClientFileUrl = new URL(
-    "./client/new_stylesheet.js",
-    import.meta.url,
-  ).href
-
   return {
     name: "new-stylesheet-as-jsenv-import",
     visitor: {

package/src/plugins/transpilation/babel/regenerator_runtime/babel_plugin_regenerator_runtime_as_jsenv_import.js

@@ -1,15 +1,15 @@
 import { pathToFileURL } from "node:url"
 import { injectJsImport } from "@jsenv/ast"
 
+export const regeneratorRuntimeClientFileUrl = new URL(
+  "./client/regenerator_runtime.js",
+  import.meta.url,
+).href
+
 export const babelPluginRegeneratorRuntimeAsJsenvImport = (
   babel,
   { getImportSpecifier },
 ) => {
-  const regeneratorRuntimeClientFileUrl = new URL(
-    "./client/regenerator_runtime.js",
-    import.meta.url,
-  ).href
-
   return {
     name: "regenerator-runtime-as-jsenv-import",
     visitor: {

package/src/kitchen/file_url_converter.js

@@ -1,21 +0,0 @@
-import { fileSystemPathToUrl, urlToFileSystemPath } from "@jsenv/urls"
-
-export const fileUrlConverter = {
-  asFilePath: (fileUrl) => {
-    const filePath = urlToFileSystemPath(fileUrl)
-    const urlObject = new URL(fileUrl)
-    const { searchParams } = urlObject
-    return `${filePath}${stringifyQuery(searchParams)}`
-  },
-  asFileUrl: (filePath) => {
-    return decodeURIComponent(fileSystemPathToUrl(filePath)).replace(
-      /[=](?=&|$)/g,
-      "",
-    )
-  },
-}
-
-const stringifyQuery = (searchParams) => {
-  const search = searchParams.toString()
-  return search ? `?${search}` : ""
-}

package/src/plugins/bundling/css/bundle_css.js

@@ -1,140 +0,0 @@
-/*
- * Each @import found in css is replaced by the file content
- * - There is no need to worry about urls (such as background-image: url())
- *   because they are absolute (file://*) and will be made relative again by jsenv build
- * - The sourcemap are not generated but ideally they should be
- *   It can be quite challenging, see "bundle_sourcemap.js"
- */
-
-import { createMagicSource } from "@jsenv/sourcemap"
-import { applyPostCss, postCssPluginUrlVisitor } from "@jsenv/ast"
-
-import { sortByDependencies } from "@jsenv/core/src/kitchen/url_graph/sort_by_dependencies.js"
-
-// Do not use until https://github.com/parcel-bundler/parcel-css/issues/181
-export const bundleCss = async ({ cssUrlInfos, context }) => {
-  const bundledCssUrlInfos = {}
-  const cssBundleInfos = await performCssBundling({
-    cssEntryUrlInfos: cssUrlInfos,
-    context,
-  })
-  cssUrlInfos.forEach((cssUrlInfo) => {
-    bundledCssUrlInfos[cssUrlInfo.url] = {
-      data: {
-        bundlerName: "parcel",
-      },
-      contentType: "text/css",
-      content: cssBundleInfos[cssUrlInfo.url].bundleContent,
-    }
-  })
-  return bundledCssUrlInfos
-}
-
-const performCssBundling = async ({ cssEntryUrlInfos, context }) => {
-  const cssBundleInfos = await loadCssUrls({
-    cssEntryUrlInfos,
-    context,
-  })
-  const cssUrlsSorted = sortByDependencies(cssBundleInfos)
-  cssUrlsSorted.forEach((cssUrl) => {
-    const cssBundleInfo = cssBundleInfos[cssUrl]
-    const magicSource = createMagicSource(cssBundleInfo.content)
-    cssBundleInfo.cssUrls.forEach((cssUrl) => {
-      if (cssUrl.type === "@import") {
-        magicSource.replace({
-          start: cssUrl.atRuleStart,
-          end: cssUrl.atRuleEnd,
-          replacement: cssBundleInfos[cssUrl.url].bundleContent,
-        })
-      }
-    })
-    const { content } = magicSource.toContentAndSourcemap()
-    cssBundleInfo.bundleContent = content.trim()
-  })
-  return cssBundleInfos
-}
-
-const parseCssUrls = async ({ css, url }) => {
-  const cssUrls = []
-  await applyPostCss({
-    sourcemaps: false,
-    plugins: [
-      postCssPluginUrlVisitor({
-        urlVisitor: ({
-          type,
-          specifier,
-          specifierStart,
-          specifierEnd,
-          atRuleStart,
-          atRuleEnd,
-        }) => {
-          cssUrls.push({
-            type,
-            url: new URL(specifier, url).href,
-            specifierStart,
-            specifierEnd,
-            atRuleStart,
-            atRuleEnd,
-          })
-        },
-      }),
-    ],
-    url,
-    content: css,
-  })
-
-  return cssUrls
-}
-
-const loadCssUrls = async ({ cssEntryUrlInfos, context }) => {
-  const cssBundleInfos = {}
-  const promises = []
-  const promiseMap = new Map()
-
-  const load = (cssUrlInfo) => {
-    const promiseFromData = promiseMap.get(cssUrlInfo.url)
-    if (promiseFromData) return promiseFromData
-    const promise = _load(cssUrlInfo)
-    promises.push(promise)
-    promiseMap.set(cssUrlInfo.url, promise)
-    return promise
-  }
-
-  const _load = async (cssUrlInfo) => {
-    const cssUrls = await parseCssUrls({
-      css: cssUrlInfo.content,
-      url: cssUrlInfo.url,
-    })
-    const cssBundleInfo = {
-      content: cssUrlInfo.content,
-      cssUrls,
-      dependencies: [],
-    }
-    cssBundleInfos[cssUrlInfo.url] = cssBundleInfo
-    cssUrls.forEach((cssUrl) => {
-      if (cssUrl.type === "@import") {
-        cssBundleInfo.dependencies.push(cssUrl.url)
-        const importedCssUrlInfo = context.urlGraph.getUrlInfo(cssUrl.url)
-        load(importedCssUrlInfo)
-      }
-    })
-  }
-
-  cssEntryUrlInfos.forEach((cssEntryUrlInfo) => {
-    load(cssEntryUrlInfo)
-  })
-
-  const waitAll = async () => {
-    if (promises.length === 0) {
-      return
-    }
-    const promisesToWait = promises.slice()
-    promises.length = 0
-    await Promise.all(promisesToWait)
-    await waitAll()
-  }
-  await waitAll()
-  promiseMap.clear()
-
-  return cssBundleInfos
-}

package/src/plugins/bundling/js_classic_workers/bundle_js_classic_workers.js

@@ -1,13 +0,0 @@
-/*
- * TODO:
- * for each js_classic where subtype is a worker
- * take the url info and find importScripts calls
- * and replace them with the corresponding url info file content
- * we'll ikely need to save the importScripts node location to be able to do that
- */
-
-// import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-
-export const bundleJsClassicWorkers = () => {
-  return {}
-}