@jsenv/core 19.7.2 → 20.0.2

package/src/buildProject.js

@@ -6,13 +6,17 @@ import {
 import { resolveDirectoryUrl } from "@jsenv/filesystem"
 
 import { executeJsenvAsyncFunction } from "./internal/executeJsenvAsyncFunction.js"
-import { COMPILE_ID_OTHERWISE } from "./internal/CONSTANTS.js"
+import { COMPILE_ID_BEST } from "./internal/CONSTANTS.js"
 import {
   assertProjectDirectoryUrl,
   assertProjectDirectoryExists,
 } from "./internal/argUtils.js"
 import { startCompileServer } from "./internal/compiling/startCompileServer.js"
 import { buildUsingRollup } from "./internal/building/buildUsingRollup.js"
+import {
+  jsenvBrowserRuntimeSupport,
+  jsenvNodeRuntimeSupport,
+} from "./internal/generateGroupMap/jsenvRuntimeSupport.js"
 import { jsenvBabelPluginMap } from "./jsenvBabelPluginMap.js"
 
 export const buildProject = async ({
@@ -23,19 +27,25 @@ export const buildProject = async ({
   logger,
 
   projectDirectoryUrl,
-  jsenvDirectoryRelativeUrl,
-  jsenvDirectoryClean,
+  entryPointMap,
+  buildDirectoryRelativeUrl,
+  buildDirectoryClean = false,
+  assetManifestFile = false,
+  assetManifestFileRelativeUrl = "asset-manifest.json",
+  sourcemapExcludeSources = false,
+  writeOnFileSystem = true,
 
   format,
-
-  browser = format === "global" ||
-    format === "systemjs" ||
-    format === "esmodule",
-  node = format === "commonjs",
-  entryPointMap,
   systemJsUrl = "/node_modules/systemjs/dist/s.min.js",
   globalName,
   globals = {},
+  babelPluginMap = jsenvBabelPluginMap,
+  runtimeSupport = format === "global" ||
+  format === "systemjs" ||
+  format === "esmodule"
+    ? jsenvBrowserRuntimeSupport
+    : jsenvNodeRuntimeSupport,
+  transformTopLevelAwait = true,
 
   urlMappings = {},
   importResolutionMethod = format === "commonjs" ? "node" : "importmap",
@@ -49,29 +59,14 @@ export const buildProject = async ({
     : {},
   importPaths = {},
 
-  env = {},
-
-  compileServerProtocol,
-  compileServerPrivateKey,
-  compileServerCertificate,
-  compileServerIp,
-  compileServerPort,
-  babelPluginMap = jsenvBabelPluginMap,
-  transformTopLevelAwait = true,
-
-  sourcemapExcludeSources = false,
-
-  buildDirectoryRelativeUrl,
-  buildDirectoryClean = false,
-  writeOnFileSystem = true,
-  assetManifestFile = false,
-  assetManifestFileRelativeUrl = "asset-manifest.json",
-
-  preserveEntrySignatures,
+  urlVersioning = true,
+  lineBreakNormalization = process.platform === "win32",
   // when jsConcatenation is disabled rollup becomes almost useless
-  // except it can still do tree shaking but in practice tree shaking
-  // fails to catch many things so...
+  // except it can still do tree shaking
   jsConcatenation = true,
+  useImportMapToImproveLongTermCaching = format === "systemjs",
+  preserveEntrySignatures,
+
   minify = process.env.NODE_ENV === "production",
   // https://github.com/kangax/html-minifier#options-quick-reference
   minifyHtmlOptions = { collapseWhitespace: true },
@@ -80,9 +75,17 @@ export const buildProject = async ({
   // https://github.com/cssnano/cssnano/tree/master/packages/cssnano-preset-default
   minifyCssOptions,
 
-  urlVersioning = true,
-  lineBreakNormalization = process.platform === "win32" && !minify,
-  useImportMapToImproveLongTermCaching = format === "systemjs",
+  serviceWorkers = {},
+  serviceWorkerFinalizer,
+
+  env = {},
+  compileServerProtocol,
+  compileServerPrivateKey,
+  compileServerCertificate,
+  compileServerIp,
+  compileServerPort,
+  jsenvDirectoryRelativeUrl,
+  jsenvDirectoryClean,
 
   // when true .jsenv/out-build directory is generated
   // with all intermediated files used to produce the final build files.
@@ -95,9 +98,6 @@ export const buildProject = async ({
   // (to fix that sourcemap could be inlined)
   filesystemCache = true,
 
-  serviceWorkers = {},
-  serviceWorkerFinalizer,
-
   ...rest
 }) => {
   const jsenvBuildFunction = async ({ jsenvCancellationToken }) => {
@@ -167,6 +167,8 @@ export const buildProject = async ({
       // nor to inject jsenv script
       transformHtmlSourceFiles: false,
 
+      runtimeSupport,
+
       // override with potential custom options
       ...rest,
     })
@@ -182,7 +184,11 @@ export const buildProject = async ({
         entryPointMap,
         projectDirectoryUrl,
         compileServerOrigin,
-        compileDirectoryRelativeUrl: `${outDirectoryRelativeUrl}${COMPILE_ID_OTHERWISE}/`,
+        compileDirectoryRelativeUrl: `${outDirectoryRelativeUrl}${COMPILE_ID_BEST}/`,
+        buildDirectoryUrl,
+        buildDirectoryClean,
+        assetManifestFile,
+        assetManifestFileRelativeUrl,
 
         urlMappings,
         importResolutionMethod,
@@ -192,28 +198,20 @@ export const buildProject = async ({
         externalImportUrlPatterns,
         importPaths,
 
-        babelPluginMap,
-        transformTopLevelAwait,
-        node,
-        browser,
-        writeOnFileSystem,
-
         format,
         systemJsUrl,
         globalName,
         globals,
-        sourcemapExcludeSources,
-
-        buildDirectoryUrl,
-        buildDirectoryClean,
-        assetManifestFile,
-        assetManifestFileRelativeUrl,
+        babelPluginMap,
+        transformTopLevelAwait,
+        runtimeSupport,
 
         urlVersioning,
         lineBreakNormalization,
         useImportMapToImproveLongTermCaching,
         preserveEntrySignatures,
         jsConcatenation,
+
         minify,
         minifyHtmlOptions,
         minifyJsOptions,
@@ -221,6 +219,9 @@ export const buildProject = async ({
 
         serviceWorkers,
         serviceWorkerFinalizer,
+
+        writeOnFileSystem,
+        sourcemapExcludeSources,
       })
 
       return result

package/src/execute.js

@@ -10,6 +10,7 @@ import {
 } from "./internal/argUtils.js"
 import { startCompileServer } from "./internal/compiling/startCompileServer.js"
 import { launchAndExecute } from "./internal/executing/launchAndExecute.js"
+import { jsenvRuntimeSupportDuringDev } from "./jsenvRuntimeSupportDuringDev.js"
 
 export const execute = async ({
   logLevel = "warn",
@@ -50,9 +51,9 @@ export const execute = async ({
   compileServerPort,
   babelPluginMap,
   convertMap,
-  compileGroupCount = 2,
   compileServerCanReadFromFilesystem,
   compileServerCanWriteOnFilesystem,
+  runtimeSupportDuringDev = jsenvRuntimeSupportDuringDev,
 }) => {
   const jsenvExecutionFunction = async ({ jsenvCancellationToken }) => {
     cancellationToken = composeCancellationToken(
@@ -84,6 +85,7 @@ export const execute = async ({
       projectDirectoryUrl,
       jsenvDirectoryRelativeUrl,
       jsenvDirectoryClean,
+      outDirectoryName: "out-dev",
 
       importDefaultExtension,
 
@@ -94,7 +96,7 @@ export const execute = async ({
       compileServerPort,
       babelPluginMap,
       convertMap,
-      compileGroupCount,
+      runtimeSupport: runtimeSupportDuringDev,
       compileServerCanReadFromFilesystem,
       compileServerCanWriteOnFilesystem,
     })

package/src/executeTestPlan.js

@@ -24,6 +24,7 @@ import { generateCoverageJsonFile } from "./internal/executing/coverage/generate
 import { generateCoverageHtmlDirectory } from "./internal/executing/coverage/generateCoverageHtmlDirectory.js"
 import { generateCoverageTextLog } from "./internal/executing/coverage/generateCoverageTextLog.js"
 import { jsenvCoverageConfig } from "./jsenvCoverageConfig.js"
+import { jsenvRuntimeSupportDuringDev } from "./jsenvRuntimeSupportDuringDev.js"
 
 export const executeTestPlan = async ({
   logLevel = "info",
@@ -77,7 +78,8 @@ export const executeTestPlan = async ({
   compileServerCanWriteOnFilesystem,
   babelPluginMap,
   convertMap,
-  compileGroupCount = 2,
+  // we could even affine depending on testPlan
+  runtimeSupportDuringDev = jsenvRuntimeSupportDuringDev,
   jsenvDirectoryClean,
 }) => {
   const jsenvExecuteTestPlanFunction = async ({ jsenvCancellationToken }) => {
@@ -184,7 +186,7 @@ export const executeTestPlan = async ({
       compileServerCanWriteOnFilesystem,
       babelPluginMap,
       convertMap,
-      compileGroupCount,
+      runtimeSupport: runtimeSupportDuringDev,
     })
 
     if (updateProcessExitCode && !executionIsPassed(result)) {

package/src/internal/CONSTANTS.js

@@ -2,10 +2,10 @@ export const COMPILE_ID_BEST = "best"
 
 export const COMPILE_ID_OTHERWISE = "otherwise"
 
-export const COMPILE_ID_BUILD_GLOBAL = "otherwise-build-global"
+export const COMPILE_ID_BUILD_GLOBAL = "build-global"
 
-export const COMPILE_ID_BUILD_GLOBAL_FILES = "otherwise-build-global-files"
+export const COMPILE_ID_BUILD_GLOBAL_FILES = "build-global-files"
 
-export const COMPILE_ID_BUILD_COMMONJS = "otherwise-build-commonjs"
+export const COMPILE_ID_BUILD_COMMONJS = "build-commonjs"
 
-export const COMPILE_ID_BUILD_COMMONJS_FILES = "otherwise-build-commonjs-files"
+export const COMPILE_ID_BUILD_COMMONJS_FILES = "build-commonjs-files"

package/src/internal/building/buildUsingRollup.js

@@ -8,10 +8,24 @@ export const buildUsingRollup = async ({
   cancellationToken,
   logger,
 
-  entryPointMap,
   projectDirectoryUrl,
+  entryPointMap,
   compileServerOrigin,
   compileDirectoryRelativeUrl,
+  buildDirectoryUrl,
+  buildDirectoryClean,
+  assetManifestFile = false,
+  assetManifestFileRelativeUrl,
+  sourcemapExcludeSources,
+  writeOnFileSystem,
+
+  format,
+  systemJsUrl,
+  globalName,
+  globals,
+  babelPluginMap,
+  runtimeSupport,
+  transformTopLevelAwait,
 
   urlMappings,
   importResolutionMethod,
@@ -21,46 +35,52 @@ export const buildUsingRollup = async ({
   externalImportUrlPatterns,
   importPaths,
 
-  babelPluginMap,
-  transformTopLevelAwait,
-  node,
-  browser,
-
-  format,
-  systemJsUrl,
-  globals,
-  globalName,
-  sourcemapExcludeSources,
-
-  buildDirectoryUrl,
-  buildDirectoryClean,
-
   urlVersioning,
+  lineBreakNormalization,
+  jsConcatenation,
   useImportMapToImproveLongTermCaching,
   preserveEntrySignatures,
-  jsConcatenation,
+
   minify,
   minifyJsOptions,
   minifyCssOptions,
   minifyHtmlOptions,
-  assetManifestFile = false,
-  assetManifestFileRelativeUrl,
 
   serviceWorkers,
   serviceWorkerFinalizer,
-
-  lineBreakNormalization,
-  writeOnFileSystem,
 }) => {
+  const node = Boolean(runtimeSupport.node)
+  const browser = Boolean(
+    runtimeSupport.android ||
+      runtimeSupport.chrome ||
+      runtimeSupport.edge ||
+      runtimeSupport.electron ||
+      runtimeSupport.firefox ||
+      runtimeSupport.ios ||
+      runtimeSupport.opera ||
+      runtimeSupport.safari,
+  )
+
   const { jsenvRollupPlugin, getLastErrorMessage, getResult } =
     await createJsenvRollupPlugin({
       cancellationToken,
       logger,
 
-      entryPointMap,
       projectDirectoryUrl,
+      entryPointMap,
       compileServerOrigin,
       compileDirectoryRelativeUrl,
+      buildDirectoryUrl,
+      assetManifestFile,
+      assetManifestFileRelativeUrl,
+      writeOnFileSystem,
+
+      format,
+      systemJsUrl,
+      babelPluginMap,
+      transformTopLevelAwait,
+      node,
+      browser,
 
       urlMappings,
       importResolutionMethod,
@@ -70,27 +90,15 @@ export const buildUsingRollup = async ({
       externalImportUrlPatterns,
       importPaths,
 
-      babelPluginMap,
-      transformTopLevelAwait,
-      node,
-      browser,
-
-      format,
-      systemJsUrl,
-      buildDirectoryUrl,
-
-      jsConcatenation,
       urlVersioning,
       lineBreakNormalization,
+      jsConcatenation,
       useImportMapToImproveLongTermCaching,
+
       minify,
       minifyJsOptions,
       minifyCssOptions,
       minifyHtmlOptions,
-
-      assetManifestFile,
-      assetManifestFileRelativeUrl,
-      writeOnFileSystem,
     })
 
   try {

package/src/internal/building/createJsenvRollupPlugin.js

@@ -51,10 +51,14 @@ export const createJsenvRollupPlugin = async ({
   cancellationToken,
   logger,
 
-  entryPointMap,
   projectDirectoryUrl,
+  entryPointMap,
   compileServerOrigin,
   compileDirectoryRelativeUrl,
+  buildDirectoryUrl,
+  assetManifestFile,
+  assetManifestFileRelativeUrl,
+  writeOnFileSystem,
 
   urlMappings,
   importResolutionMethod,
@@ -64,25 +68,21 @@ export const createJsenvRollupPlugin = async ({
   externalImportUrlPatterns,
   importPaths,
 
+  format,
+  systemJsUrl,
   babelPluginMap,
   transformTopLevelAwait,
   node,
 
-  format,
-  jsConcatenation,
   urlVersioning,
   lineBreakNormalization,
+  jsConcatenation,
   useImportMapToImproveLongTermCaching,
-  systemJsUrl,
+
   minify,
   minifyJsOptions,
   minifyCssOptions,
   minifyHtmlOptions,
-  assetManifestFile,
-  assetManifestFileRelativeUrl,
-  writeOnFileSystem,
-
-  buildDirectoryUrl,
 }) => {
   const urlImporterMap = {}
   const urlResponseBodyMap = {}

package/src/internal/building/css/postcss-urlhash-plugin.js

@@ -126,10 +126,6 @@ export const postCssUrlHashPlugin = () => {
           },
         },
         Declaration: (declarationNode) => {
-          if (!declarationNodeContainsUrl(declarationNode)) {
-            return
-          }
-
           walkUrls(declarationNode, {
             parseCssValue,
             stringifyCssNodes,
@@ -176,10 +172,6 @@ export const postCssUrlHashPlugin = () => {
 }
 postCssUrlHashPlugin.postcss = true
 
-const declarationNodeContainsUrl = (declarationNode) => {
-  return /^(?:url|(?:-webkit-)?image-set)\(/i.test(declarationNode.value)
-}
-
 const walkUrls = (
   declarationNode,
   { parseCssValue, stringifyCssNodes, visitor },

package/src/internal/building/html/parseHtmlAsset.js

@@ -38,6 +38,7 @@ import {
   parseSrcset,
   stringifySrcset,
 } from "@jsenv/core/src/internal/compiling/compileHtml.js"
+import { setJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
 import {
   getTargetAsBase64Url,
   targetIsReferencedOnlyByRessourceHint,
@@ -258,8 +259,14 @@ const moduleScriptSrcVisitor = (script, { format, notifyReferenceFound }) => {
       // here put a warning if we cannot inline importmap because it would mess
       // the remapping (note that it's feasible) but not yet supported
       removeHtmlNodeAttribute(script, srcAttribute)
-      const { targetBuildBuffer } = script.target
-      setHtmlNodeText(script, targetBuildBuffer)
+      const { targetBuildBuffer } = remoteScriptReference.target
+      const jsString = String(targetBuildBuffer)
+
+      const codeWithSourcemapComment = setJavaScriptSourceMappingUrl(
+        jsString,
+        `${remoteScriptReference.target.targetFileName}.map`
+      )
+      setHtmlNodeText(script, codeWithSourcemapComment)
       return
     }
 
@@ -669,6 +676,10 @@ const shouldInline = ({ reference, htmlNode }) => {
     return true
   }
 
+  return readAndRemoveForceInline(htmlNode)
+}
+
+const readAndRemoveForceInline = (htmlNode) => {
   const jsenvForceInlineAttribute = getHtmlNodeAttributeByName(
     htmlNode,
     "data-jsenv-force-inline",

package/src/internal/compiling/compileHtml.js

@@ -286,9 +286,13 @@ export const replaceHtmlNode = (
 
   if (inheritAttributes) {
     newNode.attrs = [
-      // inherit script attributes except src, type, href
+      // inherit script attributes except src, type, href, rel
       ...node.attrs.filter(
-        ({ name }) => name !== "type" && name !== "src" && name !== "href",
+        ({ name }) =>
+          name !== "type" &&
+          name !== "src" &&
+          name !== "href" &&
+          name !== "rel",
       ),
       ...newNode.attrs,
     ]

package/src/internal/compiling/startCompileServer.js

@@ -1,5 +1,5 @@
 /* eslint-disable import/max-dependencies */
-import { readFileSync } from "fs"
+import { readFileSync } from "node:fs"
 import {
   createCancellationToken,
   createCancellationSource,
@@ -28,9 +28,6 @@ import {
   urlToBasename,
 } from "@jsenv/filesystem"
 
-import { jsenvBabelPluginCompatMap } from "../../jsenvBabelPluginCompatMap.js"
-import { jsenvBrowserScoreMap } from "../../jsenvBrowserScoreMap.js"
-import { jsenvNodeVersionScoreMap } from "../../jsenvNodeVersionScoreMap.js"
 import { jsenvBabelPluginMap } from "../../jsenvBabelPluginMap.js"
 import { generateGroupMap } from "../generateGroupMap/generateGroupMap.js"
 import { createCallbackList } from "../createCallbackList.js"
@@ -89,11 +86,7 @@ export const startCompileServer = async ({
   stopOnPackageVersionChange = false,
 
   // remaining options
-  compileGroupCount = 2,
-  babelCompatMap = jsenvBabelPluginCompatMap,
-  browserScoreMap = jsenvBrowserScoreMap,
-  nodeVersionScoreMap = jsenvNodeVersionScoreMap,
-  runtimeAlwaysInsideRuntimeScoreMap = false,
+  runtimeSupport,
 
   livereloadWatchConfig = {
     "./**": true,
@@ -136,10 +129,7 @@ export const startCompileServer = async ({
   const logger = createLogger({ logLevel: compileServerLogLevel })
   const compileServerGroupMap = generateGroupMap({
     babelPluginMap,
-    babelCompatMap,
-    runtimeScoreMap: { ...browserScoreMap, node: nodeVersionScoreMap },
-    groupCount: compileGroupCount,
-    runtimeAlwaysInsideRuntimeScoreMap,
+    runtimeSupport,
   })
 
   babelPluginMap = {

package/src/internal/executing/executePlan.js

@@ -40,7 +40,7 @@ export const executePlan = async (
     compileServerCanWriteOnFilesystem,
     babelPluginMap,
     convertMap,
-    compileGroupCount,
+    runtimeSupport,
   } = {},
 ) => {
   if (coverage) {
@@ -64,6 +64,7 @@ export const executePlan = async (
     projectDirectoryUrl,
     jsenvDirectoryRelativeUrl,
     jsenvDirectoryClean,
+    outDirectoryName: "out-dev",
 
     importResolutionMethod,
     importDefaultExtension,
@@ -78,7 +79,7 @@ export const executePlan = async (
     keepProcessAlive: true, // to be sure it stays alive
     babelPluginMap,
     convertMap,
-    compileGroupCount,
+    runtimeSupport,
   })
 
   const executionSteps = await generateExecutionSteps(