devjar 0.9.0 → 0.9.1

package/dist/index.js

@@ -8,28 +8,14 @@ async function createModule(files, { resolveModule, dependencies = {}, runtime =
     function createLocalImportPlaceholder(moduleKey) {
         return `${localImportPrefix}${encodeURIComponent(moduleKey)}__`;
     }
-    function createScopedSpecifier(moduleKey) {
-        return `devjar-internal/${runtime.revision}/${encodeURIComponent(moduleKey)}`;
-    }
-    function registerImportMap(imports) {
-        var _runtime;
-        const script = document.createElement('script');
-        script.type = 'importmap';
-        script.textContent = JSON.stringify({
-            imports
-        });
-        document.head.appendChild(script);
-        ((_runtime = runtime).importMaps || (_runtime.importMaps = [])).push(script);
-    }
     function createInlinedModule(code) {
         return `data:text/javascript;utf-8,${encodeURIComponent(code)}`;
     }
-    function createCssModule(code, fileName) {
+    function createCssModule(code) {
         return `\
 const sheet = new CSSStyleSheet();
 sheet.replaceSync(${JSON.stringify(code)});
-export default sheet;
-//# sourceURL=devjar/${fileName}?v=${runtime.revision}`;
+export default sheet;`;
     }
     function rewriteLocalImports(code, specifiers) {
         let rewritten = code;
@@ -71,35 +57,44 @@ export default sheet;
     for (const importedModules of Object.values(dependencies)){
         for (const moduleKey of importedModules)moduleKeys.add(moduleKey);
     }
-    const scopedSpecifiers = {};
-    for (const moduleKey of moduleKeys){
-        scopedSpecifiers[moduleKey] = createScopedSpecifier(moduleKey);
-    }
-    const imports = {};
+    const moduleSources = {};
     for (const moduleKey of moduleKeys){
         if (!(moduleKey in files)) {
-            imports[scopedSpecifiers[moduleKey]] = createInlinedModule(`throw new Error(${JSON.stringify('devjar: Module not found: ' + moduleKey)})`);
+            moduleSources[moduleKey] = `throw new Error(${JSON.stringify('devjar: Module not found: ' + moduleKey)})`;
             delete runtime.urls[moduleKey];
             continue;
         }
-        if (!runtime.urls[moduleKey] || invalidated.has(moduleKey)) {
-            const moduleCode = moduleKey.endsWith('.css') ? createCssModule(files[moduleKey], moduleKey) : rewriteLocalImports(`${files[moduleKey]}\n//# sourceURL=devjar/${moduleKey}?v=${runtime.revision}`, scopedSpecifiers);
-            runtime.urls[moduleKey] = createInlinedModule(moduleCode);
+        moduleSources[moduleKey] = moduleKey.endsWith('.css') ? createCssModule(files[moduleKey]) : files[moduleKey];
+    }
+    const buildingUrls = new Set();
+    const buildModuleUrl = (moduleKey)=>{
+        if (runtime.urls[moduleKey] && !invalidated.has(moduleKey)) return runtime.urls[moduleKey];
+        if (buildingUrls.has(moduleKey)) {
+            throw new Error('devjar: Circular local imports are not supported: ' + moduleKey);
+        }
+        buildingUrls.add(moduleKey);
+        const specifiers = {};
+        for (const imported of dependencies[moduleKey] || []){
+            specifiers[imported] = buildModuleUrl(imported);
         }
-        imports[scopedSpecifiers[moduleKey]] = runtime.urls[moduleKey];
+        const moduleCode = moduleKey.endsWith('.css') ? moduleSources[moduleKey] : rewriteLocalImports(moduleSources[moduleKey], specifiers);
+        runtime.urls[moduleKey] = createInlinedModule(moduleCode);
+        buildingUrls.delete(moduleKey);
+        return runtime.urls[moduleKey];
+    };
+    for (const moduleKey of moduleKeys){
+        buildModuleUrl(moduleKey);
     }
-    registerImportMap(imports);
     if (!runtime.refreshRuntime) {
         const refreshModule = await import(/* webpackIgnore: true */ /* @vite-ignore */ /* turbopackIgnore: true */ resolveModule('react-refresh/runtime'));
         runtime.refreshRuntime = refreshModule.default || refreshModule;
         runtime.refreshRuntime.injectIntoGlobalHook(self);
         globalThis.__devjarRefreshRuntime = runtime.refreshRuntime;
     }
-    const entrySpecifier = scopedSpecifiers['index'];
-    if (!entrySpecifier) {
+    if (!runtime.urls['index']) {
         throw new Error('devjar: Module not found: index');
     }
-    const module = await import(/* webpackIgnore: true */ /* @vite-ignore */ /* turbopackIgnore: true */ entrySpecifier);
+    const module = await import(/* webpackIgnore: true */ /* @vite-ignore */ /* turbopackIgnore: true */ runtime.urls['index']);
     runtime.files = {
         ...files
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devjar",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "type": "module",
   "exports": {
     ".": {
@@ -9,6 +9,10 @@
     }
   },
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/huozhi/devjar"
+  },
   "files": [
     "dist"
   ],
@@ -29,9 +33,7 @@
     "react": "^19.0.0"
   },
   "dependencies": {
-    "es-module-lexer": "1.6.0",
-    "oxc-transform": "^0.137.0",
-    "react-refresh": "^0.18.0"
+    "es-module-lexer": "1.6.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.7",
@@ -42,6 +44,7 @@
     "dedent": "^1.7.0",
     "devjar": "link:",
     "next": "16.3.0-canary.69",
+    "oxc-transform": "^0.137.0",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
     "typescript": "^5.7.3"