jjb-cmd 1.0.15 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jjb-cmd",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "jjb脚手架工具",
   "main": "index.js",
   "scripts": {
@@ -14,6 +14,7 @@
   "dependencies": {
     "commander": "1.3.2",
     "compressing": "^1.5.1",
-    "request": "2.88.2"
+    "request": "2.88.2",
+    "single-line-log": "1.1.2"
   }
 }

package/src/cli.dva.register.saas.txt

@@ -26,15 +26,11 @@ export const registerApplication = (selector = '#root') => {
     return {
       mount: () => render(),
       unmount: props => {
-        if (window.__POWERED_BY_QIANKUN__) {
-          const { container } = props;
-          const element = container
-            ? container.querySelector(selector)
-            : document.querySelector(selector);
-          unmountComponentAtNode(element);
-        } else {
-          console.error('卸载APP失败，原因：', '当前环境非QianKun');
-        }
+        const { container } = props;
+        const element = container
+          ? container.querySelector(selector)
+          : document.querySelector(selector);
+        unmountComponentAtNode(element);
       },
       bootstrap: props => props
     };

package/src/cli.dva.router.saas.txt

@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { ConfigProvider } from 'antd';
-import { Route, Router, Switch } from 'dva/router';
+import { BrowserRouter, Route, Switch } from 'dva/router';
 
 /**
  * @description 是否匹配页面
@@ -153,27 +153,26 @@ function treeRoutes (routes = []) {
   return optimizationTree(result);
 }
 
-function RenderRouter (routes = [], inProps = {}) {
+function RenderRoute (routes = [], inProps = {}) {
   return (
-    <Router history={inProps.history}>
-      <Switch>
-        {routes.map(({
-          path,
-          children,
-          Component
-        }, index) => (
-          <Route
-            key={index}
-            path={`${(process.env.app || {}).basename || ''}${path}`}
-            render={props => (
-              <Component {...props}>
-                {RenderRouter(children, inProps)}
-              </Component>
-            )}
-          />
-        ))}
-      </Switch>
-    </Router>
+    <Switch>
+      {routes.map(({
+        path,
+        children,
+        Component
+      }, index) => (
+        <Route
+          exact={path === '/'}
+          key={index}
+          path={path}
+          render={props => (
+            <Component {...props}>
+              {RenderRoute(children, inProps)}
+            </Component>
+          )}
+        />
+      ))}
+    </Switch>
   );
 }
 
@@ -189,10 +188,23 @@ export const AutomaticRouter = ({
 }) => {
   return (
     <ConfigProvider locale={require('antd/lib/locale/zh_CN').default}>
-      {RenderRouter(treeRoutes(getRoutes()), {
-        app,
-        history
-      })}
+      <BrowserRouter basename={(process.env.app || {}).basename || ''}>
+        <Switch>
+          {(process.env.app || {}).notRouter
+            ? (
+              <Route
+                path="*"
+                component={require('~/pages').default}
+              />
+            )
+            : (
+              RenderRoute(treeRoutes(getRoutes()), {
+                app,
+                history
+              })
+            )}
+        </Switch>
+      </BrowserRouter>
     </ConfigProvider>
   );
 };

package/src/cli.init/jjb.script/config.js

@@ -38,7 +38,9 @@ module.exports = mode => {
         // 指定编译的‘js’存放目录文件名称
         filename: 'static/js/[id].js',
         // 输出公共路径
-        publicPath: '/'
+        publicPath: '/',
+        // 默认暴露‘window’此处修改为暴露到‘exports’中
+        libraryTarget: 'umd'
       },
       // ‘node.module’
       module: {

package/src/cli.pull2.js

@@ -16,12 +16,14 @@ const CLOUD_PROJECT = {
   'common': {
     token: 'G4HJRsHr9D7Ssmixegw2',
     projectId: 279,
-    localName: 'common'
+    localName: 'common',
+    sha: '20e00c48'
   },
   'react-admin-component': {
     token: 'FT3pKzxpRynFkmddJ9Bs',
     projectId: 340,
-    localName: 'components'
+    localName: 'components',
+    sha: 'a79d730b'
   }
 };
 // common 需要替换的文本(常规应用)
@@ -217,7 +219,7 @@ module.exports = input => {
         utils.DeleteDirAllFile(`${tmpDir}/${GIT_TEMP_DIR}`, () => {
           fs.mkdirSync(`${tmpDir}/${GIT_TEMP_DIR}`);
           const stream = fs.createWriteStream(zipPath);
-          request(`${GIT_HOST}/api/v4/projects/${cloudObj.projectId}/repository/archive.zip?private_token=${cloudObj.token}&ref=master`)
+          request(`${GIT_HOST}/api/v4/projects/${cloudObj.projectId}/repository/archive.zip?private_token=${cloudObj.token}&sha=${cloudObj.sha}`)
             .pipe(stream)
             .on('close', () => {
               fs.mkdirSync(zipFolder);
@@ -225,7 +227,7 @@ module.exports = input => {
                 .then(() => {
                   setTimeout(() => {
                     fs.readdirSync(zipFolder).forEach(dirName => {
-                      if (dirName.indexOf('-master-') !== -1) {
+                      if (dirName.indexOf(`-${cloudObj.sha}`) !== -1) {
                         /* 删除下载的文件 */
                         utils.DeleteDirAllFile(`${srcFolderPath}\\${cloudObj.localName}`, () => {
                           /* 创建临时文件夹 */