@tmsfe/tmskit 0.0.4 → 0.0.5-beta.3

package/src/init.js

@@ -1,4 +1,3 @@
-const { exec } = require('shelljs');
 const semver = require('semver');
 const packageJson = require('../package.json');
 const chalk = require('chalk');
@@ -29,10 +28,6 @@ function initCliContext() {
   // 执行操作前检查node版本
   // 旧版本node直接提示升级，退出脚本
   checkNodeVersion(requiredVersion, packName);
-
-
-  // 执行前配置正确的npm源
-  exec('npm config set registry https://mirrors.tencent.com/npm/ --global', { silent: true });
 }
 
 module.exports = initCliContext;

package/src/scripts/run/build/index.js

@@ -1,15 +1,15 @@
 const shelljs = require('shelljs');
-const webpackBuildServer = require('../../../webpack/buildServer');
 const { resolve } = require('../../../utils/widgets');
 const init = require('../init/index');
+const gulpBuild = require('../../../gulp/build');
 
 async function build(tmsConfig, targetModules, env) {
   // 开始构建前，清理输出目录
-  await shelljs.rm('-rf', resolve('dist'));
+  await shelljs.rm('-rf', resolve(tmsConfig.gulp.outputDir));
 
   const { targetModules: newModules } = await init(tmsConfig, targetModules);
 
-  webpackBuildServer(tmsConfig, newModules, env);
+  gulpBuild(tmsConfig, newModules, env);
 }
 
 module.exports = build;

package/src/scripts/run/dev/index.js

@@ -1,4 +1,4 @@
-const webpackServer = require('../../../webpack/devServer');
+const gulpDev = require('../../../gulp/dev');
 const fs = require('fs');
 const { resolve } = require('../../../utils/widgets');
 const init = require('../init/index');
@@ -45,7 +45,7 @@ function isInit(tmsConfig, targetModules, contextDir) {
   }
 
   //  判断package.json的版本是否有新的版本
-  return checkDependencies(targetModules, resolve('./'), tmsConfig.webpack.outputDir);
+  return checkDependencies(targetModules, resolve('./'), tmsConfig.gulp.outputDir);
 }
 
 async function dev(tmsConfig, targetModules, env) {
@@ -60,7 +60,7 @@ async function dev(tmsConfig, targetModules, env) {
   }
 
   console.log('当前dev启动的有效模块', newModules.map(item => item.name));
-  webpackServer(tmsConfig, newModules, env);
+  gulpDev(tmsConfig, newModules, env);
 }
 
 module.exports = dev;

package/src/scripts/run/index.js

@@ -2,7 +2,7 @@ const init = require('./init/index');
 const dev = require('./dev/index');
 const build = require('./build/index');
 const install = require('./install/index');
-const { createTask, resolve  } = require('../../utils/widgets');
+const { createTask } = require('../../utils/widgets');
 const { MODE } = require('../../config/constant');
 const { readTmsConfig, checkModules } = require('../../utils/tkitUtils');
 
@@ -12,10 +12,12 @@ const handleModulesArg = (cmd) => {
     return MODE.main;
   }
   // 单模块 或 多模块开发
+  const { argv } = process;
+  const reset = argv.indexOf('-m') > -1 ? argv.slice(argv.indexOf('-m') + 1) : [];
   if (cmd.module) {
     return [
       cmd.module,
-      ...cmd.args,
+      ...reset,
     ];
   }
   // 全量模块
@@ -23,11 +25,6 @@ const handleModulesArg = (cmd) => {
 };
 
 async function run(commandName, cmd) {
-  if (commandName === 'install') {
-    install(resolve('./'));
-    return;
-  }
-
   const moduleArg = handleModulesArg(cmd);
   const { env } = cmd;
 
@@ -52,6 +49,9 @@ async function run(commandName, cmd) {
     case 'dev':
       dev(tmsConfig, modules, env);
       return;
+    case 'install':
+      install(tmsConfig, modules, env);
+      return;
     case 'build':
       build(tmsConfig, modules, env);
       return;

package/src/scripts/run/init/index.js

@@ -3,44 +3,38 @@ const fs = require('fs');
 const io = require('../../../utils/io');
 const { resolve, createTask } = require('../../../utils/widgets');
 const { buildOutputAppJson } = require('../../../utils/buildAppJson');
-const { npmInstallAll } = require('../../../utils/npmUtils');
-const { buildMpNpm } = require('../../../utils/mpCiUtils');
-const {  MODULE_CODE_DIR, CACHE_DIR, DEFAULT_COPY_CONFIG, DEFAULT_MODULE_DIR } = require('../../../config/constant');
+const {  MODULE_CODE_DIR, DEFAULT_COPY_CONFIG, DEFAULT_MODULE_DIR } = require('../../../config/constant');
 const { cloneModules } = require('../../../utils/cloneModules');
 const { tmsModulesMergeLocalModuleCfg } = require('../../../utils/tkitUtils');
 const { fail } = require('../../../utils/log');
+const install = require('../install');
 
 /**
- * 拷贝package.json\模块的代码到编译输出目录
+ * 拷贝相关配置文件到编译输出目录
  * @param { object } tmsConfig
  * @param { array } modules
  * @param { array } defaultFiles 默认需要拷贝的配置项
  * @returns
  */
 const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve(tmsConfig.webpack.outputDir);
+  const outputDir = resolve(tmsConfig.gulp.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach((item) => {
     if (fs.existsSync(resolve(item))) {
-      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.webpack.outputDir, item));
+      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.gulp.outputDir, item));
     }
   });
 
-  // 拷贝模块的代码到编译输出目录
+  // 拷贝模块的package.json到编译输出目录
   targetModules.forEach((item) => {
-    const outputModuleDir = resolve(`${tmsConfig.webpack.outputDir}/${item.root}`);
+    const outputModuleDir = resolve(`${tmsConfig.gulp.outputDir}/${item.root}`);
     if (!fs.existsSync(resolve(item.path))) {
       fail(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
       process.exit(1);
     }
-    if (!fs.existsSync(outputModuleDir)) {
-      shelljs.mkdir('-p', outputModuleDir);
-    } else {
-      // 删除除了node_modules、miniprogram_npm 的其他文件
-      // eslint-disable-next-line
-      shelljs.exec('find . -not \( -name node_modules -or -name miniprogram_npm \)  -delete', { silent: true });
-    }
-    shelljs.cp('-Rf', `${resolve(item.path)}/*`, outputModuleDir);
+    io.ensureDirExist(outputModuleDir);
+    const modulePackagePath = resolve(item.path, 'package.json');
+    if (fs.existsSync(modulePackagePath)) shelljs.cp('-Rf', modulePackagePath, outputModuleDir);
   });
 };
 
@@ -63,19 +57,8 @@ async function task(tmsConfig, targetModules) {
     '拷贝文件到编译输出目录完成',
   )(tmsConfig, newModules, DEFAULT_COPY_CONFIG);
 
-  // npm install
-  await createTask(
-    npmInstallAll,
-    '开始npm install',
-    'npm install 完成',
-  )(newModules, resolve(tmsConfig.webpack.outputDir), `${CACHE_DIR}/node_modules`);
-
-  // 构建miniprograme_npm
-  await createTask(
-    buildMpNpm,
-    '开始构建miniprograme_npm',
-    '构建miniprograme_npm 完成',
-  )({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsConfig.privateKey });
+  // install
+  await install(tmsConfig, newModules, false);
 
   // 动态生成编译后的app.json;
   await createTask(

package/src/scripts/run/install/index.js

@@ -1,39 +1,31 @@
-const shelljs = require('shelljs');
-const { createTask } = require('../../../utils/widgets');
+const { createTask, resolve } = require('../../../utils/widgets');
 const { buildMpNpm } = require('../../../utils/mpCiUtils');
-const glob = require('glob-ignore');
-const path = require('path');
+const { CACHE_DIR, DEFAULT_MODULE_DIR } = require('../../../config/constant');
+const { cloudNpmInstall, mpNpmInstallAll } = require('../../../utils/npmUtils');
+const { tmsModulesMergeLocalModuleCfg } = require('../../../utils/tkitUtils');
 
-function npmInstall(contextDir) {
-  return new Promise((resolve, reject) => {
-    glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
-      if (err) {
-        reject(err);
-      }
-      files.forEach((file) => {
-        const dir = path.dirname(file);
-        shelljs.cd(dir);
-        shelljs.exec('npx pnpm install --prod --registry http://mirrors.tencent.com/npm/', { silent: false });
-      });
-      resolve();
-    });
-  });
-}
-
-async function install(contextDir) {
-  // npm install
+async function install(tmsConfig, modules, isCloud = true) {
+  const newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName, DEFAULT_MODULE_DIR);
+  // 小程序npm install
   await createTask(
-    npmInstall,
-    '开始npm install',
-    'npm install完成',
-  )(contextDir);
+    mpNpmInstallAll,
+    '小程序 开始npm install',
+    '小程序npm install 完成',
+  )(newModules, resolve(tmsConfig.gulp.outputDir), `${CACHE_DIR}/node_modules`);
 
   // 构建miniprograme_npm
   await createTask(
     buildMpNpm,
-    '开始构建miniprogram_npm',
-    '构建miniprogram_npm 完成',
-  )({ appId: 'null', projectPath: contextDir, privateKey: 'null' });
+    '开始构建miniprograme_npm',
+    '构建miniprograme_npm 完成',
+  )({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsConfig.privateKey });
+
+  // 安装云函数的
+  isCloud && createTask(
+    cloudNpmInstall,
+    '云函数npm install',
+    '云函数npm install安装完毕',
+  )(resolve(tmsConfig.cloudDir));
 }
 
 module.exports = install;

package/src/utils/buildAppJson.js

@@ -133,7 +133,7 @@ function buildOutputAppJson(tmsConfig, modules) {
   // 更新主包，需在subpackages处理完成后执行， pages/
   updateMainPackages(appJson, tmsConfig.mainPackages, DEFAULT_MODULE_DIR);
 
-  fs.writeFileSync(resolve(`${tmsConfig.webpack.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+  fs.writeFileSync(resolve(`${tmsConfig.gulp.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
 
   return appJson;
 }

package/src/utils/io.js

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const path = require('path');
 /**
  * 判断目录是否为空
  * @param {string} dirname 目录名
@@ -15,7 +16,51 @@ const ensureDirExist = (dirname) => {
   }
 };
 
+// 复制文件
+const copyFile = function (src, dest) {
+  if (fs.existsSync(dest)) {
+    fs.unlinkSync(dest);
+  }
+  const dir = dest.substr(0, dest.lastIndexOf('/'));
+  ensureDirExist(dir);
+  fs.copyFileSync(src, dest);
+};
+
+// 添加后缀
+function ext(filePath, extensions) {
+  let newFilePath = filePath;
+  try {
+    const stat = fs.lstatSync(newFilePath);
+    if (stat.isDirectory()) {
+      newFilePath += (newFilePath[newFilePath.length - 1] === '/') ? 'index' : '/index';
+    }
+  } catch (e) {}
+
+  for (const ext of extensions) {
+    const file = newFilePath.endsWith(ext) ? newFilePath : newFilePath + ext;
+    if (fs.existsSync(file)) {
+      return {
+        file,
+        ext,
+      };
+    }
+  }
+  return null;
+}
+
+// 判断文件是否在某个目录
+const fileInDir = (dir, file) => {
+  const relativePath = path.relative(dir, file);
+  if (relativePath.startsWith('..')) {
+    return false;
+  }
+  return true;
+};
+
 module.exports = {
   isDirEmpty,
+  copyFile,
   ensureDirExist,
+  ext,
+  fileInDir,
 };

package/src/utils/npmUtils.js

@@ -4,11 +4,12 @@
 const fs = require('fs');
 const path = require('path');
 const shell = require('shelljs');
+const glob = require('glob-ignore');
 const LOG = require('./log');
 
 const dirpath = process.cwd(); // 项目根目录
 
-const getTarNpmFilename = targetDir => `${targetDir.replaceAll('/', '-')}.tar.gz`;
+const getTarNpmFilename = targetDir => `${targetDir.replace(/\//g, '-')}.tar.gz`;
 
 // 缓存npm包
 const npmCache = function (targetDir, cacheDir) {
@@ -38,9 +39,8 @@ const getNpmCache = function (targetDir, cacheDir) {
 
 
 // 遍历安装指定目录下所有项目的npm依赖
-const npmInstallAll = async (modules, contextDir, cacheDir) => {
+const mpNpmInstallAll = async (modules, contextDir, cacheDir) => {
   const packageJsonFiles = await findAllPackageJson(modules, contextDir);
-
   await Promise.all(packageJsonFiles.map(file => new Promise((resolve) => {
     const dir = path.dirname(file);
     shell.cd(dir);
@@ -109,7 +109,12 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
   const cwd = contextDir || dirpath;
   const result = [path.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
 
+
   subRoots.forEach((subRoot) => {
+    if (!subRoot.root) {
+      LOG.fail(`请检查${subRoot.name}的module.config.json是否有root字段`);
+      process.exit(1);
+    }
     const toppath = path.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
     const list = findFilesByFilter(toppath, packageJsonName);
 
@@ -119,8 +124,25 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
   return result;
 };
 
+function cloudNpmInstall(contextDir) {
+  return new Promise((resolve, reject) => {
+    glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
+      if (err) {
+        reject(err);
+      }
+      files.forEach((file) => {
+        const dir = path.dirname(file);
+        shell.cd(dir);
+        shell.exec('npx npm install --production --registry http://mirrors.tencent.com/npm/', { silent: false });
+      });
+      resolve();
+    });
+  });
+}
+
 
 module.exports = {
-  npmInstallAll,
+  cloudNpmInstall,
+  mpNpmInstallAll,
   findAllPackageJson,
 };

package/src/webpack/base.js

@@ -1,65 +0,0 @@
-const WebpackChain = require('webpack-chain');
-const webpack = require('webpack');
-const { getEntry, stringified, getAlias } = require('./utils');
-const { resolve } = require('../utils/widgets');
-const { DEFAULT_WEBPACK_ENTRY, DEFAULT_MODULE_DIR } = require('../config/constant');
-
-module.exports = (tmsConfig, modules) => {
-  const { envData = {}, webpack: tmsWebpack } = tmsConfig;
-  let webpackConfig = new WebpackChain();
-
-  const alias = getAlias(modules);
-  const entry = getEntry(DEFAULT_WEBPACK_ENTRY, modules, tmsConfig, DEFAULT_MODULE_DIR);
-  webpackConfig.merge({
-    entry,
-    output: {
-      path: resolve(`./${tmsWebpack.outputDir}`),
-      libraryTarget: 'commonjs2',
-      filename: '[name]',
-    },
-    // TODO 有报错，先注释掉
-    // cache: {
-    //   type: 'filesystem',
-    //   cacheDirectory: resolve(`./${tmsConfig.webpack.outputDir}/node_modules/.cache`),
-    // },
-    resolve: {
-      extensions: ['.tsx', '.ts', '.js'],
-      alias: Object.assign(tmsWebpack.alias, alias),
-    },
-    devtool: tmsWebpack.sourceMap ? 'source-map' : false,
-  });
-
-  webpackConfig.module
-    .rule('ts-loader')
-    .test(/\.ts$/)
-    .use('ts-loader')
-    .loader(require.resolve('ts-loader'))
-    .options({
-      configFile: resolve('./tsconfig.json'),
-      // 只进行语法转换,不进行类型校验,提高构建速度
-      transpileOnly: true,
-    })
-    .end();
-
-  // webpackConfig.module
-  //   .rule('babel')
-  //   .test(/\.(js|mjs|jsx|ts|tsx)$/)
-  //   .pre()
-  // .exclude.add(/(node_modules|miniprogram_npm)/).end()
-  //   .use(require.resolve('babel-loader'))
-  //   .loader(require.resolve('babel-loader'));
-
-  webpackConfig
-    .plugin('definePlugin')
-    .use(webpack.DefinePlugin, [stringified(envData)])
-    .end();
-
-  // 执行tms.config.js自定义的webpackChain
-  if (tmsWebpack.webpackChain) {
-    webpackConfig = tmsWebpack.webpackChain(webpackConfig, {
-      modules,
-    });
-  }
-
-  return webpackConfig;
-};

package/src/webpack/build.js

@@ -1,21 +0,0 @@
-const webpackConfig = require('./base');
-const { DEFAULT_COPY_CONFIG } = require('../config/constant');
-const { getCopyPlugin } = require('./utils');
-
-module.exports = (...args) => {
-  const [tmsConfig, modules] = args;
-  const webpackBuildConfig = webpackConfig(...args);
-
-  webpackBuildConfig.mode('production');
-
-  const copyPluginParams = getCopyPlugin(DEFAULT_COPY_CONFIG, modules, tmsConfig, 'build');
-  // console.log('copyPluginParams', copyPluginParams);
-  webpackBuildConfig
-    .plugin('copy-webpack-plugin')
-    .use(require('copy-webpack-plugin'), [{
-      patterns: copyPluginParams,
-    }])
-    .end();
-
-  return webpackBuildConfig;
-};

package/src/webpack/buildServer.js

@@ -1,34 +0,0 @@
-const webpack = require('webpack');
-const webBuildConfig = require('./build');
-const { createTask } = require('../utils/widgets');
-const { fail } = require('../utils/log');
-
-function compilerRun(compiler) {
-  return new Promise((resolve) => {
-    compiler.run((err, stats) => {
-      resolve({ err, stats });
-    });
-  });
-}
-
-module.exports = async (...args) => {
-  const config = webBuildConfig(...args);
-  const compiler = webpack(config.toConfig());
-
-  const { err, stats } = await createTask(compilerRun, '开始webpack打包编译', 'webpack打包编译完成')(compiler);;
-
-  if (err) {
-    fail(err);
-    console.log('详细的错误信息:', err);
-  }
-
-  if (stats.hasErrors() || stats.hasWarnings()) {
-    console.log(stats.toString({
-      // 增加控制台颜色开关
-      colors: true,
-      errorDetails: true,
-    }));
-  };
-
-  return compiler;
-};

package/src/webpack/dev.js

@@ -1,31 +0,0 @@
-const webpackConfig = require('./base');
-const { DEFAULT_COPY_CONFIG } = require('../config/constant');
-const { getCopyPlugin } = require('./utils');
-
-module.exports = (...args) => {
-  const [tmsConfig, modules] = args;
-  const webpackDevConfig = webpackConfig(...args);
-
-  webpackDevConfig.devtool('source-map');
-
-  webpackDevConfig.mode('development');
-
-  const copyPluginParams = getCopyPlugin(DEFAULT_COPY_CONFIG, modules, tmsConfig, 'dev');
-  // console.log('copyPluginParams', copyPluginParams);
-  webpackDevConfig
-    .plugin('copy-webpack-plugin')
-    .use(require('copy-webpack-plugin'), [{
-      patterns: copyPluginParams,
-    }])
-    .end();
-
-  webpackDevConfig
-    .plugin('ExtractPlugin')
-    .use(require('./plugins/entryExtractPlugin'), [{
-      tmsConfig,
-      modules,
-    }])
-    .end();
-
-  return webpackDevConfig;
-};

package/src/webpack/devServer.js

@@ -1,37 +0,0 @@
-const webpack = require('webpack');
-const webDevConfig = require('./dev');
-const { setupDevWebPackHooks } = require('./utils');
-const { fail } = require('../utils/log');
-
-module.exports = (...args) => {
-  const config = webDevConfig(...args);
-  const compiler = webpack(config.toConfig());
-
-  setupDevWebPackHooks({
-    compiler,
-  }, () => {
-    // TODO 判断open参数，打开微信开发者工具
-    // openDevtool(api.resolve(config.outputDir || 'dist'))
-  });
-
-  compiler.watch(
-    {
-      aggregateTimeout: 1000,
-      poll: undefined,
-    },
-    (err, stats) => {
-      if (err) {
-        fail(err);
-        console.log('详细的错误信息:', err);
-      }
-      if (stats.hasErrors() || stats.hasWarnings()) {
-        console.log(stats.toString({
-          // 增加控制台颜色开关
-          colors: true,
-        }));
-      };
-    },
-  );
-
-  return compiler;
-};

package/src/webpack/plugins/entryExtractPlugin/index.js

@@ -1,28 +0,0 @@
-const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin');
-const { DEFAULT_WEBPACK_ENTRY, DEFAULT_MODULE_DIR } = require('../../../config/constant');
-const { getEntry } = require('../../utils');
-
-class EntryExtraPlugin {
-  constructor(options = {}) {
-    this.options = options;
-  }
-
-  applyEntry(compiler, entry) {
-    const { context } = compiler.options;
-
-    Object.keys(entry).forEach((key) => {
-      new SingleEntryPlugin(context, entry[key], key).apply(compiler);
-    });
-  }
-
-  apply(compiler) {
-    const { tmsConfig = {}, modules = [] } = this.options;
-
-    compiler.hooks.watchRun.tap('EntryExtraPlugin', () => {
-      const entry = getEntry(DEFAULT_WEBPACK_ENTRY, modules, tmsConfig, DEFAULT_MODULE_DIR);
-      this.applyEntry(compiler, entry);
-    });
-  }
-}
-
-module.exports = EntryExtraPlugin;