@jsenv/core 27.0.0-alpha.14 → 27.0.0-alpha.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.14",
+  "version": "27.0.0-alpha.17",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -11,7 +11,8 @@
     "node": ">=16.13.0"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "type": "module",
   "imports": {},
@@ -66,7 +67,7 @@
     "@jsenv/node-esm-resolution": "0.0.2",
     "@jsenv/server": "12.6.1",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.1.0",
+    "@jsenv/utils": "1.2.1",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",
@@ -110,4 +111,4 @@
     "redux": "4.1.2",
     "rollup": "2.70.1"
   }
-}
+}

package/src/build/start_build_server.js

@@ -26,12 +26,13 @@ import { createLogger } from "@jsenv/logger"
 
 import { createTaskLog } from "@jsenv/utils/logs/task_log.js"
 import { watchFiles } from "@jsenv/utils/file_watcher/file_watcher.js"
-import { build } from "../build/build.js"
+import { executeCommand } from "@jsenv/utils/command/command.js"
 
 export const startBuildServer = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,
   logLevel,
+  buildCommandLogLevel = "warn",
   protocol,
   http2,
   certificate,
@@ -42,24 +43,9 @@ export const startBuildServer = async ({
 
   rootDirectoryUrl,
   buildDirectoryUrl,
-  entryPoints,
-
-  plugins,
-  sourcemaps,
-  nodeEsmResolution,
-  fileSystemMagicResolution,
-  injectedGlobals,
-  runtimeCompat,
-  transpilation,
-  bundling,
-  minification,
-  versioning,
-  versioningMethod = "search_param", // "filename", "search_param"
-  lineBreakNormalization,
+  buildCommand,
   watchedFilePatterns,
   cooldownBetweenFileEvents,
-
-  baseUrl,
 }) => {
   const operation = Abort.startOperation()
   operation.addAbortSignal(signal)
@@ -73,42 +59,34 @@ export const startBuildServer = async ({
       )
     })
   }
+  const logger = createLogger({ logLevel })
 
   let buildPromise
   let abortController
-  const runBuild = () => {
+  const runBuild = async () => {
+    const buildTask = createTaskLog(logger, `execute build command`)
     abortController = new AbortController()
     operation.addAbortCallback(() => {
       abortController.abort()
     })
-    buildPromise = build({
+    buildPromise = executeCommand(buildCommand, {
+      cwd: rootDirectoryUrl,
+      logLevel: buildCommandLogLevel,
       signal: abortController.signal,
-      logLevel: "warn",
-      rootDirectoryUrl,
-      buildDirectoryUrl,
-      entryPoints,
-
-      plugins,
-      sourcemaps,
-      nodeEsmResolution,
-      fileSystemMagicResolution,
-      injectedGlobals,
-      runtimeCompat,
-      transpilation,
-      bundling,
-      minification,
-      versioning,
-      versioningMethod,
-      lineBreakNormalization,
-
-      writeOnFileSystem: true,
-      buildDirectoryClean: true,
-      baseUrl,
-      assetManifest: false,
     })
+    try {
+      await buildPromise
+      buildTask.done()
+    } catch (e) {
+      if (e.code === "ABORT_ERR") {
+        buildTask.fail(`execute build command aborted`)
+      } else {
+        buildTask.fail()
+        throw e
+      }
+    }
   }
 
-  const logger = createLogger({ logLevel })
   const startServerTask = createTaskLog(logger, "start build server")
   const server = await startServer({
     signal,
@@ -145,11 +123,10 @@ export const startBuildServer = async ({
     sendErrorDetails: true,
     requestToResponse: async (request) => {
       await buildPromise
-      const urlIsVersioned =
-        versioningMethod === "search_param"
-          ? new URL(request.ressource, request.origin).searchParams.has("v")
-          : // we could use a regex, but there can be false-positive
-            false
+      const urlIsVersioned = new URL(
+        request.ressource,
+        request.origin,
+      ).searchParams.has("v")
 
       return fetchFileSystem(
         new URL(request.ressource.slice(1), buildDirectoryUrl),
@@ -177,9 +154,15 @@ export const startBuildServer = async ({
     rootDirectoryUrl,
     watchedFilePatterns,
     cooldownBetweenFileEvents,
-    fileChangeCallback: () => {
+    fileChangeCallback: ({ relativeUrl, event }) => {
       abortController.abort()
-      runBuild()
+      // setTimeout is to ensure the abortController.abort() above
+      // is properly taken into account so that logs about abort comes first
+      // then logs about re-running the build happens
+      setTimeout(() => {
+        logger.info(`${relativeUrl} ${event} -> rebuild`)
+        runBuild()
+      })
     },
   })
   operation.addAbortCallback(() => {