@giteeteam/apps-cli 0.2.5 → 0.2.7

package/dist/index.js

@@ -31,7 +31,7 @@ var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var child_process__default = /*#__PURE__*/_interopDefaultLegacy(child_process);
 var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
-var version = "0.2.5";
+var version = "0.2.7";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -211,7 +211,7 @@ var run$2 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {
 };
 
 const defaultCopyFiles = ['manifest.yml'];
-var build = async (options) => {
+var build$1 = async (options) => {
     const { input = 'src', output = 'dist', prod, copy = [], zip } = options;
     await run$2({
         outputDir: path__default["default"].resolve(output),
@@ -385,8 +385,9 @@ class DockerService {
         this.imageName = imageName;
     }
     async downloadImage() {
+        console.log(`Downloading image(${this.imageName}) ...`);
         await this.execPromise(`docker pull ${this.imageName}`);
-        console.log(`Download image(${this.imageName}) success`);
+        console.log(`Download image(${this.imageName}) success!`);
     }
     async runContainer({ port, env, name, volume = [] }) {
         // 先删掉容器
@@ -416,26 +417,31 @@ class DockerService {
     }
 }
 
+const build = (functionFiles, inputDir, outputDir) => {
+    for (const fileName of functionFiles) {
+        appsBundler.bundle({
+            inputDir,
+            outputDir,
+            fileName,
+            mode: appsBundler.MODE.DEV,
+        });
+    }
+};
 const watchFiles = async (options) => {
     const { inputDir, outputDir } = options;
     const manifest = await getManifest();
     const functionFiles = manifest.getFunctionFiles();
+    build(functionFiles, inputDir, outputDir);
     let timer;
     // 监听整个文件夹，有一个文件改动，则全部重新build
     // TODO 解析出文件之间的依赖关系，提升构建速度
     const watcher = chokidar__default["default"].watch(inputDir);
-    watcher.on('change', () => {
+    console.log(`watch: ${inputDir}`);
+    watcher.on('change', path => {
         clearTimeout(timer);
         timer = setTimeout(() => {
-            console.log(`build ${inputDir}`);
-            for (const fileName of functionFiles) {
-                appsBundler.bundle({
-                    inputDir,
-                    outputDir,
-                    fileName,
-                    mode: appsBundler.MODE.DEV,
-                });
-            }
+            console.log(`${path} has change`);
+            build(functionFiles, inputDir, outputDir);
         }, 1000);
     });
 };
@@ -443,7 +449,7 @@ const watchFiles = async (options) => {
 var _a, _b;
 const image = {
     repository: 'registry.baidubce.com/proxima/proxima-apps-runtime-server',
-    tag: (_a = process.env.IMAGE_TAG) !== null && _a !== void 0 ? _a : '2.7.0-alpha-44',
+    tag: (_a = process.env.IMAGE_TAG) !== null && _a !== void 0 ? _a : 'latest',
 };
 const containerPort = Number((_b = process.env.CONTAINER_PORT) !== null && _b !== void 0 ? _b : 8455);
 const containerName = 'cli-dev-apps-runtime-server';
@@ -452,7 +458,7 @@ const tempAppDir = `${tempApp}/server-side`;
 const containerEnv = {
     PORT: containerPort,
     APPS_DIR: '/usr/src/app/apps',
-    LRU_TTL: 0,
+    LRU_TTL: 1,
     DEBUG: 'runtime*',
     PARSE_PUBLIC_SERVER_URL: process.env.PARSE_PUBLIC_SERVER_URL,
     PARSE_SERVER_MASTER_KEY: process.env.PARSE_SERVER_MASTER_KEY,
@@ -468,18 +474,20 @@ const copyManifest = async (appDir) => {
     await fse__default["default"].copy(manifestFile, targetFile);
 };
 var run = async (options) => {
-    const { inputDir, outputDir } = options;
+    const { inputDir, outputDir, server } = options;
     await fse__default["default"].emptyDir(outputDir);
     const imageName = `${image.repository}:${image.tag}`;
     const appDir = path__default["default"].join(outputDir, tempAppDir);
     const dockerService = new DockerService(imageName);
-    await dockerService.downloadImage();
-    await dockerService.runContainer({
-        port: containerPort,
-        env: containerEnv,
-        volume: [`${outputDir}:/usr/src/app/apps`],
-        name: containerName,
-    });
+    if (server) {
+        await dockerService.downloadImage();
+        await dockerService.runContainer({
+            port: containerPort,
+            env: containerEnv,
+            volume: [`${outputDir}:/usr/src/app/apps`],
+            name: containerName,
+        });
+    }
     process.on('SIGINT', async () => {
         await dockerService.removeContainer(containerName);
         await fse__default["default"].remove(outputDir);
@@ -487,15 +495,18 @@ var run = async (options) => {
     });
     await copyManifest(appDir);
     await watchFiles({ inputDir, outputDir: appDir });
-    console.log('You can use this url for test:');
-    console.log(`POST http://localhost:${containerPort}/v1/apps${tempApp}/functions/:key`);
+    if (server) {
+        console.log('You can use this url for test:');
+        console.log(`POST http://localhost:${containerPort}/v1/apps${tempApp}/functions/:key`);
+    }
 };
 
 var dev = async (options) => {
-    const { input = 'src', output = 'cache' } = options;
+    const { input = 'src', output = 'cache', server = true } = options;
     await run({
         outputDir: path__default["default"].resolve(output),
         inputDir: path__default["default"].resolve(input),
+        server,
     });
 };
 
@@ -508,11 +519,12 @@ program
     .option('-c --copy [letters...]', 'copy files')
     .option('-i --input [dir]', 'input dir')
     .option('-o --output [dir]', 'output dir')
-    .action(build);
+    .action(build$1);
 program.command('create [name]').action(create);
 program
     .command('dev')
     .option('-i --input [dir]', 'input dir')
     .option('-o --output [dir]', 'output dir,default cache')
+    .option('--no-server', 'no server')
     .action(dev);
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -58,5 +58,6 @@
     "@types/fs-extra": "^9.0.13",
     "@types/inquirer": "^8.2.1",
     "@types/uuid": "^8.3.4"
-  }
+  },
+  "gitHead": "3c1344d0154b4671d9477d491c514f02385a1f0d"
 }