Merge pull request #13 from ice-lab/release/2.5.1

release 2.5.1

.commitlintrc.js

@@ -0,0 +1,3 @@
+const { commitlint } = require('@ice/spec');
+
+module.exports = commitlint;

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.5.1
+
+- [fix] 兼容 category 与 categories 字段
+
 ## 2.5.0
 
 - [feat] 支持 react + ts 模板，移除 angular 模板

package.json

@@ -13,7 +13,6 @@
   "dependencies": {},
   "devDependencies": {
     "@commitlint/cli": "^7.5.2",
-    "@commitlint/config-conventional": "^7.5.0",
     "@ice/spec": "^0.1.5",
     "eslint": "^6.0.1",
     "husky": "^1.3.1"

packages/ice-devtools/lib/generate.js

@@ -152,15 +152,20 @@ function generateMaterialsData(files, targetDir, type) {
     // generate i18n data
     const i18nData = generateI18nData({ title: materialConfig.title, description: pkg.description });
 
+    const {categories: originCategories, category: originCategory} = materialConfig;
+    // categories 字段：即将废弃，但是展示端还依赖该字段，因此短期内不能删除，同时需要兼容新的物料无 categories 字段
+    const categories = originCategories || (originCategory ? [originCategory] : []);
+    // category 字段：兼容老的物料无 category 字段
+    const category = originCategory || ((originCategories && originCategories[0]) ? originCategories[0] : '');
+
     // details: ../utils/validate.js
     const payload = {
       name: materialConfig.name,
       title: i18nData['zh-CN'].title || i18nData['en-US'].title,
       description: i18nData['zh-CN'].description || i18nData['en-US'].description,
       homepage: pkg.homepage || `${unpkgHost}/${npmName}@${pkg.version}/build/index.html`,
-      // TODO: 老物料展示依赖 categories，下个版本删除
-      categories: materialConfig.categories || [],
-      category: materialConfig.category,
+      categories,
+      category,
       repository: (pkg.repository && pkg.repository.url) || pkg.repository,
       source: {
         type: 'npm',

packages/ice-devtools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ice-devtools",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "ice 物料开发者工具",
   "main": "bin/ice-devtools.js",
   "bin": {

packages/ice-screenshot/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.2
+
+- [feat] add timeout cli options
+
 ## 0.1.1
 
 - [feat] Minify screenshot.

packages/ice-screenshot/bin/index.js

@@ -13,6 +13,8 @@ const createServer = require('../utils/createServer');
 const getPuppeteer = require('../utils/getPuppeteer');
 const packageJSON = require('../package.json');
 
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
+
 const cwd = process.cwd();
 const DEFAULT_PORT = 8100;
 
@@ -26,10 +28,11 @@ async function exec() {
       .option('-u, --url <url>', 'The target url or path to local server')
       .option('-l, --local [local]', 'Set up a local server in [local] directory and take screenshot, defaults set up in `./`')
       .option('-s, --selector <selector>', 'Select a element through CSS selector')
+      .option('-t, --timeout <timeout>', 'screenshot with a delay')
       .option('-o, --output <output>', 'Output path')
       .parse(process.argv);
 
-    const { url, selector, local } = program;
+    const { url, selector, local, timeout } = program;
     const output = program.output || path.join(cwd, 'screenshot.png');
 
     if (!url && !local) {
@@ -41,9 +44,9 @@ async function exec() {
     if (local) {
       const port = await detect(DEFAULT_PORT);
       const serverPath = local === true ? cwd : local;
-      await screenshotWithLocalServer(serverPath, port, url, selector, output);
+      await screenshotWithLocalServer(serverPath, port, url, selector, output, timeout);
     } else {
-      await screenshot(url, selector, output);
+      await screenshot(url, selector, output, timeout);
     }
   } catch (err) {
     console.error(err);
@@ -60,7 +63,7 @@ async function exec() {
  * @param {string} selector the target CSS selector
  * @param {string} output output path
  */
-async function screenshotWithLocalServer(serverPath, port, targetUrl, selector, output) {
+async function screenshotWithLocalServer(serverPath, port, targetUrl, selector, output, timeout) {
   targetUrl = targetUrl
     ? `http://127.0.0.1:${port}${targetUrl}`
     : `http://127.0.0.1:${port}/build/index.html`; // default screenshot target
@@ -69,7 +72,7 @@ async function screenshotWithLocalServer(serverPath, port, targetUrl, selector,
   console.log(chalk.white(`Create local server with port ${port}`));
   console.log(chalk.white(`The screenshot target url: ${targetUrl}`));
 
-  await screenshot(targetUrl, selector, output);
+  await screenshot(targetUrl, selector, output, timeout);
 
   server.close();
 }
@@ -81,7 +84,7 @@ async function screenshotWithLocalServer(serverPath, port, targetUrl, selector,
  * @param {string} selector screenshot target CSS selector
  * @param {string} output output path
  */
-async function screenshot(url, selector, output) {
+async function screenshot(url, selector, output, timeout) {
   // a terminal spinner
   const spinner = ora('screenshoting ...').start();
 
@@ -104,6 +107,10 @@ async function screenshot(url, selector, output) {
     // visit the target url
     await page.goto(url);
 
+    if (timeout) {
+      await sleep(timeout);
+    }
+
     // screenshot a element through CSS selector;
     if (selector) {
       const el = await page.$(selector);

packages/ice-screenshot/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/screenshot",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Take a screenshot of web page",
   "main": "bin/index.js",
   "bin": {