console 信息调整为英文 (#216)

lavas-project · Dec 29, 2018 · 134fd8a · 134fd8a
1 parent 5860bad
commit 134fd8a
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,13 @@
 
 =======
 
+## Lavas-core-vue [1.2.4] - 2018-12-28
+
+- [Enhancement] 应开发者要求，控制台输出信息改回英文版本。
+
 ## Lavas-core-vue [1.2.3] - 2018-11-28
 
-- [Enhancement]] 调整 ServiceWorker 的更新机制。[ISSUE #212](https://github.com/lavas-project/lavas/issues/212) [PR](https://github.com/lavas-project/lavas/issues/213)
+- [Enhancement] 调整 ServiceWorker 的更新机制。[ISSUE #212](https://github.com/lavas-project/lavas/issues/212) [PR](https://github.com/lavas-project/lavas/issues/213)
 
 ## Lavas-core-vue [1.2.2] - 2018-10-18
 

diff --git a/packages/lavas-cli/package.json b/packages/lavas-cli/package.json
@@ -54,5 +54,8 @@
     "request-promise": "^4.2.1",
     "semver": "^5.4.1",
     "shelljs": "^0.7.8"
+  },
+  "devDependencies": {
+    "babel-cli": "^6.26.0"
   }
 }
diff --git a/packages/lavas-core-vue/core/builder/dev-builder.js b/packages/lavas-core-vue/core/builder/dev-builder.js
@@ -151,17 +151,17 @@ export default class DevBuilder extends BaseBuilder {
         let clientMFS;
         let ssrEnabled = this.config.build.ssr;
 
-        Logger.info('build', '自动生成路由规则...', true);
+        Logger.info('build', 'Auto generating routes...', true);
         await this.routeManager.buildRoutes();
-        Logger.info('build', '路由规则生成完成', true);
+        Logger.info('build', 'Auto generating routes complete', true);
 
-        Logger.info('build', '写入临时文件', true);
+        Logger.info('build', 'Writing temp files', true);
         await this.writeRuntimeConfig();
         await this.writeFileToLavasDir(
             BUILD_SCRIPT,
             readFileSync(join(__dirname, `../templates/${BUILD_SCRIPT}`))
         );
-        Logger.info('build', '临时文件写入完成', true);
+        Logger.info('build', 'Writing temp files complete', true);
 
         // write middleware.js & store.js
         await this.writeMiddleware();

diff --git a/packages/lavas-core-vue/core/builder/prod-builder.js b/packages/lavas-core-vue/core/builder/prod-builder.js
@@ -29,21 +29,21 @@ export default class ProdBuilder extends BaseBuilder {
         let serviceWorkerEnable = serviceWorker.enable
 
         // clear dist/ first
-        Logger.info('build', `准备清理 ${build.path}...`, true);
+        Logger.info('build', `Ready to clean ${build.path}...`, true);
         await emptyDir(build.path);
-        Logger.info('build', `${build.path} 清理完成`, true);
+        Logger.info('build', `${build.path} cleaned`, true);
 
-        Logger.info('build', '自动生成路由规则...', true);
+        Logger.info('build', 'Auto generating routes...', true);
         await this.routeManager.buildRoutes();
-        Logger.info('build', '路由规则生成完成', true);
+        Logger.info('build', 'Auto generating routes complete', true);
 
-        Logger.info('build', '写入临时文件', true);
+        Logger.info('build', 'Writing temp files', true);
         await Promise.all([
             this.writeRuntimeConfig(),
             this.writeMiddleware(),
             this.writeStore()
         ]);
-        Logger.info('build', '临时文件写入完成', true);
+        Logger.info('build', 'Writing temp files complete', true);
 
         // SSR build process
         if (build.ssr) {

diff --git a/packages/lavas-core-vue/core/config-reader.js b/packages/lavas-core-vue/core/config-reader.js
@@ -167,7 +167,7 @@ export default class ConfigReader {
 
         // read from custom config
         if (this.customConfigPath) {
-            Logger.info('build', `读取自定义配置： ${this.customConfigPath}...`, true);
+            Logger.info('build', `Read customized config file: ${this.customConfigPath}...`, true);
             delete require.cache[require.resolve(this.customConfigPath)];
 
             let customConfig = await import(this.customConfigPath);
@@ -180,19 +180,19 @@ export default class ConfigReader {
         // read from lavas.config.js
         let singleConfigPath = join(this.cwd, LAVAS_CONFIG_FILE);
         if (await pathExists(singleConfigPath)) {
-            Logger.info('build', '读取 lavas.config.js...', true);
+            Logger.info('build', 'Reading lavas.config.js...', true);
             delete require.cache[require.resolve(singleConfigPath)];
 
             let singleConfig = await import(singleConfigPath);
             this.mergeEnv(singleConfig);
             merge(config, singleConfig, mergeArray);
 
-            Logger.info('build', '读取配置完成', true);
+            Logger.info('build', 'Reading complete', true);
             return config;
         }
 
         // read from config/
-        Logger.warn('build', '从 config 目录读取配置已经过时，请尝试把配置写到 lavas.config.js 中');
+        Logger.warn('build', 'Reading config from `config` directory is DEPRECATED!，Please write config into `lavas.config.js`');
         let configDir = join(this.cwd, 'config');
         let files = glob.sync(
             '**/*.js', {
@@ -240,10 +240,10 @@ export default class ConfigReader {
      * @return {Object} config
      */
     async readConfigFile() {
-        Logger.info('build', '开始读取配置...', true);
+        Logger.info('build', 'Reading config...', true);
         let parsedConfig = JsonUtil.parse(await readFile(distLavasPath(this.cwd, CONFIG_FILE), 'utf8'));
         parsedConfig.globals = {rootDir: this.cwd};
-        Logger.info('build', '配置读取完成', true, true);
+        Logger.info('build', 'Reading config complete', true, true);
         return parsedConfig;
     }
 }
diff --git a/packages/lavas-core-vue/core/utils/template.js b/packages/lavas-core-vue/core/utils/template.js
@@ -19,8 +19,8 @@ function inner(customTemplate, ssr, baseUrl) {
         return template(customTemplate)({ssr}).replace(/<</g, '<%').replace(/>>/g, '%>');
     }
 
-    Logger.warn('build', 'core/index.html.tmpl 已经过期')
-    Logger.warn('build', '您可以查看 https://lavas.baidu.com/guide/v2/advanced/core#indexhtmltmpl 获得更多信息\n');
+    Logger.warn('build', 'Using `core/index.html.tmpl` is DEPRECATED!!')
+    Logger.warn('build', 'See `https://lavas.baidu.com/guide/v2/advanced/core#indexhtmltmpl` for more infomation\n');
 
     let templatePath = ssr ? serverTemplatePath : clientTemplatePath;
     let useCustomOnlyFlag = false;

diff --git a/packages/lavas-core-vue/core/utils/workbox.js b/packages/lavas-core-vue/core/utils/workbox.js
@@ -58,11 +58,11 @@ export function useWorkbox(webpackConfig, lavasConfig) {
     // service-worker provided by user
     let serviceWorkerContent = readFileSync(swSrc);
     if (serviceWorkerContent.indexOf('new WorkboxSW') !== -1) {
-        Logger.warn('build', '检测到您还在使用 workbox 2.x 的模板语法')
-        Logger.warn('build', 'lavas-core-vue 从 1.2.0 版本开始已经升级为 workbox3')
-        Logger.warn('build', '为了防止编译错误，当前已经关闭了 Service Worker 功能。\n')
-        Logger.warn('build', '如果您想升级到 workbox3, 可以查阅 https://github.com/lavas-project/lavas/issues/188 获取升级指南')
-        Logger.warn('build', '如果您想继续使用 workbox2，可以将 lavas-core-vue 的版本固定在 1.1.13。\n');
+        Logger.warn('build', 'Your `service-worker.js` seems to be workbox 2.x')
+        Logger.warn('build', 'But lavas-core-vue has upgraded to workbox 3.x from v1.2.0')
+        Logger.warn('build', 'Service Worker is disabled to avoid errors\n')
+        Logger.warn('build', 'If you want to get updated, visit https://github.com/lavas-project/lavas/issues/188')
+        Logger.warn('build', 'Else keep using workbox 2.x by fixing version of lavas-core-vue to v1.1.13 \n');
         lavasConfig.serviceWorker.enable = false
         return;
     }

diff --git a/packages/lavas-core-vue/package.json b/packages/lavas-core-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lavas-core-vue",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Lavas core implemented by Vue",
   "main": "dist/index.js",
   "files": [
@@ -90,5 +90,8 @@
   },
   "peerDependencies": {
     "webpack": "^3.0.0"
+  },
+  "devDependencies": {
+    "babel-cli": "^6.26.0"
   }
 }