fix CRLF

cmux · Apr 8, 2020 · f4cb3ff · f4cb3ff
1 parent b370253
commit f4cb3ff
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.13.13] - 2020-04-08
+
+**koot**
+
+-   修正 `CRLF` 问题，重新发布
+
 ## [0.13.12] - 2020-04-08
 
 **koot**

diff --git a/packages/koot/bin/analyze.js b/packages/koot/bin/analyze.js
@@ -1,20 +1,20 @@
 #!/usr/bin/env node
 
-const fs = require('fs-extra')
-const path = require('path')
-const program = require('commander')
+const fs = require('fs-extra');
+const path = require('path');
+const program = require('commander');
 // const chalk = require('chalk')
 
-const before = require('./_before')
+const before = require('./_before');
 
 // const __ = require('../utils/translate')
-const validateConfig = require('../libs/validate-config')
+const validateConfig = require('../libs/validate-config');
 // const readBuildConfigFile = require('../utils/read-build-config-file')
-const setEnvFromCommand = require('../utils/set-env-from-command')
-const initNodeEnv = require('../utils/init-node-env')
-const getDirTemp = require('../libs/get-dir-tmp')
+const setEnvFromCommand = require('../utils/set-env-from-command');
+const initNodeEnv = require('../utils/init-node-env');
+const getDirTemp = require('../libs/get-dir-tmp');
 
-const kootWebpackBuild = require('koot-webpack/build')
+const kootWebpackBuild = require('koot-webpack/build');
 
 program
     .version(require('../package').version, '-v, --version')
@@ -25,64 +25,63 @@ program
     .option('--config <config-file-path>', 'Set config file pathname')
     .option('--type <project-type>', 'Set project type')
     .option('--koot-test', 'Koot test mode')
-    .parse(process.argv)
+    .parse(process.argv);
 
 const run = async () => {
     // 清空 log
-    process.stdout.write('\x1B[2J\x1B[0f')
+    process.stdout.write('\x1B[2J\x1B[0f');
 
-    const {
-        client, server,
-        stage: _stage,
-        config,
-        type,
-    } = program
+    const { client, server, stage: _stage, config, type } = program;
 
-    initNodeEnv()
+    initNodeEnv();
     // console.log(program)
 
     setEnvFromCommand({
         config,
-        type,
-    })
+        type
+    });
 
-    const stage = _stage ||
+    const stage =
+        _stage ||
         (client ? 'client' : undefined) ||
         (server ? 'server' : undefined) ||
-        'client'
+        'client';
 
-    process.env.WEBPACK_BUILD_STAGE = stage || 'client'
-    process.env.WEBPACK_BUILD_ENV = 'prod'
+    process.env.WEBPACK_BUILD_STAGE = stage || 'client';
+    process.env.WEBPACK_BUILD_ENV = 'prod';
 
-    await before(program)
+    await before(program);
 
     // 处理目录
-    const dirAnalyzeBuild = require('../libs/get-dir-dev-tmp')(undefined, 'analyze')
-    await fs.ensureDir(dirAnalyzeBuild)
-    await fs.emptyDir(dirAnalyzeBuild)
-    await fs.ensureDir(path.resolve(dirAnalyzeBuild, 'public'))
-    await fs.ensureDir(path.resolve(dirAnalyzeBuild, 'server'))
+    const dirAnalyzeBuild = require('../libs/get-dir-dev-tmp')(
+        undefined,
+        'analyze'
+    );
+    await fs.ensureDir(dirAnalyzeBuild);
+    await fs.emptyDir(dirAnalyzeBuild);
+    await fs.ensureDir(path.resolve(dirAnalyzeBuild, 'public'));
+    await fs.ensureDir(path.resolve(dirAnalyzeBuild, 'server'));
 
     // 读取构建配置
     const kootConfig = {
-        ...await validateConfig(),
+        ...(await validateConfig()),
 
         dist: dirAnalyzeBuild,
-        bundleVersionsKeep: false,
-    }
+        bundleVersionsKeep: false
+    };
 
     await kootWebpackBuild({
         analyze: true,
         ...kootConfig
-    })
+    });
 
     // 清理临时目录
-    await fs.remove(getDirTemp())
+    await fs.remove(getDirTemp());
 
     // 清理结果目录
-    await fs.remove(dirAnalyzeBuild)
+    await fs.remove(dirAnalyzeBuild);
 
-    console.log(' ')
-}
+    console.log(' ');
+};
 
-run()
+run();
diff --git a/packages/koot/bin/start.js b/packages/koot/bin/start.js
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/* eslint-disable no-console */
 
 const fs = require('fs-extra');
 const path = require('path');
@@ -85,7 +86,7 @@ const run = async () => {
             (typeof type === 'string' ? ` --type ${type}` : '') +
             (kootTest ? ` --koot-test` : '');
 
-        let stderr = '';
+        const stderr = '';
         await new Promise(resolve => {
             const child = spawn('koot-build', buildCmdArgs.split(' '), {
                 stdio: 'inherit',
@@ -149,7 +150,7 @@ const run = async () => {
 
             // 打出错误报告
             console.log('');
-            console.trace(stderr);
+            console.error(stderr);
 
             // 终止流程
             return;

diff --git a/packages/koot/index.js b/packages/koot/index.js
@@ -1,5 +1,5 @@
 /* global
-    __KOOT_SSR__: false,
+    __KOOT_SSR__: false
 */
 
 import isRenderSafe from './React/is-render-safe';
@@ -62,7 +62,7 @@ export let history = (() => getHistory())();
 
 // ============================================================================
 
-export const getCache = (localeId) => {
+export const getCache = localeId => {
     if (!isRenderSafe()) return {};
     if (__CLIENT__) {
         if (typeof window.__KOOT_CACHE__ !== 'object')
@@ -91,22 +91,22 @@ export const getCtx = () => {
 // ============================================================================
 
 if (__DEV__) {
-    global.__KOOT_SSR_SET__ = (v) => {
+    global.__KOOT_SSR_SET__ = v => {
         global.__KOOT_SSR__ = v;
     };
-    global.__KOOT_SSR_SET_LOCALEID__ = (v) => {
+    global.__KOOT_SSR_SET_LOCALEID__ = v => {
         global.__KOOT_LOCALEID__ = v;
         localeId = v;
     };
-    global.__KOOT_SSR_SET_STORE__ = (v) => {
+    global.__KOOT_SSR_SET_STORE__ = v => {
         global.__KOOT_STORE__ = v;
         store = v;
     };
-    global.__KOOT_SSR_SET_HISTORY__ = (v) => {
+    global.__KOOT_SSR_SET_HISTORY__ = v => {
         global.__KOOT_HISTORY__ = v;
         history = v;
     };
-    global.__KOOT_SSR_SET_CTX__ = (v) => {
+    global.__KOOT_SSR_SET_CTX__ = v => {
         global.__KOOT_CTX__ = v;
     };
     // if (__CLIENT__) {