From 15960583aa95d8d97ba0f583902c9b18af8eb7d5 Mon Sep 17 00:00:00 2001 From: erik Date: Sun, 16 Apr 2017 23:53:46 +0800 Subject: [PATCH 01/14] Table style --- example/Table.san | 47 +++++++++++++++++++++++++++++----- src/Table/ConfigurableTable.js | 13 ++++------ src/Table/TR.js | 2 +- src/Table/Table.styl | 14 +++++++--- 4 files changed, 58 insertions(+), 18 deletions(-) diff --git a/example/Table.san b/example/Table.san index bbf61ec..cf0ddec 100644 --- a/example/Table.san +++ b/example/Table.san @@ -1,7 +1,6 @@ @@ -127,16 +157,17 @@ export default { fields: [ { title: '名字', - content: 'name' + prop: 'name' }, { title: '城市', - content: 'city' + prop: 'city' }, { title: '生日', + prop: 'birthday', content: function (item) { - return item.birthday + return item.birthday.replace(/-/g, '/'); } } ] @@ -147,6 +178,10 @@ export default { this.data.set('multiTableSelected', selected.join(', ')); }, + multiCTableSelect(selected) { + this.data.set('multiCTableSelected', selected.join(', ')); + }, + singleTableSelect(selected) { this.data.set('singleTableSelected', selected); } diff --git a/src/Table/ConfigurableTable.js b/src/Table/ConfigurableTable.js index 7e51a7e..26885ee 100644 --- a/src/Table/ConfigurableTable.js +++ b/src/Table/ConfigurableTable.js @@ -19,14 +19,11 @@ export default class ConfigurableTable extends Table { static filters = { renderField(field, item) { - let content = field.content; - - switch (typeof content) { - case 'string': - return item[content]; - - case 'function': - return content.call(this, item); + if (typeof field.content === 'function') { + return field.content.call(this, item); + } + else if (field.prop) { + return item[field.prop]; } return ''; diff --git a/src/Table/TR.js b/src/Table/TR.js index ccb9442..c31afc3 100644 --- a/src/Table/TR.js +++ b/src/Table/TR.js @@ -10,7 +10,7 @@ export default class TR extends san.Component { 'ui-th': TH }; - static template = ` + static template = ` diff --git a/src/Table/Table.styl b/src/Table/Table.styl index b408443..0c4dc12 100644 --- a/src/Table/Table.styl +++ b/src/Table/Table.styl @@ -12,7 +12,7 @@ border-bottom: 1px solid $md-colors.faintBlack th - padding: 0 24px + padding: 0 12px text-align: left font-weight: normal font-size: 12px @@ -24,14 +24,22 @@ border-bottom: 1px solid $md-colors.faintBlack td - padding: 0 24px + padding: 0 12px height: 48px text-align: left font-size: 12px white-space: nowrap color: $md-colors.darkBlack + .sm-table-row-selected + background: $md-colors.faintBlack + .sm-table-col-select - width: 50px; + width: 20px; padding: 0 10px + +.sm-table-hoverable + tbody + tr:hover + background: $md-colors.faintBlack From 93c1a0477599ab3c748720c6ad2cf03b32356417 Mon Sep 17 00:00:00 2001 From: menglingjun Date: Mon, 17 Apr 2017 02:07:07 +0800 Subject: [PATCH 02/14] fix nav scroll --- example/App.san | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/example/App.san b/example/App.san index 045d6df..c3dcb94 100644 --- a/example/App.san +++ b/example/App.san @@ -34,10 +34,18 @@ + slot="left"> menu + + + + + +
@@ -162,10 +170,12 @@ export default { color: #fff .example-drawer-content - flex: 1 overflow: auto - -webkit-overflow-scrolling: touch - + position: absolute + top: 64px + right: 0 + bottom: 0 + left: 0 .example-appbar position: fixed From 320a28087c52077feaf6b825bb0a7e4b3e4d2af0 Mon Sep 17 00:00:00 2001 From: menglingjun Date: Mon, 17 Apr 2017 02:07:36 +0800 Subject: [PATCH 03/14] slot left/right --- src/AppBar/AppBar.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/AppBar/AppBar.js b/src/AppBar/AppBar.js index ae6461d..39b3cf7 100644 --- a/src/AppBar/AppBar.js +++ b/src/AppBar/AppBar.js @@ -10,15 +10,13 @@ export default san.defineComponent({ template: `
- - +
{{title}}
- - +
`, @@ -34,9 +32,6 @@ export default san.defineComponent({ return config; }, - test() { - return 'AppBar'; - }, inited() { [ 'showLeftIcon', From 42807870e822038fd55c7a63f26cc749882d3612 Mon Sep 17 00:00:00 2001 From: menglingjun Date: Mon, 17 Apr 2017 02:08:02 +0800 Subject: [PATCH 04/14] custom icon class --- src/Icon/Icon.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Icon/Icon.js b/src/Icon/Icon.js index 5962975..a83d284 100644 --- a/src/Icon/Icon.js +++ b/src/Icon/Icon.js @@ -7,10 +7,15 @@ import san from 'san'; export default san.defineComponent({ template: ` - + `, + filters: { + fontSize(size) { + return size ? `font-size: ${size}px` : ''; + } + }, initData() { return { size: 24 From efdf97eac0cd15b7be9dc019871ed286ee1533e4 Mon Sep 17 00:00:00 2001 From: menglingjun Date: Mon, 17 Apr 2017 02:08:34 +0800 Subject: [PATCH 05/14] adapt button / a --- src/Button/Base.js | 45 ++++++++++++++++++++++++++++++++++++++++ src/Button/Button.js | 6 ++++-- src/Button/Button.styl | 1 + src/Button/IconButton.js | 6 +++--- 4 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 src/Button/Base.js diff --git a/src/Button/Base.js b/src/Button/Base.js new file mode 100644 index 0000000..a14764b --- /dev/null +++ b/src/Button/Base.js @@ -0,0 +1,45 @@ +/** + * @file san-mui/BaseButton + * @author junmer + */ + +import {Component} from 'san'; + +function genProp(element, name) { + element.aNode.props.push({ + name: name, + expr: { + type: 3, + paths: [{ + type: 1, + value: name + }] + }, + raw: `\{\{${name}\}\}` + }); +} + +function adaptAnchor(element) { + + if (element.data.get('href')) { + element.aNode.tagName = 'A'; + element.tagName = 'a'; + genProp(element, 'href'); + } + + if (element.data.get('target')) { + genProp(element, 'target'); + } + +} + +export default class BaseButton extends Component { + + inited() { + + // 兼容 button / a + adaptAnchor(this); + + } + +} diff --git a/src/Button/Button.js b/src/Button/Button.js index 8af06f4..b8f656e 100644 --- a/src/Button/Button.js +++ b/src/Button/Button.js @@ -3,13 +3,13 @@ * @author leon */ -import {Component} from 'san'; +import BaseButton from './Base'; import {create} from '../common/util/cx'; import {TouchRipple} from '../Ripple'; const cx = create('button'); -export default class Button extends Component { +export default class Button extends BaseButton { static components = { 'san-touch-ripple': TouchRipple @@ -30,4 +30,6 @@ export default class Button extends Component { } }; + + } diff --git a/src/Button/Button.styl b/src/Button/Button.styl index bf01612..7ce5145 100644 --- a/src/Button/Button.styl +++ b/src/Button/Button.styl @@ -127,6 +127,7 @@ san-button-swatch($swatches, $revert = false) color: $md-colors.blue500 text-transform: uppercase overflow: hidden + text-decoration: none cursor: pointer user-select: none diff --git a/src/Button/IconButton.js b/src/Button/IconButton.js index 0b13619..2fb37b3 100644 --- a/src/Button/IconButton.js +++ b/src/Button/IconButton.js @@ -3,20 +3,20 @@ * @author leon */ -import {Component} from 'san'; +import BaseButton from './Base'; import {create} from '../common/util/cx'; import Icon from '../Icon'; import {CenterRipple} from '../Ripple'; const cx = create('button'); -export default class IconButton extends Component { +export default class IconButton extends BaseButton { static template = ` `; From a8a94d17a4d95ec3c528c3f131f56031dc636f6f Mon Sep 17 00:00:00 2001 From: menglingjun Date: Mon, 17 Apr 2017 02:29:13 +0800 Subject: [PATCH 06/14] tweak transition --- example/App.san | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/App.san b/example/App.san index c3dcb94..00cec11 100644 --- a/example/App.san +++ b/example/App.san @@ -183,7 +183,7 @@ export default { right: 0 top: 0 width: auto - transition: all .3s cubic-bezier(.23,1,.32,1) + transition: all .3s cubic-bezier(.4, 0, .2, 1) background: $md-colors.blue500 color: #fff z-index: 10 @@ -194,7 +194,7 @@ export default { .example-content padding-top: 64px padding-left: 300px - transition: all .3s cubic-bezier(.23,1,.32,1) + transition: all .3s cubic-bezier(.4, 0, .2, 1) &.hide-menu padding-left: 0 From c6f8ce57b6ee70b20285be9db039533032029f83 Mon Sep 17 00:00:00 2001 From: wuhy Date: Mon, 17 Apr 2017 10:19:59 +0800 Subject: [PATCH 07/14] add engines require info --- gulpfile.babel.js => gulpfile.js | 18 +-- package.json | 204 ++++++++++++++++--------------- src/index.js | 12 -- 3 files changed, 108 insertions(+), 126 deletions(-) rename gulpfile.babel.js => gulpfile.js (61%) delete mode 100644 src/index.js diff --git a/gulpfile.babel.js b/gulpfile.js similarity index 61% rename from gulpfile.babel.js rename to gulpfile.js index 9379579..6c74f29 100644 --- a/gulpfile.babel.js +++ b/gulpfile.js @@ -3,27 +3,17 @@ * @author ielgnaw(wuji0223@gmail.com) */ -import path from 'path'; -import webpack from 'webpack'; -import ExtractTextPlugin from 'extract-text-webpack-plugin'; import gulp from 'gulp'; +import babel from 'gulp-babel'; import clean from 'gulp-clean'; +import babelHelpers from 'gulp-babel-external-helpers'; import sourcemaps from 'gulp-sourcemaps'; -import gulpWebpack from 'gulp-webpack'; -import merge from 'webpack-merge'; -import config from './tool/config'; -import {assetsPath, styleLoaders} from './tool/util'; -import buildWebpackConfig from './tool/webpack.build.conf'; - -const env = config.build.env; - -const EXAMPLE_ROOT = path.resolve(__dirname, './example'); -const SRC_ROOT = path.resolve(__dirname, './src'); gulp.task('babel', () => { return gulp.src('src/**/*.js') - .pipe(gulpWebpack(buildWebpackConfig)) .pipe(sourcemaps.init()) + .pipe(babel()) + .pipe(babelHelpers('babelHelpers.js', 'umd')) .pipe(sourcemaps.write('.')) .pipe(gulp.dest('lib')); }); diff --git a/package.json b/package.json index 46f40fe..e117646 100644 --- a/package.json +++ b/package.json @@ -1,102 +1,106 @@ { - "name": "san-mui", - "version": "0.0.1", - "description": "A Set of SAN Components that Implement Google's Material Design", - "author": "ecomfe", - "main": "./lib/san-mui.js", - "scripts": { - "dev": "NODE_ENV=dev babel-node tool/dev-server.js", - "lint": "fecs src test/**/*.spec.js --type=js", - "test": "cross-env NODE_ENV=test babel-node -- ./node_modules/.bin/karma start test/karma.conf.babel.js", - "test-ci": "cross-env NODE_ENV=test-ci babel-node -- ./node_modules/.bin/karma start test/karma.conf.babel.js", - "coverage": "npm run clean:coverage && cross-env NODE_ENV=test babel-node -- ./node_modules/.bin/karma start test/karma.coverage.conf.babel.js --single-run", - "clean": "rimraf lib", - "clean:coverage": "rimraf test/coverage", - "prepublish": "npm run build", - "build": "npm run clean && gulp build", - "coveralls": "shx cat ./test/coverage/report-html/lcov.info | coveralls" - }, - "dependencies": { - "classnames": "^2.2.5", - "material-design-icons": "~3.0.1", - "moment": "^2.18.1", - "san": "^3.0.3-rc.23" - }, - "devDependencies": { - "autoprefixer": "^6.6.1", - "babel-cli": "^6.22.2", - "babel-core": "^6.22.1", - "babel-istanbul": "^0.12.1", - "babel-loader": "^6.2.10", - "babel-plugin-add-module-exports": "^0.2.1", - "babel-plugin-istanbul": "^3.1.2", - "babel-plugin-transform-es2015-modules-commonjs": "^6.22.0", - "babel-plugin-transform-export-extensions": "^6.22.0", - "babel-plugin-transform-replace-object-assign": "^0.2.1", - "babel-plugin-transform-runtime": "^6.22.0", - "babel-polyfill": "^6.22.0", - "babel-preset-es2015": "^6.22.0", - "babel-preset-stage-1": "^6.22.0", - "body-parser": "^1.16.0", - "chai": "^3.5.0", - "cheerio": "^0.22.0", - "compression-webpack-plugin": "^0.3.2", - "coveralls": "^2.11.15", - "cross-env": "^3.1.4", - "css-loader": "^0.25.0", - "eslint-friendly-formatter": "^2.0.7", - "eventsource-polyfill": "^0.9.6", - "express": "^4.14.0", - "extract-text-webpack-plugin": "^1.0.1", - "file-loader": "^0.9.0", - "gulp": "^3.9.1", - "gulp-clean": "^0.3.2", - "gulp-sourcemaps": "^2.4.0", - "gulp-webpack": "^1.5.0", - "html-loader": "^0.4.4", - "html-webpack-plugin": "^2.26.0", - "http-proxy-middleware": "^0.17.3", - "isparta": "^4.0.0", - "isparta-loader": "^2.0.0", - "karma": "^1.4.0", - "karma-babel-preprocessor": "^6.0.1", - "karma-chai": "^0.1.0", - "karma-coverage": "^1.1.1", - "karma-mocha": "^1.3.0", - "karma-mocha-reporter": "^2.2.2", - "karma-phantomjs-launcher": "^1.0.2", - "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^2.0.1", - "mocha": "^3.2.0", - "nib": "^1.1.2", - "normalize.css": "^6.0.0", - "ora": "^1.1.0", - "phantomjs-prebuilt": "^2.1.14", - "postcss-loader": "^1.3.0", - "rider": "^2.0.0", - "rimraf": "^2.5.4", - "san-loader": "github:ecomfe/san-loader", - "san-router": "^1.0.0", - "shelljs": "^0.7.6", - "shx": "^0.2.2", - "simple-assign": "^0.1.0", - "style-loader": "^0.13.1", - "stylus": "^0.54.5", - "stylus-loader": "^2.4.0", - "url-loader": "^0.5.7", - "webpack": "^1.14.0", - "webpack-dev-middleware": "^1.9.0", - "webpack-hot-middleware": "^2.15.0", - "webpack-merge": "^2.4.0", - "yargs": "^6.6.0" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/ecomfe/san-mui.git" - }, - "license": "MIT", - "bugs": { - "url": "https://github.com/ecomfe/san-mui/issues" - }, - "homepage": "https://github.com/ecomfe/san-mui#readme" + "name": "san-mui", + "version": "0.0.1", + "description": "A Set of SAN Components that Implement Google's Material Design", + "author": "ecomfe", + "main": "./lib/san-mui.js", + "scripts": { + "dev": "NODE_ENV=dev babel-node tool/dev-server.js", + "lint": "fecs src test/**/*.spec.js --type=js", + "test": "cross-env NODE_ENV=test babel-node -- ./node_modules/.bin/karma start test/karma.conf.babel.js", + "test-ci": "cross-env NODE_ENV=test-ci babel-node -- ./node_modules/.bin/karma start test/karma.conf.babel.js", + "coverage": "npm run clean:coverage && cross-env NODE_ENV=test babel-node -- ./node_modules/.bin/karma start test/karma.coverage.conf.babel.js --single-run", + "clean": "rimraf lib", + "clean:coverage": "rimraf test/coverage", + "prepublish": "npm run build", + "build": "npm run clean && gulp build", + "coveralls": "shx cat ./test/coverage/report-html/lcov.info | coveralls" + }, + "dependencies": { + "classnames": "^2.2.5", + "material-design-icons": "~3.0.1", + "moment": "^2.18.1", + "san": "^3.0.3-rc.23" + }, + "devDependencies": { + "autoprefixer": "^6.6.1", + "babel-cli": "^6.22.2", + "babel-core": "^6.22.1", + "babel-istanbul": "^0.12.1", + "babel-loader": "^6.2.10", + "babel-plugin-add-module-exports": "^0.2.1", + "babel-plugin-istanbul": "^3.1.2", + "babel-plugin-transform-es2015-modules-commonjs": "^6.22.0", + "babel-plugin-transform-export-extensions": "^6.22.0", + "babel-plugin-transform-replace-object-assign": "^0.2.1", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-polyfill": "^6.22.0", + "babel-preset-es2015": "^6.22.0", + "babel-preset-stage-1": "^6.22.0", + "body-parser": "^1.16.0", + "chai": "^3.5.0", + "cheerio": "^0.22.0", + "compression-webpack-plugin": "^0.3.2", + "coveralls": "^2.11.15", + "cross-env": "^3.1.4", + "css-loader": "^0.25.0", + "eslint-friendly-formatter": "^2.0.7", + "eventsource-polyfill": "^0.9.6", + "express": "^4.14.0", + "extract-text-webpack-plugin": "^1.0.1", + "file-loader": "^0.9.0", + "gulp": "^3.9.1", + "gulp-clean": "^0.3.2", + "gulp-sourcemaps": "^2.4.0", + "gulp-webpack": "^1.5.0", + "html-loader": "^0.4.4", + "html-webpack-plugin": "^2.26.0", + "http-proxy-middleware": "^0.17.3", + "isparta": "^4.0.0", + "isparta-loader": "^2.0.0", + "karma": "^1.4.0", + "karma-babel-preprocessor": "^6.0.1", + "karma-chai": "^0.1.0", + "karma-coverage": "^1.1.1", + "karma-mocha": "^1.3.0", + "karma-mocha-reporter": "^2.2.2", + "karma-phantomjs-launcher": "^1.0.2", + "karma-sourcemap-loader": "^0.3.7", + "karma-webpack": "^2.0.1", + "mocha": "^3.2.0", + "nib": "^1.1.2", + "normalize.css": "^6.0.0", + "ora": "^1.1.0", + "phantomjs-prebuilt": "^2.1.14", + "postcss-loader": "^1.3.0", + "rider": "^2.0.0", + "rimraf": "^2.5.4", + "san-loader": "github:ecomfe/san-loader", + "san-router": "^1.0.0", + "shelljs": "^0.7.6", + "shx": "^0.2.2", + "simple-assign": "^0.1.0", + "style-loader": "^0.13.1", + "stylus": "^0.54.5", + "stylus-loader": "^2.4.0", + "url-loader": "^0.5.7", + "webpack": "^1.14.0", + "webpack-dev-middleware": "^1.9.0", + "webpack-hot-middleware": "^2.15.0", + "webpack-merge": "^2.4.0", + "yargs": "^6.6.0" + }, + "engines": { + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/ecomfe/san-mui.git" + }, + "license": "MIT", + "bugs": { + "url": "https://github.com/ecomfe/san-mui/issues" + }, + "homepage": "https://github.com/ecomfe/san-mui#readme" } diff --git a/src/index.js b/src/index.js deleted file mode 100644 index 6c8fdea..0000000 --- a/src/index.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * @file export components - * @author ielgnaw(wuji0223@gmail.com) - */ - -// import NotRecommended from './NotRecommended'; -// import Recommended from './Recommended'; - -// export default { -// NotRecommended, -// Recommended -// }; From c611d313e9be84e370c7e2292362a0730b1f5c37 Mon Sep 17 00:00:00 2001 From: wuhy Date: Mon, 17 Apr 2017 11:35:31 +0800 Subject: [PATCH 08/14] up babel conf --- .babelrc | 14 ++++++++------ src/index.js | 12 ++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 src/index.js diff --git a/.babelrc b/.babelrc index 3f0a530..7881fd9 100644 --- a/.babelrc +++ b/.babelrc @@ -1,10 +1,7 @@ { "presets": ["es2015", "stage-1"], "plugins": [ - ["transform-replace-object-assign", "simple-assign"], - "add-module-exports", - "transform-runtime", - "transform-export-extensions" + ["transform-replace-object-assign", "simple-assign"] ], "env": { "test": { @@ -16,9 +13,14 @@ }] ] }, - "release": { + "production": { + "presets": [ + ["es2015", {"modules": "umd"}], + "stage-1" + ], "plugins": [ - "transform-runtime" + "external-helpers", + "external-helpers-insert-require" ] } }, diff --git a/src/index.js b/src/index.js new file mode 100644 index 0000000..6c8fdea --- /dev/null +++ b/src/index.js @@ -0,0 +1,12 @@ +/** + * @file export components + * @author ielgnaw(wuji0223@gmail.com) + */ + +// import NotRecommended from './NotRecommended'; +// import Recommended from './Recommended'; + +// export default { +// NotRecommended, +// Recommended +// }; From eae4586d7c72759cae1cba4892e41d0659289fe2 Mon Sep 17 00:00:00 2001 From: wuhy Date: Mon, 17 Apr 2017 11:36:08 +0800 Subject: [PATCH 09/14] up gulp build --- gulpfile.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 6c74f29..f645d53 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,11 +3,11 @@ * @author ielgnaw(wuji0223@gmail.com) */ -import gulp from 'gulp'; -import babel from 'gulp-babel'; -import clean from 'gulp-clean'; -import babelHelpers from 'gulp-babel-external-helpers'; -import sourcemaps from 'gulp-sourcemaps'; +const gulp = require('gulp'); +const babel = require('gulp-babel'); +const clean = require('gulp-clean'); +const babelHelpers = require('gulp-babel-external-helpers'); +const sourcemaps = require('gulp-sourcemaps'); gulp.task('babel', () => { return gulp.src('src/**/*.js') From 241a7adde075dd814270939d625a45ce69b9e07e Mon Sep 17 00:00:00 2001 From: wuhy Date: Mon, 17 Apr 2017 11:36:27 +0800 Subject: [PATCH 10/14] up dep --- package.json | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index e117646..5a71eca 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "ecomfe", "main": "./lib/san-mui.js", "scripts": { - "dev": "NODE_ENV=dev babel-node tool/dev-server.js", + "dev": "cross-env NODE_ENV=dev babel-node tool/dev-server.js", "lint": "fecs src test/**/*.spec.js --type=js", "test": "cross-env NODE_ENV=test babel-node -- ./node_modules/.bin/karma start test/karma.conf.babel.js", "test-ci": "cross-env NODE_ENV=test-ci babel-node -- ./node_modules/.bin/karma start test/karma.conf.babel.js", @@ -13,7 +13,7 @@ "clean": "rimraf lib", "clean:coverage": "rimraf test/coverage", "prepublish": "npm run build", - "build": "npm run clean && gulp build", + "build": "npm run clean && NODE_ENV=production gulp build", "coveralls": "shx cat ./test/coverage/report-html/lcov.info | coveralls" }, "dependencies": { @@ -25,13 +25,10 @@ "devDependencies": { "autoprefixer": "^6.6.1", "babel-cli": "^6.22.2", - "babel-core": "^6.22.1", - "babel-istanbul": "^0.12.1", "babel-loader": "^6.2.10", - "babel-plugin-add-module-exports": "^0.2.1", + "babel-plugin-external-helpers": "^6.22.0", + "babel-plugin-external-helpers-insert-require": "^1.0.2", "babel-plugin-istanbul": "^3.1.2", - "babel-plugin-transform-es2015-modules-commonjs": "^6.22.0", - "babel-plugin-transform-export-extensions": "^6.22.0", "babel-plugin-transform-replace-object-assign": "^0.2.1", "babel-plugin-transform-runtime": "^6.22.0", "babel-polyfill": "^6.22.0", @@ -50,14 +47,13 @@ "extract-text-webpack-plugin": "^1.0.1", "file-loader": "^0.9.0", "gulp": "^3.9.1", + "gulp-babel": "^6.1.2", + "gulp-babel-external-helpers": "^2.0.2", "gulp-clean": "^0.3.2", "gulp-sourcemaps": "^2.4.0", - "gulp-webpack": "^1.5.0", "html-loader": "^0.4.4", "html-webpack-plugin": "^2.26.0", "http-proxy-middleware": "^0.17.3", - "isparta": "^4.0.0", - "isparta-loader": "^2.0.0", "karma": "^1.4.0", "karma-babel-preprocessor": "^6.0.1", "karma-chai": "^0.1.0", @@ -68,16 +64,13 @@ "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^2.0.1", "mocha": "^3.2.0", - "nib": "^1.1.2", "normalize.css": "^6.0.0", - "ora": "^1.1.0", "phantomjs-prebuilt": "^2.1.14", "postcss-loader": "^1.3.0", "rider": "^2.0.0", "rimraf": "^2.5.4", "san-loader": "github:ecomfe/san-loader", "san-router": "^1.0.0", - "shelljs": "^0.7.6", "shx": "^0.2.2", "simple-assign": "^0.1.0", "style-loader": "^0.13.1", @@ -87,12 +80,10 @@ "webpack": "^1.14.0", "webpack-dev-middleware": "^1.9.0", "webpack-hot-middleware": "^2.15.0", - "webpack-merge": "^2.4.0", - "yargs": "^6.6.0" + "webpack-merge": "^2.4.0" }, "engines": { - "node": ">= 4.0.0", - "npm": ">= 3.0.0" + "node": ">= 4.0.0" }, "repository": { "type": "git", From 64e55fbe4de3ffbb945dc80c667fa3fcf28eec85 Mon Sep 17 00:00:00 2001 From: wuhy Date: Mon, 17 Apr 2017 11:48:00 +0800 Subject: [PATCH 11/14] up babel conf --- .babelrc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.babelrc b/.babelrc index 7881fd9..9a8e544 100644 --- a/.babelrc +++ b/.babelrc @@ -1,9 +1,8 @@ { - "presets": ["es2015", "stage-1"], - "plugins": [ - ["transform-replace-object-assign", "simple-assign"] - ], "env": { + "dev": { + "presets": ["es2015", "stage-1"] + }, "test": { "plugins": [ ["istanbul", { From 822e9b54afcc4cc00ce7f2e9294f2196e5b1fc64 Mon Sep 17 00:00:00 2001 From: wuhy Date: Mon, 17 Apr 2017 11:48:54 +0800 Subject: [PATCH 12/14] remove unnecessary deps --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 5a71eca..1ec6d8c 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "babel-plugin-external-helpers": "^6.22.0", "babel-plugin-external-helpers-insert-require": "^1.0.2", "babel-plugin-istanbul": "^3.1.2", - "babel-plugin-transform-replace-object-assign": "^0.2.1", "babel-plugin-transform-runtime": "^6.22.0", "babel-polyfill": "^6.22.0", "babel-preset-es2015": "^6.22.0", @@ -72,7 +71,6 @@ "san-loader": "github:ecomfe/san-loader", "san-router": "^1.0.0", "shx": "^0.2.2", - "simple-assign": "^0.1.0", "style-loader": "^0.13.1", "stylus": "^0.54.5", "stylus-loader": "^2.4.0", From 6169d4d5fae08f3e5581a426de97915f5f44585a Mon Sep 17 00:00:00 2001 From: wuhy Date: Mon, 17 Apr 2017 11:49:33 +0800 Subject: [PATCH 13/14] remove babel-loader query param --- tool/webpack.base.conf.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/tool/webpack.base.conf.js b/tool/webpack.base.conf.js index 7adf096..542c13d 100644 --- a/tool/webpack.base.conf.js +++ b/tool/webpack.base.conf.js @@ -56,16 +56,7 @@ export default { SRC_ROOT, path.resolve(__dirname) // for dev-client.js es6 syntax ], - exclude: /node_modules/, - query: { - presets: ['es2015', 'stage-1'], - plugins: [ - ['transform-runtime', { - polyfill: false, - regenerator: false - }] - ] - } + exclude: /node_modules/ }, { test: /\.json$/, From 8e572e54d930a59038737046424a4a173aa0455c Mon Sep 17 00:00:00 2001 From: wuhy Date: Mon, 17 Apr 2017 11:53:53 +0800 Subject: [PATCH 14/14] add test env preset --- .babelrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.babelrc b/.babelrc index 9a8e544..f58e8e8 100644 --- a/.babelrc +++ b/.babelrc @@ -4,6 +4,7 @@ "presets": ["es2015", "stage-1"] }, "test": { + "presets": ["es2015", "stage-1"], "plugins": [ ["istanbul", { "exclude": [