@airiot/cli 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airiot/cli",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "AIRIOT平台前端包管理工具",
   "type": "module",
   "scripts": {},

package/vite-plugin/externals.js

@@ -1,8 +1,6 @@
 export default {
   "react": "React",
   "react-dom": "ReactDOM",
-  "react/jsx-runtime": "ReactJSXRuntime",
-  "react/jsx-dev-runtime": "ReactJSXDevRuntime",
   "react-dnd": "ReactDnD",
   "react-dnd-html5-backend": "ReactDnDHTML5Backend",
   "react-router": "ReactRouter",

package/vite-plugin/importmap.js

@@ -12,7 +12,7 @@ export default {
 
   // React DnD
   "react-dnd": "/node_modules/@airiot/dll/esm/react-dnd_.js",
-  "react-dnd-html5-backend": "/node_modules/@airiot/dll/esm/react-dnd-html5-backend.js",
+  "react-dnd-html5-backend": "/node_modules/@airiot/dll/esm/react-dnd-html5-backend_.js",
 
   // Utility Libraries
   "lodash": "/node_modules/@airiot/dll/esm/lodash.js",

package/vite-plugin/importmaps.js

@@ -46,7 +46,8 @@ export default function importMapPlugin(
           alias: Object.keys(resolvedImports).map((libName) => {
             if(externals[libName]) {
               const libPath = path.join(externalCacheDir, `${libName.replace(/\//g, '_')}.js`);
-              writeFileSync(libPath, `module.exports = ${externals[libName]};`);
+              const gname = externals[libName];
+              writeFileSync(libPath, `module.exports = { ...${gname}, __esModule: true };`);
               return {
                   find: new RegExp(`^${libName}$`),
                   replacement: libPath
@@ -59,50 +60,11 @@ export default function importMapPlugin(
     },
 
     transformIndexHtml(html) {
-      // const importMapJson = JSON.stringify({ imports: resolvedImports });
-      // const scriptTag = `<script type="importmap">${importMapJson}</script>`;
-      const scriptTag = `<script type="module">${Object.keys(resolvedImports).map(libName => externals[libName] ?  `import * as ${externals[libName]} from "${libName}";window.${externals[libName]} = ${externals[libName]}; ` : '').join(' ')}</script>`;
+      const scriptTag = `<script type="module" async>${Object.keys(resolvedImports).map(libName => externals[libName] ?  
+        `import("${libName}").then(m => window.${externals[libName]} = m);` : '').join(' ')}</script>`;
+        // `import * as ${externals[libName]} from "${libName}"; window.${externals[libName]} = { ...${externals[libName]} };` : '').join(' ')}</script>`;
       return html.replace("</head>", `${scriptTag}</head>`);
     },
 
-    // handleHotUpdate({ file, server }) {
-    //   if (
-    //     importMapPath &&
-    //     path.resolve(file) === path.resolve(process.cwd(), importMapPath)
-    //   ) {
-    //     try {
-    //       const fileContents = fs.readFileSync(file, "utf-8");
-    //       const parsedData = JSON.parse(fileContents);
-
-    //       if (parsedData.imports) {
-    //         resolvedImports = parsedData.imports;
-    //         console.log(
-    //           "[vite-plugin-import-map] Updated import map on the fly:",
-    //           resolvedImports
-    //         );
-    //       }
-
-    //       if (autoRestart) {
-    //         console.log(
-    //           "[vite-plugin-import-map] Restarting Vite server to apply changes..."
-    //         );
-    //         server.restart();
-    //       } else {
-    //         console.log(
-    //           "[vite-plugin-import-map] Import map updated. Please restart Vite manually to apply changes."
-    //         );
-    //       }
-
-    //       server.ws.send({
-    //         type: "full-reload",
-    //       });
-    //     } catch (error) {
-    //       console.error(
-    //         "[vite-plugin-import-map] Error reading or parsing import-map.json:",
-    //         error
-    //       );
-    //     }
-    //   }
-    // },
   };
 }

package/vite-plugin/index.js

@@ -29,7 +29,10 @@ const getPlugins = async (mode) => {
     }),
     dllMode == "esm" && importMapPlugin({
       imports: importmap,
-      externals
+      externals: { ...externals, 
+        "react/jsx-runtime": "ReactJSXRuntime",
+        "react/jsx-dev-runtime": "ReactJSXDevRuntime",
+      }
     }),
     dllMode == "umd" && createExternal({
       externals

package/vite-plugin/plugin.js

@@ -26,7 +26,7 @@ const importMap = Object.fromEntries(
 );
 
 const defaultModules = [
-  '@airiot/i18n', '@airiot/core'
+  '@airiot/i18n', '@airiot/core', '@airiot/theme'
 ]
 
 let scripts, frontScripts;