@jsenv/plugin-commonjs 0.4.0 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "0.4.0",
+  "version": "1.0.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -13,8 +13,8 @@
   "type": "module",
   "main": "./main.js",
   "dependencies": {
-    "@jsenv/filesystem": "4.1.1",
-    "@jsenv/log": "3.1.0",
+    "@jsenv/filesystem": "4.1.2",
+    "@jsenv/log": "3.2.0",
     "@jsenv/url-meta": "7.0.0",
     "@jsenv/urls": "1.2.7",
     "@rollup/plugin-commonjs": "22.0.1",
@@ -24,9 +24,9 @@
     "cjs-module-lexer": "1.2.2",
     "is-valid-identifier": "2.0.2",
     "resolve": "1.22.1",
-    "rollup": "2.77.0",
+    "rollup": "2.77.2",
     "rollup-plugin-node-globals": "1.4.0",
-    "rollup-plugin-polyfill-node": "0.10.1",
+    "rollup-plugin-polyfill-node": "0.10.2",
     "vm2": "3.9.10"
   },
   "devDependencies": {

package/src/compile_cache/compiled_file_cache.js

@@ -9,7 +9,7 @@ import { validateCompileCache } from "./validate_compile_cache.js"
 import { createLockRegistry } from "./file_lock_registry.js"
 import { updateCompileCache } from "./update_compile_cache.js"
 
-const { lockForRessource } = createLockRegistry()
+const { lockForResource } = createLockRegistry()
 
 export const reuseOrCreateCompiledFile = async ({
   logLevel,
@@ -165,7 +165,7 @@ const readCompileContextFile = ({ logger, compileContextJsonFileUrl }) => {
 }
 
 const startAsap = async (fn, { compiledFileUrl }) => {
-  const unlockLocal = await lockForRessource(compiledFileUrl)
+  const unlockLocal = await lockForResource(compiledFileUrl)
   try {
     return await fn()
   } finally {

package/src/compile_cache/file_lock_registry.js

@@ -1,13 +1,13 @@
 export const createLockRegistry = () => {
   let lockArray = []
-  const lockForRessource = async (ressource) => {
-    const currentLock = lockArray.find((lock) => lock.ressource === ressource)
+  const lockForResource = async (resource) => {
+    const currentLock = lockArray.find((lock) => lock.resource === resource)
     let unlockResolve
     const unlocked = new Promise((resolve) => {
       unlockResolve = resolve
     })
     const lock = {
-      ressource,
+      resource,
       unlocked,
     }
     lockArray = [...lockArray, lock]
@@ -20,5 +20,5 @@ export const createLockRegistry = () => {
     }
     return unlock
   }
-  return { lockForRessource }
+  return { lockForResource }
 }

package/src/jsenv_plugin_commonjs.js

@@ -1,5 +1,5 @@
 import { URL_META } from "@jsenv/url-meta"
-import { injectQueryParams } from "@jsenv/urls"
+import { injectQueryParams, urlToExtension } from "@jsenv/urls"
 
 import { commonJsToJsModule } from "./cjs_to_esm.js"
 
@@ -56,15 +56,20 @@ export const jsenvPluginCommonJs = ({
         rootDirectoryUrl: context.rootDirectoryUrl,
         sourceFileUrl: originalUrlInfo.url,
         browsers: !nodeRuntimeEnabled,
-        processEnvNodeEnv:
-          context.scenario === "dev" || context.scenario === "test"
-            ? "development"
-            : "production",
+        processEnvNodeEnv: context.scenarios.dev ? "development" : "production",
         ...urlInfo.data.commonjs,
       })
       if (isValid) {
         urlInfo.isValid = isValid
       }
+      const originalReference = context.reference.original
+        ? context.reference.original
+        : context.reference
+      const filename = originalReference.dependsOnPackageJson
+        ? `${originalReference.specifier}${urlToExtension(
+            originalReference.parentUrl,
+          )}`
+        : undefined
       return {
         content,
         contentType: "text/javascript",
@@ -72,6 +77,7 @@ export const jsenvPluginCommonJs = ({
         originalUrl: originalUrlInfo.originalUrl,
         originalContent: originalUrlInfo.originalContent,
         sourcemap,
+        filename,
       }
     },
   }

package/tests/cjs_cache/cjs_cache.manual_test.mjs

@@ -13,5 +13,5 @@ await startDevServer({
     }),
   ],
   clientAutoreload: false,
-  htmlSupervisor: false,
+  supervisor: false,
 })

package/tests/cjs_cache/cjs_cache.test.mjs

@@ -29,7 +29,7 @@ const devServer = await startDevServer({
     }),
   ],
   clientAutoreload: false,
-  htmlSupervisor: false,
+  supervisor: false,
 })
 const browser = await chromium.launch({
   headless: !debug,