jjb-cmd 2.0.7 → 2.0.9

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2022 jjb-front-team <https://www.cqjjb.cn>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 jjb-front-team <https://www.cqjjb.cn>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1 +1,8 @@
 <h1>重庆市建教帮科技有限公司-前端脚手架</h1>
+<h3>更新日志：</h3>
+<ul>
+    <li>
+        <p>2.0.8</p>
+        <div>修改init指令初始化项目，从gitlab获取</div>
+    </li>
+</ul>

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "jjb-cmd",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "jjb脚手架工具",
   "main": "index.js",
   "scripts": {
     "test": "node bin/command.js help",
-    "publish": "npm publish",
     "install:package": "npm i"
   },
   "bin": {

package/src/new/cmd.init/index.js

@@ -1,6 +1,11 @@
 const path = require('path');
 const { f_file_copy } = require('../cmd.install/tools');
+const { CLOUD_PROJECT, GIT_TEMP_DIR, GIT_HOST } = require('../cmd.install/config');
 const fs = require('fs');
+const os = require("os");
+const utils = require("../../old/util");
+const request = require("request");
+const compressing = require("compressing");
 
 module.exports = stdin => {
   /**
@@ -8,59 +13,90 @@ module.exports = stdin => {
    * @type {string}
    */
   const root_path = path.resolve('./');
-  if (stdin === 'micro-app') {
-    if (
-      !fs.existsSync(`${root_path}\\jjb.script`) &&
-      !fs.existsSync(`${root_path}\\public`) &&
-      !fs.existsSync(`${root_path}\\src`) &&
-      !fs.existsSync(`${root_path}\\.gitignore`) &&
-      !fs.existsSync(`${root_path}\\jjb.config.json`) &&
-      !fs.existsSync(`${root_path}\\package.json`) &&
-      !fs.existsSync(`${root_path}\\webstorm.config.js`)
-    ) {
-      f_file_copy(`${__dirname}\\..\\cmd.init.copy\\micro-app`, root_path);
-      console.log('初始化完成！');
-      process.exit(0);
-    } else {
-      console.log('初始化失败，文件已存在！');
-      process.exit(0);
-    }
-  } else if(stdin === 'micro-app-ts') {
-    if (
-      !fs.existsSync(`${root_path}\\jjb.script`) &&
-      !fs.existsSync(`${root_path}\\public`) &&
-      !fs.existsSync(`${root_path}\\src`) &&
-      !fs.existsSync(`${root_path}\\.gitignore`) &&
-      !fs.existsSync(`${root_path}\\jjb.config.json`) &&
-      !fs.existsSync(`${root_path}\\tsconfig.json`) &&
-      !fs.existsSync(`${root_path}\\package.json`) &&
-      !fs.existsSync(`${root_path}\\webstorm.config.js`)
-    ) {
-      f_file_copy(`${__dirname}\\..\\cmd.init.copy\\micro-app-ts`, root_path);
-      console.log('初始化完成！');
-      process.exit(0);
-    } else {
-      console.log('初始化失败，文件已存在！');
-      process.exit(0);
-    }
-  } else if ([
-    'lib',
-    'react-component'
-  ].includes(stdin)) {
-    if (
-      !fs.existsSync(`${root_path}\\jjb.script`) &&
-      !fs.existsSync(`${root_path}\\src`) &&
-      !fs.existsSync(`${root_path}\\.gitignore`) &&
-      !fs.existsSync(`${root_path}\\jjb.config.json`) &&
-      !fs.existsSync(`${root_path}\\package.json`) &&
-      !fs.existsSync(`${root_path}\\webstorm.config.js`)
-    ) {
-      f_file_copy(`${__dirname}\\..\\cmd.init.copy\\${stdin}`, root_path);
-      console.log('初始化完成！');
-      process.exit(0);
-    } else {
-      console.log('初始化失败，文件已存在！');
-      process.exit(0);
-    }
+
+  const cloudObj = CLOUD_PROJECT[ stdin ] || undefined;
+  if (cloudObj) {
+    const tmpDir = os.tmpdir();
+    const zipPath = `${tmpDir}/${GIT_TEMP_DIR}/${stdin}.zip`;
+    const zipFolder = `${tmpDir}/${GIT_TEMP_DIR}/unzip/`;
+    utils.DeleteDirAllFile(`${tmpDir}/${GIT_TEMP_DIR}`, () => {
+      fs.mkdirSync(`${tmpDir}/${GIT_TEMP_DIR}`);
+      let stream = fs.createWriteStream(zipPath);
+      request(`${GIT_HOST}/api/v4/projects/${cloudObj.projectId}/repository/archive.zip?private_token=${cloudObj.token}&ref=master`).pipe(stream)
+        .on('close', () => {
+          fs.mkdirSync(zipFolder);
+          compressing.zip.uncompress(zipPath, zipFolder)
+            .then(() => {
+              setTimeout(() => {
+                fs.readdirSync(zipFolder).forEach(dirName => {
+                  if (dirName.indexOf('-master-') !== -1) {
+                    utils.CopyFolder(zipFolder + dirName, root_path, () => {
+                      console.log('初始化完成！');
+                      process.exit(0);
+                    });
+                  }
+                })
+              }, 2000);
+            })
+        });
+    });
+  } else {
+    console.log('【Error】：初始化失败，'+ stdin +'不存在。');
   }
+
+  // if (stdin === 'micro-app') {
+  //   if (
+  //     !fs.existsSync(`${root_path}\\jjb.script`) &&
+  //     !fs.existsSync(`${root_path}\\public`) &&
+  //     !fs.existsSync(`${root_path}\\src`) &&
+  //     !fs.existsSync(`${root_path}\\.gitignore`) &&
+  //     !fs.existsSync(`${root_path}\\jjb.config.json`) &&
+  //     !fs.existsSync(`${root_path}\\package.json`) &&
+  //     !fs.existsSync(`${root_path}\\webstorm.config.js`)
+  //   ) {
+  //     f_file_copy(`${__dirname}\\..\\cmd.init.copy\\micro-app`, root_path);
+  //     console.log('初始化完成！');
+  //     process.exit(0);
+  //   } else {
+  //     console.log('初始化失败，文件已存在！');
+  //     process.exit(0);
+  //   }
+  // } else if(stdin === 'micro-app-ts') {
+  //   if (
+  //     !fs.existsSync(`${root_path}\\jjb.script`) &&
+  //     !fs.existsSync(`${root_path}\\public`) &&
+  //     !fs.existsSync(`${root_path}\\src`) &&
+  //     !fs.existsSync(`${root_path}\\.gitignore`) &&
+  //     !fs.existsSync(`${root_path}\\jjb.config.json`) &&
+  //     !fs.existsSync(`${root_path}\\tsconfig.json`) &&
+  //     !fs.existsSync(`${root_path}\\package.json`) &&
+  //     !fs.existsSync(`${root_path}\\webstorm.config.js`)
+  //   ) {
+  //     f_file_copy(`${__dirname}\\..\\cmd.init.copy\\micro-app-ts`, root_path);
+  //     console.log('初始化完成！');
+  //     process.exit(0);
+  //   } else {
+  //     console.log('初始化失败，文件已存在！');
+  //     process.exit(0);
+  //   }
+  // } else if ([
+  //   'lib',
+  //   'react-component'
+  // ].includes(stdin)) {
+  //   if (
+  //     !fs.existsSync(`${root_path}\\jjb.script`) &&
+  //     !fs.existsSync(`${root_path}\\src`) &&
+  //     !fs.existsSync(`${root_path}\\.gitignore`) &&
+  //     !fs.existsSync(`${root_path}\\jjb.config.json`) &&
+  //     !fs.existsSync(`${root_path}\\package.json`) &&
+  //     !fs.existsSync(`${root_path}\\webstorm.config.js`)
+  //   ) {
+  //     f_file_copy(`${__dirname}\\..\\cmd.init.copy\\${stdin}`, root_path);
+  //     console.log('初始化完成！');
+  //     process.exit(0);
+  //   } else {
+  //     console.log('初始化失败，文件已存在！');
+  //     process.exit(0);
+  //   }
+  // }
 };

package/src/new/cmd.install/config.js

@@ -27,5 +27,21 @@ exports.CLOUD_PROJECT = {
     token: 'd4wQ7dzEjYPsgVbKnYei',
     projectId: 339
   },
+  'react-component': {
+    token: 'snBxJ2i5kYarGGcsojhY',
+    projectId: 831
+  },
+  'micro-app-ts': {
+    token: '7V-YUxhmh51Mdhgx4rq4',
+    projectId: 830
+  },
+  'micro-app': {
+    token: 'FqNrmFAgrxasMrbbjvq9',
+    projectId: 829
+  },
+  'lib': {
+    token: 'ywPtT3xCG6b_vAxp6sTj',
+    projectId: 828
+  }
 };
 exports.TEMPLATE_FOLDER = `${os.tmpdir()}\\${exports.GIT_TEMP_DIR}`;

package/src/old/cli.init/package.json

@@ -1,65 +1,65 @@
-{
-  "name": "jjbMicroApp",
-  "version": "1.0.0",
-  "description": "jjb-micro-app",
-  "main": "index.js",
-  "scripts": {
-    "serve": "node jjb.script/server.js",
-    "build": "node jjb.script/build.js",
-    "serve:development": "cross-env NODE_ENV=development npm run serve",
-    "serve:test": "cross-env NODE_ENV=test npm run serve",
-    "serve:release": "cross-env NODE_ENV=release npm run serve",
-    "serve:production": "cross-env NODE_ENV=production npm run serve",
-    "build:development": "cross-env NODE_ENV=development npm run build",
-    "build:test": "cross-env NODE_ENV=test npm run build",
-    "build:release": "cross-env NODE_ENV=release npm run build",
-    "build:production": "cross-env NODE_ENV=production npm run build",
-    "jjb-cmd:install": "jjb-cmd install"
-  },
-  "author": "XiWell",
-  "license": "MIT",
-  "devDependencies": {
-    "@babel/core": "^7.19.3",
-    "@babel/plugin-proposal-decorators": "^7.19.3",
-    "@babel/preset-react": "^7.18.6",
-    "babel-loader": "^8.2.5",
-    "babel-plugin-import": "^1.13.5",
-    "clean-webpack-plugin": "^4.0.0",
-    "connect-history-api-fallback": "^2.0.0",
-    "cross-env": "^7.0.3",
-    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^4.2.1",
-    "express": "^4.18.2",
-    "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.5.0",
-    "less": "^4.1.3",
-    "less-loader": "^11.1.0",
-    "mini-css-extract-plugin": "^2.6.1",
-    "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.3.6",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "url-loader": "^4.1.1",
-    "webpack": "^5.74.0",
-    "webpack-bundle-analyzer": "^4.6.1",
-    "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.11.1"
-  },
-  "dependencies": {
-    "@ant-design/icons": "^4.7.0",
-    "antd": "^4.23.5",
-    "axios": "^1.1.2",
-    "crypto-js": "^4.1.1",
-    "dva": "^2.6.0-beta.22",
-    "history": "^5.3.0",
-    "moment": "^2.29.4",
-    "prop-types": "^15.8.1",
-    "qiankun": "^2.8.3",
-    "react": "^17.0.2",
-    "react-cropper": "^2.1.8",
-    "react-dom": "^17.0.2",
-    "react-router-dom": "^5.2.0",
-    "watch-props": "^0.0.3",
-    "jjb-dva-runtime": "1.0.0",
-    "jjb-common-decorator": "1.0.0"
-  }
-}
+{
+  "name": "jjbMicroApp",
+  "version": "1.0.0",
+  "description": "jjb-micro-app",
+  "main": "index.js",
+  "scripts": {
+    "serve": "node jjb.script/server.js",
+    "build": "node jjb.script/build.js",
+    "serve:development": "cross-env NODE_ENV=development npm run serve",
+    "serve:test": "cross-env NODE_ENV=test npm run serve",
+    "serve:release": "cross-env NODE_ENV=release npm run serve",
+    "serve:production": "cross-env NODE_ENV=production npm run serve",
+    "build:development": "cross-env NODE_ENV=development npm run build",
+    "build:test": "cross-env NODE_ENV=test npm run build",
+    "build:release": "cross-env NODE_ENV=release npm run build",
+    "build:production": "cross-env NODE_ENV=production npm run build",
+    "jjb-cmd:install": "jjb-cmd install"
+  },
+  "author": "XiWell",
+  "license": "MIT",
+  "devDependencies": {
+    "@babel/core": "^7.19.3",
+    "@babel/plugin-proposal-decorators": "^7.19.3",
+    "@babel/preset-react": "^7.18.6",
+    "babel-loader": "^8.2.5",
+    "babel-plugin-import": "^1.13.5",
+    "clean-webpack-plugin": "^4.0.0",
+    "connect-history-api-fallback": "^2.0.0",
+    "cross-env": "^7.0.3",
+    "css-loader": "^6.7.1",
+    "css-minimizer-webpack-plugin": "^4.2.1",
+    "express": "^4.18.2",
+    "file-loader": "^6.2.0",
+    "html-webpack-plugin": "^5.5.0",
+    "less": "^4.1.3",
+    "less-loader": "^11.1.0",
+    "mini-css-extract-plugin": "^2.6.1",
+    "style-loader": "^3.3.1",
+    "terser-webpack-plugin": "^5.3.6",
+    "uglifyjs-webpack-plugin": "^2.2.0",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.74.0",
+    "webpack-bundle-analyzer": "^4.6.1",
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.11.1"
+  },
+  "dependencies": {
+    "@ant-design/icons": "^4.7.0",
+    "antd": "^4.23.5",
+    "axios": "^1.1.2",
+    "crypto-js": "^4.1.1",
+    "dva": "^2.6.0-beta.22",
+    "history": "^5.3.0",
+    "moment": "^2.29.4",
+    "prop-types": "^15.8.1",
+    "qiankun": "^2.8.3",
+    "react": "^17.0.2",
+    "react-cropper": "^2.1.8",
+    "react-dom": "^17.0.2",
+    "react-router-dom": "^5.2.0",
+    "watch-props": "^0.0.3",
+    "jjb-dva-runtime": "1.0.0",
+    "jjb-common-decorator": "1.0.0"
+  }
+}

package/src/old/cli.init/src/enumerate/namespace/index.js

@@ -1,3 +1,3 @@
-import { defineNamespace } from 'jjb-dva-runtime';
-
-export const NS_MAIN = defineNamespace('main');
+import { defineNamespace } from 'jjb-dva-runtime';
+
+export const NS_MAIN = defineNamespace('main');

package/src/old/cli.init/src/models/main/index.js

@@ -1,31 +1,31 @@
-import { NS_MAIN } from '~/enumerate/namespace';
-import { registerModelNew } from 'jjb-dva-runtime';
-import { GetBaseApplicationConfig } from '~/api/main';
-
-export default registerModelNew(NS_MAIN, {
-  state: {
-    loading: false
-  },
-  effects: {
-    /**
-     * @return {Promise<{IResponse}>}
-     */
-    getBaseApplicationConfigAction: () => [
-      'loading',
-      GetBaseApplicationConfig,
-      ({
-        tabs = {},
-        aside = {},
-        header = {},
-        content = {}
-      }) => ({
-        baseApplicationConfig: {
-          tabs,
-          aside,
-          header,
-          content
-        }
-      })
-    ]
-  }
-});
+import { NS_MAIN } from '~/enumerate/namespace';
+import { registerModelNew } from 'jjb-dva-runtime';
+import { GetBaseApplicationConfig } from '~/api/main';
+
+export default registerModelNew(NS_MAIN, {
+  state: {
+    loading: false
+  },
+  effects: {
+    /**
+     * @return {Promise<{IResponse}>}
+     */
+    getBaseApplicationConfigAction: () => [
+      'loading',
+      GetBaseApplicationConfig,
+      ({
+        tabs = {},
+        aside = {},
+        header = {},
+        content = {}
+      }) => ({
+        baseApplicationConfig: {
+          tabs,
+          aside,
+          header,
+          content
+        }
+      })
+    ]
+  }
+});

package/src/old/cli.init/webstorm.config.js

@@ -1,18 +1,18 @@
-'use strict';
-const path = require('path');
-
-function resolve (dir) {
-  return path.join(__dirname, '.', dir);
-}
-
-module.exports = {
-  context: path.resolve(__dirname, './'),
-  resolve: {
-    extensions: [ '.js' ],
-    alias: {
-      '~': resolve('src/'),
-      'common': resolve('src/common'),
-      'components': resolve('src/components')
-    }
-  }
-};
+'use strict';
+const path = require('path');
+
+function resolve (dir) {
+  return path.join(__dirname, '.', dir);
+}
+
+module.exports = {
+  context: path.resolve(__dirname, './'),
+  resolve: {
+    extensions: [ '.js' ],
+    alias: {
+      '~': resolve('src/'),
+      'common': resolve('src/common'),
+      'components': resolve('src/components')
+    }
+  }
+};

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/src/new/cmd.init.copy/lib/jjb.config.json

@@ -1,32 +0,0 @@
-{
-  "projectType": "micro-spa",
-  "installTarget": "node_modules",
-  "installResources": [],
-  "environment": {
-    "development": {
-      "API_HOST": ""
-    },
-    "test": {
-      "API_HOST": ""
-    },
-    "release": {
-      "API_HOST": ""
-    },
-    "production": {
-      "API_HOST": ""
-    }
-  },
-  "contextInject": {},
-  "windowInject": {},
-  "server": {
-    "port": "8066",
-    "host": "127.0.0.1"
-  },
-  "framework": {
-    "antd": {
-      "link-color": "red",
-      "primary-color": "red",
-      "border-radius-base": "2px"
-    }
-  }
-}

package/src/new/cmd.init.copy/lib/jjb.script/build.js

@@ -1,14 +0,0 @@
-const { hasEnvironment } = require('./utils');
-
-if ( !hasEnvironment()) {
-  throw Error('jjb.script[build]: 启动build需要提供NODE_ENV变量，请确认你所运行的脚本是否正确？');
-}
-
-require('webpack')(require('./config')('production').webpack).run(function (stat, compiler) {
-  if ( !compiler.compilation.errors.length) {
-    console.log('库文件Build完成!');
-  } else {
-    console.log('库文件Build失败，发现以下问题，请解决后重试!');
-    console.log(compiler.compilation.errors);
-  }
-});