@tmsfe/tmskit 0.0.1 → 0.0.5-beta.0

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

@@ -0,0 +1,31 @@
+const { createTask, resolve } = require('../../../utils/widgets');
+const { buildMpNpm } = require('../../../utils/mpCiUtils');
+const { CACHE_DIR, DEFAULT_MODULE_DIR } = require('../../../config/constant');
+const { cloudNpmInstall, mpNpmInstallAll } = require('../../../utils/npmUtils');
+const { tmsModulesMergeLocalModuleCfg } = require('../../../utils/tkitUtils');
+
+async function install(tmsConfig, modules, isCloud = true) {
+  const newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName, DEFAULT_MODULE_DIR);
+  // 小程序npm install
+  await createTask(
+    mpNpmInstallAll,
+    '小程序 开始npm install',
+    '小程序npm install 完成',
+  )(newModules, resolve(tmsConfig.gulp.outputDir), `${CACHE_DIR}/node_modules`);
+
+  // 构建miniprograme_npm
+  await createTask(
+    buildMpNpm,
+    '开始构建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/entry.js

@@ -0,0 +1,150 @@
+const path = require('path');
+const fs = require('fs');
+const { resolve, unique } = require('../utils/widgets');
+const { tmsModulesMergeLocalModuleCfg } = require('../utils/tkitUtils');
+const { fail } = require('../utils/log');
+const replaceExt = require('replace-ext');
+
+const extensions = ['.js', '.ts'];
+function ext(entry, extensions) {
+  let newEntry = entry;
+  try {
+    const stat = fs.lstatSync(newEntry);
+    if (stat.isDirectory()) {
+      newEntry += (newEntry[newEntry.length - 1] === '/') ? 'index' : '/index';
+    }
+  } catch (e) {}
+
+  for (const ext of extensions) {
+    const file = replaceExt(newEntry, ext);
+    if (fs.existsSync(file)) {
+      return {
+        file,
+        ext,
+      };
+    }
+  }
+  return null;
+}
+
+// 根据用户选择的modules，找到module.config.json的配置信息，找到所有的page
+function getPageEntry(modules, tmsConfig, moduleDir) {
+  let entry = [];
+  // tms.config.js的modules 合并 module.config.json的配置项
+  const newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName, moduleDir);
+  newModules.forEach(({ path: relativePath, pages, root }, index) => {
+    pages.forEach((page) => {
+      const pageJsonPath = `${resolve(relativePath, page)}.json`;
+      if (fs.existsSync(pageJsonPath)) {
+        const pageJsonContent = JSON.parse(fs.readFileSync(pageJsonPath, 'utf-8'));
+        const pageDir = path.dirname(pageJsonPath); // 该页面所在的目录
+        const extValue = ext(resolve(relativePath, page), extensions);
+        if (!extValue) {
+          fail(`当前${page}找不到入口.js或.ts文件`);
+          process.exit(1);
+        }
+
+        const entryKey = `${root}/${page}${extValue.ext}`;
+        entry = entry.concat(
+          [{
+            key: entryKey,
+            filePath: extValue.file,
+            type: 'page',
+            moduleInfo: {
+              path: relativePath,
+              root,
+            },
+          }],
+          getComponentEntry(pageJsonContent, pageDir, path.dirname(entryKey), newModules[index]),
+        );
+      }
+    });
+  });
+  return entry;
+}
+
+// 根据pageJson，filePath，获取页面引入的所有component
+function getComponentEntry(pageJson, pagePath, pageKey, moduleInfo) {
+  const componentEntry = [];
+  function task(json, dir, rootKey) {
+    if (!json.usingComponents) {
+      return;
+    }
+
+    const componentKeys = Object.keys(json.usingComponents);
+
+    // 如果存在依赖的组件
+    componentKeys.forEach((key) => {
+      if (json.usingComponents[key].startsWith('.')) {
+        // 拼出组件所在位置的绝对路径
+        const comValue = path.join(dir, json.usingComponents[key]);
+        const extValue = ext(comValue, extensions);
+        const comKey = path.resolve('/', rootKey, json.usingComponents[key]);
+        if (!extValue) {
+          fail(`当前page: ${pagePath} component: ${comValue}找不到入口.js或.ts文件`);
+          process.exit(1);
+        }
+
+        componentEntry.push({
+          key: `${comKey.slice(1)}${extValue.ext}`,
+          filePath: extValue.file,
+          type: 'component',
+          moduleInfo: {
+            path: moduleInfo.path,
+            root: moduleInfo.root,
+          },
+        });
+
+        const comJsonPath = `${comValue}.json`;
+        if (fs.existsSync(comJsonPath)) {
+          const comJsonContent = JSON.parse(fs.readFileSync(comJsonPath, 'utf-8'));
+
+          const comDir = path.dirname(comJsonPath); // 该页面所在的目录
+          task(comJsonContent, comDir, path.dirname(comKey));
+        }
+      }
+    });
+  }
+
+  task(pageJson, pagePath, pageKey);
+
+  return componentEntry;
+}
+
+// 收集依赖在非模块内的目录
+function getDepDirOfNotInModule(modules, tmsConfig, moduleDir) {
+  const result = [];
+  const pageInfoArr = getPageEntry(modules, tmsConfig, moduleDir);
+  // const pageInfoArr = [{
+  //   type: 'component',
+  //   filePath: '/Users/odile/workspace/tms-frontend1/miniprogram/modules/home/common/components/favorite/favorite.js',
+  //   moduleInfo: {
+  //     root: 'modules/home/welfare',
+  //     path: '../../miniprogram/modules/home/welfare',
+  //   },
+  // }];
+  pageInfoArr.filter(item => item.type === 'component').forEach((item) => {
+    const { moduleInfo, filePath } = item;
+    // 文件路径 相对于 模块path的路径 ../../common/data
+    const moduleFileRelative = path.relative(resolve(moduleInfo.path), filePath);
+
+    // '../../common/data' => '../../common'
+    const fileRelativeDir = moduleFileRelative.match(/^(\.\.\/)+([^/]*)/);
+    // eslint-disable-next-line
+    if (fileRelativeDir && fileRelativeDir[0]) {
+      const fileDir = resolve(moduleInfo.path, fileRelativeDir[0]);
+      if (fs.existsSync(fileDir)) {
+        result.push({
+          from: fileDir,
+          to: resolve(tmsConfig.webpack.outputDir, moduleInfo.root, fileRelativeDir[0]),
+        });
+      }
+    }
+  });
+
+  return unique(result, 'from');
+}
+
+module.exports = {
+  getDepDirOfNotInModule,
+};

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,9 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
   const cwd = contextDir || dirpath;
   const result = [path.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
 
+
   subRoots.forEach((subRoot) => {
+    console.log('>>>>>>>>>>>>', subRoot);
     const toppath = path.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
     const list = findFilesByFilter(toppath, packageJsonName);
 
@@ -119,8 +121,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/utils/widgets.js

@@ -96,7 +96,7 @@ function downloadRepo(dest, downloadOptions = { repoUrl: '', gitUrl: '', branch:
 function downloadRepoForGit(url, dest, branch) {
   const cwd = process.cwd();
 
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     // 如果目标目录不存在
     if (fs.existsSync(dest)) {
       shelljs.rm('-rf', path.join(dest));
@@ -105,17 +105,10 @@ function downloadRepoForGit(url, dest, branch) {
     shelljs.mkdir('-p', dest);
     shelljs.cd(dest);
 
-    shelljs.exec(`git clone ${url} ${dest} --depth=1`, shelljsOptons);
-
-    shelljs.exec(`git checkout ${branch}`, (code) => {
-      if (code === 0) {
-        shelljs.cd(cwd);
+    shelljs.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptons);
 
-        resolve();
-      }
-
-      reject();
-    });
+    shelljs.cd(cwd);
+    resolve();
   });
 }
 

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,29 +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;
-    this.scriptExtensions = options.scriptExtensions || ['.ts', '.js'];
-  }
-
-  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;

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

@@ -1,14 +0,0 @@
-const px2rpx = postcss.plugin('postcss-px2rpx', (opts = {}) => {
-  const { proportion = 1, minPixelValue = 0 } = opts;
-
-  return (root) => {
-    root.replaceValues(pxRegExp, { fast: 'px' }, (string) => {
-      const pixels = parseInt(string, 10);
-      if (pixels < minPixelValue) return `${pixels}px`;
-      return `${proportion * parseInt(string, 10)}rpx`;
-    });
-  };
-});
-
-
-export default px2rpx;