Merge pull request #80 from ice-lab/ice-scripts/release-2.1.15

ice-scripts/release-2.1.16

Author: imsobear

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.1.16
+
+- [feat] support process.env.DISABLE_COLLECT to disable pv collect
+
+## 2.1.15
+
+- [feat] cli option --skip-compile for skip webpack compile
+
 ## 2.1.14
 
 - [feat] support postcssrc/postcss.config.js #2952

packages/ice-plugin-component/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.10
+
+ - [feat] generate declaration when compile ts
+
 ## 0.1.9
 
  - [feat] support basic component @ali/deep for style generate

packages/ice-plugin-component/lib/compile/component/buildSrc.js

@@ -5,12 +5,13 @@
  *    - 生成 style.js 和 index.scss
  */
 
-const { createReadStream, createWriteStream, writeFileSync } = require('fs');
+const { createReadStream, createWriteStream, writeFileSync, ensureDirSync } = require('fs-extra');
 const babel = require('@babel/core');
 const glob = require('glob');
 const mkdirp = require('mkdirp');
 const path = require('path');
 const rimraf = require('rimraf');
+const ts = require('typescript');
 
 module.exports = function componentBuild({ babelConfig, rootDir, log }) {
   const srcDir = path.join(rootDir, 'src');
@@ -54,6 +55,7 @@ module.exports = function componentBuild({ babelConfig, rootDir, log }) {
       filename: file,
     }));
     writeFileSync(path.format(destData), code, 'utf-8');
+    dtsCompile({ filePath: file, sourceFile: source, destPath: libDir });
     log.info(`Compile ${file}`);
   }
 
@@ -69,4 +71,34 @@ module.exports = function componentBuild({ babelConfig, rootDir, log }) {
         log.info(`Copy ${file}`);
       });
   }
+  // https://github.com/microsoft/TypeScript/wiki/Using-the-Compiler-API#getting-the-dts-from-a-javascript-file
+  function dtsCompile({ filePath, sourceFile, destPath }) {
+    const REG_TS = /\.(tsx?)$/;
+    const isTS = REG_TS.test(filePath);
+    if (!isTS) return;
+    const compilerOptions = {
+      allowJs: true,
+      declaration: true,
+      emitDeclarationOnly: true,
+    };
+    const dtsPath = filePath.replace(REG_TS, '.d.ts');
+    const targetPath = path.join(destPath, dtsPath);
+    // Create a Program with an in-memory emit
+    let createdFiles = {};
+    const host = ts.createCompilerHost(compilerOptions);
+    host.writeFile = (fileName, contents) => createdFiles[fileName] = contents;
+    // Prepare and emit the d.ts files
+    const program = ts.createProgram([sourceFile], compilerOptions, host);
+    program.emit();
+    const fileNamesDTS = sourceFile.replace(REG_TS, '.d.ts');
+    const content = createdFiles[fileNamesDTS];
+    // write file
+    if (content) {
+      ensureDirSync(path.dirname(targetPath));
+      writeFileSync(targetPath, content, 'utf-8');
+      log.info(`Generate ${path.basename(targetPath)}`);
+    }
+    // release
+    createdFiles = null;
+  }
 };

packages/ice-plugin-component/lib/index.js

@@ -124,6 +124,7 @@ module.exports = ({ context, chainWebpack, onHook, log }, opts = {}) => {
       if (hasAdaptor) {
         // generate adaptor index.scss
         const sassContent = resolveSassImport('main.scss', path.resolve(rootDir, 'src'));
+        fse.ensureDirSync(path.join(rootDir, 'build'));
         fse.writeFileSync(path.resolve(rootDir, 'build/index.scss'), sassContent, 'utf-8');
         // adaptor build
         reRun();

packages/ice-plugin-component/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ice-plugin-component",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "ice plugin for develop component",
   "main": "lib/index.js",
   "scripts": {
@@ -27,6 +27,7 @@
     "npmlog": "^4.1.2",
     "prismjs": "^1.16.0",
     "resolve": "^1.11.0",
-    "resolve-sass-import": "^0.1.0"
+    "resolve-sass-import": "^0.1.0",
+    "typescript": "^3.7.3"
   }
 }

packages/ice-scripts/bin/ice-scripts-build.js

@@ -8,6 +8,7 @@ program
   .option('--config <config>', 'use custom config')
   .option('--analyzer', '开启构建分析')
   .option('--analyzer-port', '设置分析端口号')
+  .option('--skip-compile', 'skip webpack compile, excute hooks for component compile')
   .parse(process.argv);
 
 (async () => {

packages/ice-scripts/lib/commands/build.js

@@ -3,7 +3,6 @@ const webpack = require('webpack');
 const { collectDetail } = require('@alifd/fusion-collector');
 
 const iceScriptsPkgData = require('../../package.json');
-const goldlog = require('../utils/goldlog');
 const log = require('../utils/log');
 const checkDepsInstalled = require('../utils/checkDepsInstalled');
 
@@ -16,10 +15,6 @@ const checkDepsInstalled = require('../utils/checkDepsInstalled');
  */
 module.exports = async function (context) {
   const { applyHook, commandArgs, rootDir, webpackConfig, pkg } = context;
-  goldlog('version', {
-    version: iceScriptsPkgData.version,
-  });
-  goldlog('build', commandArgs);
   log.verbose('build cliOptions', commandArgs);
 
   await applyHook('beforeBuild');
@@ -29,7 +24,7 @@ module.exports = async function (context) {
     return Promise.reject(new Error('项目依赖未安装，请先安装依赖。'));
   }
 
-  if (!pkg.componentConfig && !pkg.blockConfig) {
+  if (!pkg.componentConfig && !pkg.blockConfig && !process.env.DISABLE_COLLECT) {
     // only collect project
     try {
       collectDetail({
@@ -43,28 +38,34 @@ module.exports = async function (context) {
     }
   }
 
-  // empty output path
-  fse.emptyDirSync(webpackConfig.output.path);
-  return new Promise((resolve, reject) => {
-    webpack(webpackConfig, (error, stats) => {
-      if (error) {
-        return reject(error);
-      }
-      console.log(
-        stats.toString({
-          colors: true,
-          chunks: false,
-          children: false,
-          modules: false,
-          chunkModules: false,
-        })
-      );
-      if (stats.hasErrors()) {
-        return reject(new Error('webpack compiled failed.'));
-      }
-      log.info('ICE build finished');
-      applyHook('afterBuild', stats);
-      resolve();
+  const skipCompile = commandArgs.skipCompile || process.env.SKIP_COMPILE;
+  if (skipCompile) {
+    applyHook('afterBuild', {});
+    return Promise.resolve();
+  } else {
+    // empty output path
+    fse.emptyDirSync(webpackConfig.output.path);
+    return new Promise((resolve, reject) => {
+      webpack(webpackConfig, (error, stats) => {
+        if (error) {
+          return reject(error);
+        }
+        console.log(
+          stats.toString({
+            colors: true,
+            chunks: false,
+            children: false,
+            modules: false,
+            chunkModules: false,
+          }),
+        );
+        if (stats.hasErrors()) {
+          return reject(new Error('webpack compiled failed.'));
+        }
+        log.info('ICE build finished');
+        applyHook('afterBuild', stats);
+        resolve();
+      });
     });
-  });
+  }
 };

packages/ice-scripts/lib/commands/dev.js

@@ -14,18 +14,12 @@ const WebpackDevServer = require('webpack-dev-server');
 const openBrowser = require('react-dev-utils/openBrowser');
 const iceworksClient = require('../utils/iceworksClient');
 const prepareUrLs = require('../utils/prepareURLs');
-const goldlog = require('../utils/goldlog');
 const pkgData = require('../../package.json');
 const log = require('../utils/log');
 const checkDepsInstalled = require('../utils/checkDepsInstalled');
 
 module.exports = async function(context, subprocess) {
   const { applyHook, commandArgs, rootDir, webpackConfig, pkg } = context;
-
-  goldlog('version', {
-    version: pkgData.version,
-  });
-  goldlog('dev', commandArgs);
   log.verbose('dev cliOptions', commandArgs);
 
   await applyHook('beforeDev');
@@ -43,7 +37,7 @@ module.exports = async function(context, subprocess) {
     return Promise.reject(new Error('项目依赖未安装，请先安装依赖。'));
   }
 
-  if (!pkg.componentConfig && !pkg.blockConfig) {
+  if (!pkg.componentConfig && !pkg.blockConfig && !process.env.DISABLE_COLLECT) {
     // only collect project
     try {
       collectDetail({

packages/ice-scripts/lib/utils/goldlog.js

@@ -1,6 +1,6 @@
 {
   "name": "ice-scripts",
-  "version": "2.1.14",
+  "version": "2.1.16",
   "description": "ICE SDK",
   "main": "index.js",
   "bin": {