@airiot/cli 1.0.5 → 1.0.7

package/config/paths.js

@@ -56,6 +56,7 @@ export default {
   dotenv: resolveApp('.env'),
   appPath: resolveApp('.'),
   buildPath: resolveApp('dist'),
+  buildEsPath: resolveApp('es'),
   appHtml: resolveDevtool('dist/index.html'),
   appIndexJs: resolveModule(resolveApp, 'src/index'),
   appFrontJs: resolveModule(resolveApp, 'src/front'),
@@ -73,6 +74,7 @@ export default {
   proxySetup: resolveApp('src/setupProxy.js'),
   appNodeModules,
   clientBuildPath: path.resolve(appNodeModules, '@gtiot/iot-client/dist'),
+  clientBuildEsPath: path.resolve(appNodeModules, '@gtiot/iot-client/es'),
 };
 
 export { moduleFileExtensions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airiot/cli",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "AIRIOT平台前端包管理工具",
   "type": "module",
   "scripts": {},
@@ -26,6 +26,7 @@
   "license": "ISC",
   "dependencies": {
     "@eslint/js": "^9.39.0",
+    "@npmcli/arborist": "^9.1.6",
     "@vitejs/plugin-legacy": "^7.2.1",
     "@vitejs/plugin-react": "^5.1.0",
     "archiver": "^7.0.1",

package/scripts/build.js

@@ -29,18 +29,44 @@ import { visualizer } from 'rollup-plugin-visualizer';
   if (process.env.ANALYZE === 'true' || analyze) {
     plugins.push(
       visualizer({
-        filename: paths.appBuild + '/stats.html',
+        filename: '.build_stats.html',
         title: 'Build Analysis',
         open: true,
       })
     )
   }
+
+  let outDir = 'es'
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === '-o' || a === '--out' || a === '--outDir') {
+      const v = args[i + 1];
+      if (v && !v.startsWith('-')) {
+        outDir = v;
+        i++;
+      }
+      break;
+    }
+    if (a.startsWith('-o=')) {
+      outDir = a.slice(3);
+      break;
+    }
+    if (a.startsWith('--out=')) {
+      outDir = a.split('=')[1];
+      break;
+    }
+    if (a.startsWith('--outDir=')) {
+      outDir = a.split('=')[1];
+      break;
+    }
+  }
   
   await build({
     configFile: false,
     root: paths.appPath,
     base: '',
     build: {
+      outDir,
       assetsDir: '',
       assetsInlineLimit: 0,
       cssCodeSplit: true,

package/scripts/eslint.js

@@ -1,5 +1,5 @@
 import { ESLint } from 'eslint';
-
+import chalk from 'chalk';
 import overrideConfig from '../config/eslint.config.js';
 
 const args = process.argv.slice(2);
@@ -31,5 +31,10 @@ const eslint = new ESLint({
   }
   const formatter = await eslint.loadFormatter('stylish');
   const resultText = formatter.format(results);
-  console.log(resultText);
+
+  if(resultText) {
+    console.log(resultText);
+  } else {
+    console.log(chalk.green('✓' + ' eslint 检测没有发现任何问题。'))
+  }
 })();

package/scripts/i18n-scanner.js

@@ -6,10 +6,6 @@ import paths from '../config/paths.js';
 
 const input = [
   'src/**/*.{js,jsx}',
-  // Use ! to filter out files or directories
-  '!src/**/*.spec.{js,jsx}',
-  '!src/i18n/**',
-  '!**/node_modules/**',
 ].map(p => path.resolve(paths.appPath, p));
 
 const options = {

package/scripts/install.js

@@ -1,6 +1,7 @@
 import chalk from "chalk";
 import inquirer from "inquirer";
 import pacote from "pacote";
+import Arborist from '@npmcli/arborist';
 import os from "os";
 import fs from "fs";
 import fetch from "node-fetch";
@@ -80,7 +81,7 @@ inquirer
       }
       const token = `Bearer ${json.accessToken}`;
 
-      const data = await pacote.tarball(paths.appPath);
+      const data = await pacote.tarball("file:" + paths.appPath, { Arborist });
 
       const form = new FormData();
 

package/scripts/pack.js

@@ -1,6 +1,7 @@
 import pacote from 'pacote';
 import paths from "../config/paths.js";
+import Arborist from '@npmcli/arborist';
 
-pacote.tarball.file(paths.appPath, 'package.tgz').then(data => {
+pacote.tarball.file("file:" + paths.appPath, 'package.tgz', { Arborist }).then(data => {
   console.log('生成包文件成功')
 })

package/vite-plugin/buildinfo.js

@@ -9,7 +9,6 @@ const isCI = process.env.CI &&
 
 const jsonData = await fsPromises.readFile(paths.appPackageJson, 'utf-8');
 const appPackage = JSON.parse(jsonData);
-appPackage.dependencies = {}
 
 const gitInfo = (...args) => {
 	return execFileSync('git', args, {
@@ -52,12 +51,54 @@ const buildinfoPlugin = () => {
       if (config.command === 'serve') {
         return
       }
+			// check package.json exports and files
+			try {
+				appPackage.exports = appPackage.exports || {}
+
+				if (!appPackage.exports.airiot) {
+					const inputs = config.build && config.build.rollupOptions && config.build.rollupOptions.input
+					const outputTemplate = config.build && config.build.rollupOptions && config.build.rollupOptions.output && config.build.rollupOptions.output.entryFileNames
+						? config.build.rollupOptions.output.entryFileNames
+						: '[name].js'
+					const outDirName = (config.build && config.build.outDir) ? config.build.outDir : 'dist'
+					const makeFileName = (name) => outputTemplate.replace(/\[name\]/g, name)
+
+					const exportsObj = {}
+
+					if (inputs && typeof inputs === 'object') {
+						for (const name of Object.keys(inputs)) {
+							const fileName = makeFileName(name)
+							const exportKey = name
+							const relPath = './' + join(outDirName, fileName).replace(/\\/g, '/') + '?type=module'
+							exportsObj[exportKey] = relPath
+						}
+					} else if (typeof inputs === 'string') {
+						const base = 'index'
+						const fileName = makeFileName(base)
+						exportsObj[base] = './' + join(outDirName, fileName).replace(/\\/g, '/') + '?type=module'
+					}
+
+					appPackage.exports.airiot = exportsObj
+
+					// ensure files includes outDir so published package contains built files
+					appPackage.files = Array.isArray(appPackage.files) ? appPackage.files : []
+					if (!appPackage.files.includes(outDirName)) {
+						appPackage.files.push(outDirName)
+					}
+
+					writeFileSync(paths.appPackageJson, JSON.stringify(appPackage, 0, 2), { flag: 'w' })
+				}
+			} catch (e) {
+				// silently ignore errors here
+			}
 
 			if (!isCI) {
 				try {
 					gitInfo('log')
 					const branch = gitInfo('rev-parse', '--abbrev-ref', 'HEAD')
 					const longHead = gitInfo('rev-parse', 'HEAD')
+
+					appPackage.dependencies = {}
 					appPackage.gitHead = longHead
 
 					if (branch != 'master' && branch != 'HEAD') {

package/vite-plugin/index.js

@@ -37,11 +37,11 @@ const getPlugins = async (mode) => {
     }),
     jsInJsxPlugin(),
     svgInline(),
-    airiotPlugin(mode),
+    mode != 'build' && airiotPlugin(mode),
     lazyImportPlugin(),
     airiotHtmlPlugin(),
     buildinfoPlugin()
-  ]
+  ].filter(Boolean)
 
   try {
     const appPlugin = await import(new URL(`file://${paths.appVitePlugin}`));

package/vite-plugin/plugin.js

@@ -1,5 +1,6 @@
 import paths from '../config/paths.js'
 import { promises as fsPromises } from 'fs';
+import fetch from 'node-fetch';
 import { getBaseUrl, getHost, developConfig } from '../config/envs.js';
 
 const jsonData = await fsPromises.readFile(paths.appPackageJson, 'utf-8');
@@ -8,9 +9,10 @@ const htmlTpl = await fsPromises.readFile(paths.appHtml, 'utf-8');
 const appPackage = JSON.parse(jsonData);
 
 const findModule = (scripts, packageName) => {
-  return scripts.find(s => s.indexOf(packageName) >= 0)
+  return scripts.find(s => s.src && s.src.indexOf(packageName) >= 0)
 }
 
+const loadOnline = true
 const host = getHost()
 const basePath = getBaseUrl() + '/node_modules'
 
@@ -18,15 +20,11 @@ const defaultModules = [
   '@airiot/i18n', '@airiot/theme', '@airiot/core'
 ]
 
-let scripts = (developConfig && typeof developConfig.scripts == 'function') 
-  && developConfig.scripts(basePath, 'admin') || []
+let scripts, frontScripts;
 
-let frontScripts = (developConfig && typeof developConfig.scripts == 'function') 
-    && developConfig.scripts(basePath, 'front') || []
-
-let scriptsAppend = appPackage.name == '@airiot/core'
 let dllScript = basePath + '/@airiot/dll/dist/iot.min.js',
   dllDevScript = basePath + '/@airiot/dll/dist/iot.js';
+
 const filterDll = s => {
   if(s.indexOf("@airiot/dll") >= 0) {
     dllScript = s
@@ -36,31 +34,109 @@ const filterDll = s => {
   return true
 }
 
-scripts = scripts.filter(filterDll);
-frontScripts = frontScripts.filter(filterDll);
+const loadPackageScripts = async () => {
 
-[ ...defaultModules, ...(appPackage.iotDependencies||[]) ].forEach(packageName => {
-  if(packageName != appPackage.name && !findModule(scripts, packageName)) {
-    scripts.push(basePath + '/' + packageName + '/dist/index.js')
-    frontScripts.push(basePath + '/' + packageName + '/dist/front.js')
-  }
-})
-
-const addPublicPath = (path, publicPath) => {
-  if((path.startsWith('http://') || path.startsWith('https://') || path.startsWith('//'))) {
-    return path
-  } else if(path.startsWith('/')) {
-    return path
-  } 
-  return publicPath + path
+  scripts = (developConfig && typeof developConfig.scripts == 'function') 
+    && await developConfig.scripts(basePath, 'admin') || []
+
+  frontScripts = (developConfig && typeof developConfig.scripts == 'function') 
+      && await developConfig.scripts(basePath, 'front') || []
+
+  scripts = scripts.filter(filterDll).map(s => typeof s === 'string' ? { src: s } : s);
+  frontScripts = frontScripts.filter(filterDll).map(s => typeof s === 'string' ? { src: s } : s);
+
+  const packageNames = [ ...defaultModules, ...(appPackage.iotDependencies||[]) ];
+
+  const packageScripts = await Promise.all(packageNames.map(async packageName => {
+    if(packageName != appPackage.name && !findModule(scripts, packageName)) {
+      const packagePath = basePath + '/' + packageName
+
+      if (loadOnline) {
+        try {
+          let pkgUrl = packagePath.replace(/\/+$/,'') + '/package.json'
+          pkgUrl = (pkgUrl.startsWith("http://") || pkgUrl.startsWith("https://")) ? pkgUrl : (host + pkgUrl)
+          const res = await fetch(pkgUrl)
+          if (!res.ok) {
+            return [ packagePath + '/dist/index.js', packagePath + '/dist/front.js' ]
+          }
+          const pkg = await res.json()
+
+          const unwrap = entry => {
+            if (!entry) return null
+            if (typeof entry === 'string') return entry
+            if (typeof entry === 'object') {
+              // Prefer standard fields or first available value
+              return unwrap(entry.import || entry.module || entry.default || Object.values(entry)[0])
+            }
+            return null
+          }
+
+          const parseQuery = qs => {
+            const obj = {}
+            for (const [k, v] of new URLSearchParams(qs)) {
+              if (obj[k] === undefined) obj[k] = v
+              else if (Array.isArray(obj[k])) obj[k].push(v)
+              else obj[k] = [obj[k], v]
+            }
+            return obj
+          }
+
+          const join = (base, rel) => {
+            if (!rel) return null
+            // allow "./foo.js" or "foo.js" or "/foo.js"
+            let url = base.replace(/\/+$/,'') + '/' + rel.replace(/^\.?\/+/,'')
+            const qIndex = url.indexOf('?')
+            if (qIndex >= 0) {
+              const hashIndex = url.indexOf('#', qIndex)
+              const qs = url.slice(qIndex + 1, hashIndex >= 0 ? hashIndex : undefined)
+              const cleanUrl = hashIndex >= 0 ? url.slice(0, hashIndex) : url.slice(0, qIndex)
+              return { src: cleanUrl, ...parseQuery(qs) }
+            }
+            return { src: url }
+          }
+
+          let adminRel = null, frontRel = null
+
+          if (pkg.exports && pkg.exports.airiot) {
+            const a = pkg.exports.airiot
+            adminRel = unwrap(a.admin || a.index )
+            frontRel = unwrap(a.front)
+          }
+
+          if (!adminRel && !frontRel) {
+            adminRel = pkg.main || null
+            frontRel = pkg.iotFront || null
+          }
+
+          const adminScript = adminRel ? join(packagePath, adminRel) : null
+          const frontScript = frontRel ? join(packagePath, frontRel) : null
+
+          return [ adminScript, frontScript ]
+        } catch (e) { }
+      }
+      return [ packagePath + '/dist/index.js', packagePath + '/dist/front.js' ]
+    }
+    return null
+  }));
+
+  packageScripts.forEach(scriptsArr => {
+    if(scriptsArr) {
+      const [adminScript, frontScript] = scriptsArr
+      adminScript && scripts.push(typeof adminScript === "string" ? { src: adminScript } : adminScript)
+      frontScript && frontScripts.push(typeof frontScript === "string" ? { src: frontScript } : frontScript)
+    }
+  });
 }
 
-const getHtmlScripts = (html, isAdmin, mode) => {
+const getHtmlScripts = async (html, isAdmin, mode) => {
+  if(!scripts || !frontScripts) {
+    await loadPackageScripts()
+  }
   const appendScripts = isAdmin ? scripts : frontScripts
   return [
     { tag: 'script', attrs: { }, children: 'window._r = s => s; window._t1 = s => s', injectTo: 'body-prepend' },
     { tag: 'script', attrs: { src: mode == 'dev' ? dllDevScript : dllScript }, injectTo: 'body' },
-    ...appendScripts.map(script => ({ tag: 'script', attrs: { src: addPublicPath(script, '') }, injectTo: 'body' })),
+    ...appendScripts.map(script => ({ tag: 'script', attrs: { ...script }, injectTo: 'body' })),
     { tag: 'script', attrs: { type: 'module' }, children: '__app__.start()', injectTo: 'body' },
   ]
 }
@@ -69,16 +145,16 @@ const airiotPlugin = (mode) => {
   return {
     name: 'airiot',
     enforce: 'pre',
-    transformIndexHtml(html, ctx) {
-      return getHtmlScripts(html, ctx.path == '/admin.html', mode)
+    transformIndexHtml: async (html, ctx) => {
+      return await getHtmlScripts(html, ctx.path == '/admin.html', mode)
     },
-    configurePreviewServer(server) {
+    configurePreviewServer: (server) => {
       // 返回一个钩子，会在其他中间件安装完成后调用
       return () => {
-        server.middlewares.use((req, res, next) => {
+        server.middlewares.use(async (req, res, next) => {
           // 自定义处理请求 ...
           if(req.url == '/index.html') {
-            let scripts = getHtmlScripts(htmlTpl, true, mode)
+            let scripts = await getHtmlScripts(htmlTpl, true, mode)
             scripts = [ ...scripts.slice(0, scripts.length - 1), {
               tag: 'script', attrs: { src: 'index.js', type: 'module' }, injectTo: 'body'
             }, scripts[scripts.length - 1] ]