@giteeteam/apps-cli 0.3.2 → 0.4.1

package/dist/index.js

@@ -3,12 +3,16 @@
 
 require('dotenv/config');
 var commander = require('commander');
-var appsBundler = require('@giteeteam/apps-bundler');
 var fse = require('fs-extra');
 var path = require('path');
 var archiver = require('archiver');
+var rollup = require('rollup');
+var fs = require('fs');
+var esbuild$1 = require('esbuild');
+var pluginNodeResolve = require('@rollup/plugin-node-resolve');
+var commonjs = require('@rollup/plugin-commonjs');
 var ora = require('ora');
-var yaml = require('yaml');
+var appsManifest = require('@giteeteam/apps-manifest');
 var inquirer = require('inquirer');
 var simpleGit = require('simple-git');
 var chalk = require('chalk');
@@ -22,6 +26,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var fse__default = /*#__PURE__*/_interopDefaultLegacy(fse);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var archiver__default = /*#__PURE__*/_interopDefaultLegacy(archiver);
+var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
+var commonjs__default = /*#__PURE__*/_interopDefaultLegacy(commonjs);
 var ora__default = /*#__PURE__*/_interopDefaultLegacy(ora);
 var inquirer__default = /*#__PURE__*/_interopDefaultLegacy(inquirer);
 var simpleGit__default = /*#__PURE__*/_interopDefaultLegacy(simpleGit);
@@ -30,7 +36,7 @@ var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var child_process__default = /*#__PURE__*/_interopDefaultLegacy(child_process);
 var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
-var version = "0.3.2";
+var version = "0.4.1";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -89,11 +95,98 @@ const archiveApp = async (archiveDir, pkgName) => {
     });
 };
 
+const defaultOptions = {
+    treeShaking: true,
+    format: 'esm',
+    loader: 'tsx',
+};
+function esbuild(options) {
+    options = { ...defaultOptions, ...options };
+    return {
+        name: 'esbuild',
+        resolveId(source, importer, opts) {
+            // console.log('resolveId:');
+            // console.dir({ source, importer, opts }, { depth: null });
+            if (!importer || ['.ts', '.tsx', '.js', '.jsx'].some(ext => source.endsWith(ext))) {
+                return source;
+            }
+            const dirPath = path.dirname(importer);
+            let path$1;
+            if (fs.existsSync((path$1 = path.resolve(dirPath, source, 'index.ts')))) {
+                return path$1;
+            }
+            else if (fs.existsSync((path$1 = path.resolve(dirPath, source, 'index.tsx')))) {
+                return path$1;
+            }
+            else if (fs.existsSync((path$1 = path.resolve(dirPath, source + '.ts')))) {
+                return path$1;
+            }
+            else if (fs.existsSync((path$1 = path.resolve(dirPath, source + '.tsx')))) {
+                return path$1;
+            }
+            else {
+                console.error({ source, importer, options: opts });
+                path$1 = path.relative('.', path.resolve(importer, source));
+                throw new Error(`ENOENT: ${path$1.replace(/\\/g, '/')}`);
+            }
+        },
+        async transform(src, id) {
+            options.sourcefile = id;
+            const { code, map } = await esbuild$1.transform(src, options);
+            if (!map)
+                return code;
+            return { code, map };
+        },
+    };
+}
+
+var MODE;
+(function (MODE) {
+    MODE["DEV"] = "development";
+    MODE["PROD"] = "production";
+})(MODE || (MODE = {}));
+function getRollupOptions(input, outputFile, mode = MODE.DEV) {
+    const plugins = [pluginNodeResolve.nodeResolve(), commonjs__default["default"]()];
+    plugins.push(esbuild({
+        sourcemap: mode === MODE.DEV,
+        minify: mode !== MODE.DEV,
+        target: 'es2018',
+        jsx: 'transform',
+        jsxFactory: 'AppsUI.createElement',
+        jsxFragment: 'AppsUI.Fragment',
+    }));
+    const inputOptions = {
+        input,
+        plugins,
+    };
+    const outputOptions = {
+        file: outputFile,
+        format: 'es',
+        sourcemap: mode === MODE.DEV,
+    };
+    return { inputOptions, outputOptions };
+}
+async function bundle(opts) {
+    const { fileName, inputDir, outputDir, mode = MODE.DEV } = opts;
+    const input = path__default["default"].join(inputDir, `${fileName}.ts`);
+    try {
+        await fs__default["default"].promises.access(input);
+    }
+    catch (e) {
+        console.error(`${input} is not exist`);
+        return;
+    }
+    const outputFile = path__default["default"].join(outputDir, `${fileName}.js`);
+    const { inputOptions, outputOptions } = getRollupOptions(input, outputFile, mode);
+    const build = await rollup.rollup(inputOptions);
+    await build.write(outputOptions);
+}
+
 const bundleApp = async (opts) => {
     const { manifest, mode, outputDir, inputDir } = opts;
     const functionFiles = manifest.getFunctionFiles();
     const bundlePromise = functionFiles.map(async (fileName) => {
-        await appsBundler.bundle({
+        await bundle({
             inputDir,
             fileName,
             outputDir,
@@ -116,112 +209,10 @@ const execActionWithSpinner = async (message, action) => {
     spinner.succeed(message.succeed);
 };
 
-class Manifest {
-    constructor(manifestString) {
-        this.manifest = yaml.parse(manifestString);
-        this.manifestString = manifestString;
-    }
-    get resources() {
-        return this.manifest.resources;
-    }
-    get app() {
-        return this.manifest.app;
-    }
-    get tables() {
-        return this.manifest.tables;
-    }
-    getManifest() {
-        return this.manifest;
-    }
-    getManifestString() {
-        return this.manifestString;
-    }
-    /**
-     * 获取所有自定义事项类型
-     */
-    getCustomItemType() {
-        const { modules } = this.manifest;
-        return modules.customItemType || [];
-    }
-    /**
-     * 获取所有自定义字段类型
-     */
-    getCustomFieldType() {
-        const { modules } = this.manifest;
-        return modules.customFieldType || [];
-    }
-    /**
-     * 获取所有自定义字段
-     */
-    getCustomField() {
-        const { modules } = this.manifest;
-        return modules.customField || [];
-    }
-    /**
-     * 根据key获取执行的function
-     * @param key
-     * @returns
-     */
-    getFunctionByKey(key) {
-        const functionKey = this.getFunctionKeyByKey(key);
-        if (functionKey) {
-            return this.getFunctionByFunctionKey(functionKey);
-        }
-    }
-    /**
-     * 根据functionKey获取执行的function
-     * @param functionKey
-     * @returns
-     */
-    getFunctionByFunctionKey(functionKey) {
-        var _a, _b;
-        return (_b = (_a = this.manifest.modules) === null || _a === void 0 ? void 0 : _a.function) === null || _b === void 0 ? void 0 : _b.find(f => f.key === functionKey);
-    }
-    /**
-     * 根据key获取执行的functionKey
-     * @param key
-     * @returns
-     */
-    getFunctionKeyByKey(key) {
-        var _a, _b, _c;
-        const { modules } = this.manifest;
-        for (const k in modules) {
-            if (k === 'function') {
-                continue;
-            }
-            else if (k === 'importer') {
-                // importer扩展点需要判断function和validate
-                if (key === ((_a = modules[k]) === null || _a === void 0 ? void 0 : _a.function) || key === ((_b = modules[k]) === null || _b === void 0 ? void 0 : _b.validate)) {
-                    return key;
-                }
-            }
-            else if (Array.isArray(modules[k])) {
-                const targetModule = (_c = modules[k]) === null || _c === void 0 ? void 0 : _c.find(v => v.key === key);
-                if (targetModule) {
-                    return targetModule.function;
-                }
-            }
-        }
-    }
-    /**
-     * 获取function下的文件列表
-     * @returns
-     */
-    getFunctionFiles() {
-        var _a, _b;
-        const fileNames = new Set();
-        (_b = (_a = this.manifest.modules) === null || _a === void 0 ? void 0 : _a.function) === null || _b === void 0 ? void 0 : _b.forEach(({ handler }) => {
-            const filename = handler.split('.')[0];
-            fileNames.add(filename);
-        });
-        return [...fileNames];
-    }
-}
-
 const getManifest = async () => {
     const manifestFile = path__default["default"].resolve('manifest.yml');
     const strBuffer = await fse__default["default"].readFile(manifestFile);
-    return new Manifest(strBuffer.toString());
+    return new appsManifest.Manifest(strBuffer.toString());
 };
 
 var run$2 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {
@@ -242,7 +233,7 @@ var run$2 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {
         start: 'start bundle',
         error: 'bundle failed',
         succeed: 'bundle success',
-    }, () => bundleApp({ outputDir, inputDir, manifest, mode: prod ? appsBundler.MODE.PROD : appsBundler.MODE.DEV }));
+    }, () => bundleApp({ outputDir, inputDir, manifest, mode: prod ? MODE.PROD : MODE.DEV }));
     // package
     await execActionWithSpinner({
         start: 'start package',
@@ -495,11 +486,11 @@ class DockerService {
 
 const build = (functionFiles, inputDir, outputDir) => {
     for (const fileName of functionFiles) {
-        appsBundler.bundle({
+        bundle({
             inputDir,
             outputDir,
             fileName,
-            mode: appsBundler.MODE.DEV,
+            mode: MODE.DEV,
         });
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -27,6 +27,7 @@
     "dev": "tsc -w",
     "build": "rm -rf dist && rollup -c",
     "prepublish": "pnpm build",
+    "prepack": "pnpm build",
     "unlink": "yarn unlink",
     "link": "chmod +x ./dist/index.js && yarn link && yarn link '@giteeteam/apps-cli' -g",
     "build-link": "pnpm build && yarn run link"
@@ -37,25 +38,29 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@giteeteam/apps-bundler": "^0.2.3",
-    "@giteeteam/apps-manifest": "^0.2.1",
+    "@giteeteam/apps-manifest": "^0.3.0",
+    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.1",
     "archiver": "^5.3.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "commander": "^9.3.0",
     "dotenv": "^16.0.2",
+    "esbuild": "^0.16.11",
     "execa": "^5.1.1",
     "fs-extra": "^10.1.0",
     "inquirer": "^8.2.4",
     "ora": "^5.4.1",
+    "rollup": "^2.79.0",
     "simple-git": "^3.7.1",
     "yaml": "^2.1.1"
   },
   "devDependencies": {
+    "@rollup/plugin-json": "^6.0.0",
     "@types/archiver": "^5.3.1",
     "@types/fs-extra": "^9.0.13",
     "@types/inquirer": "^8.2.1",
-    "@types/uuid": "^8.3.4"
-  },
-  "gitHead": "d93f769e76519925ce83d4bc71defcfdd3eee085"
+    "@types/uuid": "^8.3.4",
+    "rollup-plugin-typescript2": "^0.31.2"
+  }
 }