Merge pull request #10 from fastjs-team/dev

Version 2.4.5

Author: xiaodong2008

lib/build.js

@@ -1,6 +1,6 @@
 const output = require('./console/output');
 const outputDev = require('./console/outputDev');
-const load = require("ora");
+const loader = require('./console/loader');
 const fs = require("fs-extra");
 const path = require("path");
 const pc = require("picocolors");
@@ -15,8 +15,7 @@ async function build(options) {
   const startTime = Date.now();
   // close spin if dev
   await outputDev("Spinners are disabled in dev mode");
-  const spinner = fs.pathExistsSync(path.join(process.cwd(), "ondev.key")) ? {} :
-    load("Building project...").start();
+  const load = new loader("Building project", "Checking project", 6);
   await outputDev("Building project...");
   await outputDev(`spawn in ${process.cwd()}`);
   await outputDev("")
@@ -35,45 +34,49 @@ async function build(options) {
     return
   }
 
+  load.update("Checking output dir", 1);
+
   // setup input dir
   // if not exists
   if (!fs.existsSync(path.join(process.cwd(), outputDir))) {
     // create output dir
     await outputDev(`Creating dir ${path.join(process.cwd(), outputDir)}`);
-    spinner.text = "Creating output dir...";
+    load.update("Creating output dir", 2);
     fs.mkdirSync(path.join(process.cwd(), outputDir));
   } else {
     // clear output dir
     await outputDev(`Clearing dir ${path.join(process.cwd(), outputDir)}`);
-    spinner.text = "Clearing output dir...";
+    load.update("Clearing output dir", 2);
     fs.emptyDirSync(path.join(process.cwd(), outputDir));
   }
 
   // run vite build
   await outputDev("Running vite build...");
-  spinner.text = "Building project...";
+  load.update("Building project", 3);
   const {exec} = require("child_process");
   exec(`vite build`, {cwd: process.cwd()}, (err) => {
     if (err) {
-      spinner.stop();
+      load.end();
       outputDev("Error: vite build error");
       outputDev("Program exit by error");
       output("There was an error building the project, open dev mode to see more info", "red");
       return
     }
     // find fastjs_build_temp
     if (!fs.existsSync(path.join(process.cwd(), "fastjs_build_temp"))) {
-      spinner.stop();
+      load.end();
       outputDev("Error: fastjs_build_temp not found");
       outputDev("Program exit by error");
       output("There was an error building the project, open dev mode to see more info", "red");
       return
     }
     // move to output dir
     outputDev("Moving files to output dir...");
+    load.update("Moving files to output dir", 4);
     fs.copySync(path.join(process.cwd(), "fastjs_build_temp"), path.join(process.cwd(), outputDir));
     // remove fastjs_build_temp
     outputDev("Removing fastjs_build_temp...");
+    load.update("Removing temp", 5);
     fs.removeSync(path.join(process.cwd(), "fastjs_build_temp"));
     // check fastjs_build_temp
     const printList = []
@@ -111,7 +114,7 @@ async function build(options) {
     }
     readDir("\\")
     // show success
-    spinner.stop();
+    load.end();
     output(`${pc.bold("[Fastjs-cli]")}`, "green");
     output("")
     output(`*green*${pc.bold("Fastjs-cli")} v${Version}*green* build success in ${Date.now() - startTime}ms`);

lib/dev.js

@@ -1,6 +1,6 @@
 const output = require('./console/output');
 const outputDev = require('./console/outputDev');
-const load = require("ora");
+const loader = require('./console/loader');
 const fs = require("fs-extra");
 const path = require("path");
 const pc = require("picocolors");
@@ -14,8 +14,7 @@ async function dev(options) {
   const startTime = Date.now();
   // close spin if dev
   await outputDev("Spinners are disabled in dev mode");
-  const spinner = fs.pathExistsSync(path.join(process.cwd(), "ondev.key")) ? {} :
-    load("Starting dev server...").start();
+  const load = new loader("Starting dev server", "Checking port", 2);
   await outputDev("Starting dev server...");
   await outputDev(`spawn in ${process.cwd()}`);
   await outputDev("")
@@ -27,13 +26,13 @@ async function dev(options) {
   if (options.port) {
     // check is number
     if (isNaN(options.port) || options.port.length !== 4) {
-      spinner.stop();
+      load.end();
       await outputDev("Error: port is not a number");
       await outputDev("Program exit by error");
       await output("Error: port should be a 4 sig number", "red");
       return
     } else if (await checkPort(port)) {
-      spinner.stop();
+      load.end();
       await outputDev("Error: port is busy");
       await outputDev("Program exit by error");
       await output("Error: port is busy", "red");
@@ -46,7 +45,7 @@ async function dev(options) {
       stopPort: 4000
     }, (err, active) => {
       if (err) {
-        spinner.stop();
+        load.end();
         outputDev("Error: port 3000-4000 all busy");
         outputDev("Program exit by error");
         output("Error: port 3000-4000 all busy", "red");
@@ -57,21 +56,22 @@ async function dev(options) {
   }
   // run command `vite` and listen for stdout
   const {exec} = require("child_process");
+  load.update("Starting server", 1);
   const vite = exec(`vite --port ${port}`, {cwd: process.cwd()}, error => {
     if (error) {
-      spinner.stop();
+      load.end();
       outputDev(error);
       outputDev("Program exit by error");
       output(String(error))
       return;
     }
-    spinner.stop();
+    load.end();
     outputDev("Program exit by vite");
   });
   vite.stdout.on("data", data => {
     // if include `ready in` then vite is ready
     if (data.toString().includes("ready in")) {
-      spinner.stop();
+      load.end();
       output(`${pc.bold("[Fastjs-cli]")}`, "green");
       output("")
       const Version = require("../package.json").version;

modules/vue-router/App.vue

@@ -1,6 +1,6 @@
 <template>
   <router-view v-slot="{ Component }">
-    <transition name="fade" mode="out-in">
+    <transition name="fade">
       <component :is="Component" />
     </transition>
   </router-view>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastjs-cli",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "Fastjs-cli can help you build a npm project easily.",
   "main": "index.js",
   "bin": {