@jsenv/core 23.9.0 → 23.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "23.9.0",
+  "version": "23.10.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -70,7 +70,7 @@
     "@jsenv/importmap": "1.2.0",
     "@jsenv/log": "1.4.0",
     "@jsenv/logger": "4.0.1",
-    "@jsenv/server": "10.1.6",
+    "@jsenv/server": "11.0.0",
     "@jsenv/uneval": "1.6.0",
     "@rollup/plugin-commonjs": "21.0.0",
     "@rollup/plugin-json": "4.1.0",

package/src/internal/compiling/compile-directory/getOrGenerateCompiledFile.js

@@ -1,7 +1,7 @@
-import { urlToFileSystemPath } from "@jsenv/filesystem"
+import { urlToFileSystemPath, readFile } from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/logger"
 import { timeStart, timeFunction } from "@jsenv/server"
-import { readFileContent } from "./fs-optimized-for-cache.js"
+
 import { validateCache } from "./validateCache.js"
 import { getMetaJsonFileUrl } from "./compile-asset.js"
 import { createLockRegistry } from "./createLockRegistry.js"
@@ -17,7 +17,6 @@ export const getOrGenerateCompiledFile = async ({
   compileCacheStrategy,
   compileCacheSourcesValidation,
   compileCacheAssetsValidation,
-  fileContentFallback,
   request,
   compile,
 }) => {
@@ -65,7 +64,6 @@ export const getOrGenerateCompiledFile = async ({
           originalFileUrl,
           compiledFileUrl,
           compile,
-          fileContentFallback,
           compileCacheStrategy,
           compileCacheSourcesValidation,
           compileCacheAssetsValidation,
@@ -94,7 +92,6 @@ const computeCompileReport = async ({
   originalFileUrl,
   compiledFileUrl,
   compile,
-  fileContentFallback,
   compileCacheStrategy,
   compileCacheSourcesValidation,
   compileCacheAssetsValidation,
@@ -136,7 +133,6 @@ const computeCompileReport = async ({
       callCompile({
         logger,
         originalFileUrl,
-        fileContentFallback,
         compile,
       }),
     )
@@ -174,22 +170,11 @@ const computeCompileReport = async ({
   }
 }
 
-const callCompile = async ({
-  logger,
-  originalFileUrl,
-  fileContentFallback,
-  compile,
-}) => {
+const callCompile = async ({ logger, originalFileUrl, compile }) => {
   logger.debug(`compile ${originalFileUrl}`)
 
-  const codeBeforeCompile =
-    compile.length === 0
-      ? ""
-      : await getCodeToCompile({ originalFileUrl, fileContentFallback })
-
   const compileReturnValue = await compile({
-    code: codeBeforeCompile,
-    map: undefined,
+    code: await readFile(originalFileUrl),
   })
   if (typeof compileReturnValue !== "object" || compileReturnValue === null) {
     throw new TypeError(
@@ -229,24 +214,6 @@ const callCompile = async ({
   }
 }
 
-const getCodeToCompile = async ({ originalFileUrl, fileContentFallback }) => {
-  let fileContent
-  if (fileContentFallback) {
-    try {
-      fileContent = await readFileContent(originalFileUrl)
-    } catch (e) {
-      if (e.code === "ENOENT") {
-        fileContent = await fileContentFallback()
-      } else {
-        throw e
-      }
-    }
-  } else {
-    fileContent = await readFileContent(originalFileUrl)
-  }
-  return fileContent
-}
-
 const startAsap = async (fn, { logger, compiledFileUrl }) => {
   const metaJsonFileUrl = getMetaJsonFileUrl(compiledFileUrl)
   const metaJsonFilePath = urlToFileSystemPath(metaJsonFileUrl)

package/src/internal/compiling/compileFile.js

@@ -16,7 +16,6 @@ export const compileFile = async ({
   projectDirectoryUrl,
   originalFileUrl,
   compiledFileUrl,
-  fileContentFallback,
   projectFileRequestedCallback = () => {},
   request,
   pushResponse,
@@ -44,7 +43,6 @@ export const compileFile = async ({
         projectDirectoryUrl,
         originalFileUrl,
         compiledFileUrl,
-        fileContentFallback,
         request,
         compileCacheStrategy,
         compileCacheSourcesValidation,

package/src/internal/compiling/createCompiledFileService.js

@@ -1,4 +1,4 @@
-import { redirectRequest, fetchFileSystem } from "@jsenv/server"
+import { fetchFileSystem } from "@jsenv/server"
 import {
   resolveUrl,
   resolveDirectoryUrl,
@@ -80,7 +80,7 @@ export const createCompiledFileService = ({
     projectDirectoryUrl,
   )
 
-  return (request, { pushResponse }) => {
+  return (request, { pushResponse, redirectRequest }) => {
     const { origin, ressource } = request
     // we use "ressourceToPathname" to remove eventual query param from the url
     // Without this a pattern like "**/*.js" would not match "file.js?t=1"
@@ -167,12 +167,11 @@ export const createCompiledFileService = ({
       projectFileRequestedCallback,
       request,
       pushResponse,
-      compile: ({ code, map }) => {
+      compile: ({ code }) => {
         return compiler({
           logger,
 
           code,
-          map,
           url: originalFileUrl,
           compiledUrl: compiledFileUrl,
           projectDirectoryUrl,

package/src/internal/compiling/startCompileServer.js

@@ -103,6 +103,7 @@ export const startCompileServer = async ({
   },
   livereloadLogLevel = "info",
   customServices = {},
+  serverPlugins,
   livereloadSSE = false,
   transformHtmlSourceFiles = true,
   jsenvToolbarInjection = false,
@@ -358,6 +359,7 @@ export const startCompileServer = async ({
     ip: compileServerIp,
     port: compileServerPort,
     plugins: {
+      ...serverPlugins,
       ...pluginCORS({
         accessControlAllowRequestOrigin: true,
         accessControlAllowRequestMethod: true,

package/src/startExploring.js

@@ -49,7 +49,9 @@ export const startExploring = async ({
   compileServerCertificate,
   compileServerPrivateKey,
   sourcemapMethod,
+  customServices,
   customCompilers,
+  serverPlugins,
   livereloadWatchConfig,
   jsenvDirectoryClean,
 }) => {
@@ -87,11 +89,13 @@ export const startExploring = async ({
     livereloadSSE: livereloading,
     jsenvToolbarInjection: jsenvToolbar,
     customServices: {
+      ...customServices,
       "service:exploring-redirect": (request) => redirectFiles(request),
       "service:exploring-data": (request) => serveExploringData(request),
       "service:explorables": (request) => serveExplorableListAsJson(request),
     },
     customCompilers,
+    serverPlugins,
     jsenvDirectoryRelativeUrl,
     outDirectoryName,
     inlineImportMapIntoHTML,