From 6125ed29df57b7a927a9b6c7fc8a0940af96ba25 Mon Sep 17 00:00:00 2001 From: yylgit <394720943@qq.com> Date: Wed, 3 Apr 2019 15:06:24 +0800 Subject: [PATCH] update --- .../project/npm-shrinkwrap.json | 24 +++++++++---------- .../chameleon-templates/project/package.json | 8 +++---- .../todo-demo/npm-shrinkwrap.json | 24 +++++++++---------- .../todo-demo/package.json | 8 +++---- packages/webpack-check-plugin/index.js | 5 ++-- packages/webpack-check-plugin/package.json | 3 ++- 6 files changed, 37 insertions(+), 35 deletions(-) diff --git a/packages/chameleon-templates/project/npm-shrinkwrap.json b/packages/chameleon-templates/project/npm-shrinkwrap.json index 08fbe415..86e6e1df 100644 --- a/packages/chameleon-templates/project/npm-shrinkwrap.json +++ b/packages/chameleon-templates/project/npm-shrinkwrap.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "chameleon-api": { - "version": "0.3.0-alpha.4", - "resolved": "https://registry.npmjs.org/chameleon-api/-/chameleon-api-0.3.0-alpha.4.tgz", - "integrity": "sha512-NxKQBJpN84t9XRgOGCcvjfjj4QIzZNECT7wX0PM1ObK4x/vPesJ+4vRxQrss8xJvYjFvve7GncTyM1Tm1RxNHw==", + "version": "0.4.0-alpha.0", + "resolved": "https://registry.npmjs.org/chameleon-api/-/chameleon-api-0.4.0-alpha.0.tgz", + "integrity": "sha512-9j5NjNH08rulw4dT7DM4SFnHQV9StSZixYrtcGxwACX1Fq+wSP8Kby3GvB7cXl+zo8yYjaAKQJM9EWb77X6X3A==", "requires": { "chameleon-bridge": "0.1.0", "child_process": "1.0.2", @@ -28,9 +28,9 @@ "integrity": "sha512-5IFZPamHYErbMYPD/H+RT5GAmxDqDZ0YlkBAbDGIDm82WFEFlpp7MnDclb1ZjJ2/txz3WmUOQQq/ZvOrVqACJg==" }, "chameleon-runtime": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/chameleon-runtime/-/chameleon-runtime-0.1.0.tgz", - "integrity": "sha512-bfAvgQb3cYsNLcYkLDLbkXz88g6Pr8bC8BpAhJyibbSBfMK++GnoZxB9Xq+OYyFHpJ6VP2Jn+f6S6lgFve4brw==", + "version": "0.2.0-alpha.0", + "resolved": "https://registry.npmjs.org/chameleon-runtime/-/chameleon-runtime-0.2.0-alpha.0.tgz", + "integrity": "sha512-4J8kT+9nqFpPuk+GJawKNDXcjpP4nEOvn7Jp8kbxdZi10dBHdovbX/CncSBuoyL3D1LttVq7ICjHlc9avYMuIQ==", "requires": { "mobx": "3.6.1" } @@ -50,9 +50,9 @@ } }, "chameleon-ui-builtin": { - "version": "0.0.7-alpha", - "resolved": "https://registry.npmjs.org/chameleon-ui-builtin/-/chameleon-ui-builtin-0.0.7-alpha.tgz", - "integrity": "sha512-k1FTI1GaGUVBhF3u5vBBZ01mOopi855emBcjkAR123VxOh1ZHh8nxlteDKADT7mTLIinyMsOiSOEO27OcFJbtA==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/chameleon-ui-builtin/-/chameleon-ui-builtin-0.1.2.tgz", + "integrity": "sha512-Oiqss1kq/12mzgJ9TkPtoBjfib91TfNtJ5e6w8vCgiZ2FtPHFSD00zH0nu7cHdTDDwDdwOhoE7ryWWYqVr4oqw==", "requires": { "chameleon-scroll": "0.0.3" } @@ -68,9 +68,9 @@ "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" }, "cml-ui": { - "version": "0.0.7-alpha", - "resolved": "https://registry.npmjs.org/cml-ui/-/cml-ui-0.0.7-alpha.tgz", - "integrity": "sha512-/O2GrK40igiwelIkfUCYuZQ1bzMeBilAaHFPdxfeF+BneJBH7ARgHhZISwTs8j537pnGYf8svDWUg8iFIZX7pA==", + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/cml-ui/-/cml-ui-0.1.3.tgz", + "integrity": "sha512-6XzWbiUwqsoB829gUXCKDS5EjcxCX4cZeBhZnZJrgaDP2ygGjZSp3tnWsgskUa2y78CWuPzMh/1+4TL0gm+nRQ==", "requires": { "classnames": "2.2.6" } diff --git a/packages/chameleon-templates/project/package.json b/packages/chameleon-templates/project/package.json index d4ab70c0..5146d945 100644 --- a/packages/chameleon-templates/project/package.json +++ b/packages/chameleon-templates/project/package.json @@ -7,11 +7,11 @@ "scripts": {}, "license": "MIT", "dependencies": { - "chameleon-api": "^0.3.0-alpha.4", + "chameleon-api": "^0.4.0-alpha.0", "chameleon-bridge": "^0.1.1-alpha.2", - "chameleon-runtime": "^0.1.0", + "chameleon-runtime": "^0.2.0-alpha.0", "chameleon-store": "0.0.3", - "chameleon-ui-builtin": "0.0.7-alpha", - "cml-ui": "0.0.7-alpha" + "chameleon-ui-builtin": "^0.1.2", + "cml-ui": "^0.1.3" } } diff --git a/packages/chameleon-templates/todo-demo/npm-shrinkwrap.json b/packages/chameleon-templates/todo-demo/npm-shrinkwrap.json index 08fbe415..86e6e1df 100644 --- a/packages/chameleon-templates/todo-demo/npm-shrinkwrap.json +++ b/packages/chameleon-templates/todo-demo/npm-shrinkwrap.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "chameleon-api": { - "version": "0.3.0-alpha.4", - "resolved": "https://registry.npmjs.org/chameleon-api/-/chameleon-api-0.3.0-alpha.4.tgz", - "integrity": "sha512-NxKQBJpN84t9XRgOGCcvjfjj4QIzZNECT7wX0PM1ObK4x/vPesJ+4vRxQrss8xJvYjFvve7GncTyM1Tm1RxNHw==", + "version": "0.4.0-alpha.0", + "resolved": "https://registry.npmjs.org/chameleon-api/-/chameleon-api-0.4.0-alpha.0.tgz", + "integrity": "sha512-9j5NjNH08rulw4dT7DM4SFnHQV9StSZixYrtcGxwACX1Fq+wSP8Kby3GvB7cXl+zo8yYjaAKQJM9EWb77X6X3A==", "requires": { "chameleon-bridge": "0.1.0", "child_process": "1.0.2", @@ -28,9 +28,9 @@ "integrity": "sha512-5IFZPamHYErbMYPD/H+RT5GAmxDqDZ0YlkBAbDGIDm82WFEFlpp7MnDclb1ZjJ2/txz3WmUOQQq/ZvOrVqACJg==" }, "chameleon-runtime": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/chameleon-runtime/-/chameleon-runtime-0.1.0.tgz", - "integrity": "sha512-bfAvgQb3cYsNLcYkLDLbkXz88g6Pr8bC8BpAhJyibbSBfMK++GnoZxB9Xq+OYyFHpJ6VP2Jn+f6S6lgFve4brw==", + "version": "0.2.0-alpha.0", + "resolved": "https://registry.npmjs.org/chameleon-runtime/-/chameleon-runtime-0.2.0-alpha.0.tgz", + "integrity": "sha512-4J8kT+9nqFpPuk+GJawKNDXcjpP4nEOvn7Jp8kbxdZi10dBHdovbX/CncSBuoyL3D1LttVq7ICjHlc9avYMuIQ==", "requires": { "mobx": "3.6.1" } @@ -50,9 +50,9 @@ } }, "chameleon-ui-builtin": { - "version": "0.0.7-alpha", - "resolved": "https://registry.npmjs.org/chameleon-ui-builtin/-/chameleon-ui-builtin-0.0.7-alpha.tgz", - "integrity": "sha512-k1FTI1GaGUVBhF3u5vBBZ01mOopi855emBcjkAR123VxOh1ZHh8nxlteDKADT7mTLIinyMsOiSOEO27OcFJbtA==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/chameleon-ui-builtin/-/chameleon-ui-builtin-0.1.2.tgz", + "integrity": "sha512-Oiqss1kq/12mzgJ9TkPtoBjfib91TfNtJ5e6w8vCgiZ2FtPHFSD00zH0nu7cHdTDDwDdwOhoE7ryWWYqVr4oqw==", "requires": { "chameleon-scroll": "0.0.3" } @@ -68,9 +68,9 @@ "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" }, "cml-ui": { - "version": "0.0.7-alpha", - "resolved": "https://registry.npmjs.org/cml-ui/-/cml-ui-0.0.7-alpha.tgz", - "integrity": "sha512-/O2GrK40igiwelIkfUCYuZQ1bzMeBilAaHFPdxfeF+BneJBH7ARgHhZISwTs8j537pnGYf8svDWUg8iFIZX7pA==", + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/cml-ui/-/cml-ui-0.1.3.tgz", + "integrity": "sha512-6XzWbiUwqsoB829gUXCKDS5EjcxCX4cZeBhZnZJrgaDP2ygGjZSp3tnWsgskUa2y78CWuPzMh/1+4TL0gm+nRQ==", "requires": { "classnames": "2.2.6" } diff --git a/packages/chameleon-templates/todo-demo/package.json b/packages/chameleon-templates/todo-demo/package.json index d4ab70c0..5146d945 100644 --- a/packages/chameleon-templates/todo-demo/package.json +++ b/packages/chameleon-templates/todo-demo/package.json @@ -7,11 +7,11 @@ "scripts": {}, "license": "MIT", "dependencies": { - "chameleon-api": "^0.3.0-alpha.4", + "chameleon-api": "^0.4.0-alpha.0", "chameleon-bridge": "^0.1.1-alpha.2", - "chameleon-runtime": "^0.1.0", + "chameleon-runtime": "^0.2.0-alpha.0", "chameleon-store": "0.0.3", - "chameleon-ui-builtin": "0.0.7-alpha", - "cml-ui": "0.0.7-alpha" + "chameleon-ui-builtin": "^0.1.2", + "cml-ui": "^0.1.3" } } diff --git a/packages/webpack-check-plugin/index.js b/packages/webpack-check-plugin/index.js index f8d79c1e..101e9c6d 100644 --- a/packages/webpack-check-plugin/index.js +++ b/packages/webpack-check-plugin/index.js @@ -1,4 +1,5 @@ const check = require('./lib/check.js'); +const chalk = require('chalk'); class WebpackCheckPlugin { constructor(options) { @@ -55,11 +56,11 @@ class WebpackCheckPlugin { if (tokens && tokens.length) { tokens.forEach(token => { - throw new Error(` + throw new Error(chalk.red(` 不能在${type} 项目中使用全局变量【${token.name}】 文件位置: ${module.resource} 具体代码: ${sourceLine[token.loc.line - 1]} - `) + `)) }) } } catch (e) { diff --git a/packages/webpack-check-plugin/package.json b/packages/webpack-check-plugin/package.json index 67f3f70f..8d7ad573 100644 --- a/packages/webpack-check-plugin/package.json +++ b/packages/webpack-check-plugin/package.json @@ -13,6 +13,7 @@ "@babel/parser": "7.1.0", "babel-generator": "6.26.1", "babel-traverse": "6.26.0", + "chalk": "^2.4.2", "lodash.uniq": "4.5.0" }, "devDependencies": { @@ -28,4 +29,4 @@ "license": "Apache", "mail": "ChameleonCore@didiglobal.com", "gitHead": "5ddcde4330774710f7646559446e008f7785ce00" -} \ No newline at end of file +} -- GitLab