Merge pull request #223 from alibaba/dev

更新到 1.9.0 （update 默认不清理 lockfile） & 其他

bin/cli-core.js

@@ -93,11 +93,12 @@ cmdline
   }, false)
 
   .root.command(['template', 'middleware', 'update', 'u', 'config', 'c'])
-  .action(async function (cmd, env) {
+  .option(['-f', '--force'], 'switch')
+  .action(async function (cmd, force) {
     cmd = ALIAS[cmd] || cmd;
     this.set('command', cmd);
     try {
-      await core.commands[cmd].call(this, cmd);
+      await core.commands[cmd].call(this, force);
       cmdline.onDone(this);
     } catch (err) {
       cmdline.onFail(err);

lib/commands/update.js

@@ -7,13 +7,14 @@ const console = require('../common/console');
 const store = require('../store');
 const mod = require('../mod');
 
-module.exports = async function () {
+module.exports = async function (cleanLock) {
   console.info('Updating...');
+  if (cleanLock) console.log('Clean lockfile..')
   await Promise.all([
     store.clean('stamps'),
     store.clean('caches'),
     store.clean('modules'),
-    mod.clean()
+    mod.clean(cleanLock)
   ]);
   await mod.install();
   console.info('Done');

lib/mod.js

@@ -128,9 +128,10 @@ exports.getDocUrl = async function (name, prefix) {
   return url;
 };
 
-exports.clean = async function () {
-  await del([
-    path.normalize(`${process.cwd()}/node_modules/`),
-    path.normalize(`${process.cwd()}/package-lock.json`)
-  ], { force: true });
+exports.clean = async function (cleanLock) {
+  const items = [path.normalize(`${process.cwd()}/node_modules/`)];
+  if (cleanLock) {
+    items.push(path.normalize(`${process.cwd()}/package-lock.json`));
+  }
+  await del(items, { force: true });
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dawn",
-  "version": "1.8.5",
+  "version": "1.9.0",
   "description": "dawn cli",
   "main": "./lib/index.js",
   "bin": {

packages/dn-middleware-e2e/.dawn/pipe.yml

@@ -1,15 +1,4 @@
-init:
-  - name: tnpm-install
-  - name: pkginfo
-
 dev:
-  - name: $local
-    location: ./lib/index.js
-
-#中间工程并非要发布到 CDN
-#不放到 aliyun group 下也不会发到 CND
-#只是中间件的版本管理是基于 tag 的，恰好使用
-publish:
-  - name: shell
-    script:
-      - tnpm pu
+  - name: ./lib/index.js
+    puppeteer:
+      version: latest

packages/dn-middleware-e2e/.dawn/rc.yml

@@ -0,0 +1,2 @@
+registry: https://registry.npm.taobao.org
+server: https://query.aliyun.com/rest/dc.service.cli?team=general&conf=

packages/dn-middleware-e2e/e2e/demo.e2e.ts

@@ -0,0 +1,26 @@
+import assert from 'assert';
+import { launch, Browser } from 'puppeteer';
+
+describe('demo test', function () {
+
+  let browser: Browser;
+  beforeEach(async function () {
+    browser = await launch({
+      headless: true,
+      slowMo: 0,
+      defaultViewport: {
+        width: 1000,
+        height: 600,
+      }
+    });
+  });
+
+  it('check title', async function () {
+    const page = await browser.newPage();
+    browser
+    await page.goto('https:/www.baidu.com/');
+    const title = await page.title();
+    assert.equal(title, '百度一下，你就知道');
+  });
+
+});