update to v1.1

Author: zhoou

.babelrc

@@ -1,5 +1,18 @@
 {
-  "presets": ["es2015", "stage-2"],
+  "presets": [
+    ["env", {
+      "modules": false,
+      "targets": {
+        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+      }
+    }],
+    "stage-2"
+  ],
   "plugins": ["transform-runtime"],
-  "comments": false
+  "env": {
+    "test": {
+      "presets": ["env", "stage-2"],
+      "plugins": ["istanbul"]
+    }
+  }
 }

.eslintignore

@@ -1 +1,3 @@
-**/libs/*.js
+build/*.js
+config/*.js
+src/assets/js/**/*.js

.eslintrc.js

@@ -1,9 +1,14 @@
+// http://eslint.org/docs/user-guide/configuring
+
 module.exports = {
   root: true,
   parser: 'babel-eslint',
   parserOptions: {
     sourceType: 'module'
   },
+  env: {
+    browser: true,
+  },
   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
   extends: 'standard',
   // required to lint *.vue files

.gitignore

@@ -1,7 +1,16 @@
 .DS_Store
 node_modules/
 dist/
-npm-debug.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 test/unit/coverage
 test/e2e/reports
 selenium-debug.log
+
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

.postcssrc.js

@@ -0,0 +1,8 @@
+// https://github.com/michael-ciniawsky/postcss-load-config
+
+module.exports = {
+  "plugins": {
+    // to edit target browsers: use "browserslist" field in package.json
+    "autoprefixer": {}
+  }
+}

README.md

@@ -10,7 +10,6 @@
 * [Alert 组件](/src/components/Common/vAlert.vue)
 * [Modal 组件](/src/components/Common/vModal.vue)
 * [Table 组件](/src/components/Common/vTable.vue)
-* [easyTable 组件](/src/components/Common/vEasyTable.vue)
 * [Carousel 组件](/src/components/Common/vCarousel.vue)
 * [Loading 组件](/src/components/Common/vLoading.vue)
 * [Login 组件](/src/components/Common/vLogin.vue)
@@ -25,10 +24,10 @@
 ###The initial access path：
 <ul>
 <li>OfficialDemo： http://localhost:9091/officialdemo.html</li>
-<li>TableHome： http://localhost:9091/tablehome.html</li>
-<li>PopupsHome： http://localhost:9091/popupshome.html</li>
-<li>CarouselHome： http://localhost:9091/carouselhome.html</li>
-<li>FormLogin： http://localhost:9091/formlogin.html</li>
+<li>TableDemo： http://localhost:9091/tabledemo.html</li>
+<li>PopupsDemo： http://localhost:9091/popupsdemo.html</li>
+<li>CarouselDemo： http://localhost:9091/carouseldemo.html</li>
+<li>FormLoginDemo： http://localhost:9091/formlogindemo.html</li>
 </ul>
 
 you can click the nav '案例：Examples' and choice 'TableHome' to jump to another project 'tablehome.html'.
@@ -128,7 +127,7 @@ for (var pathname in pages) {
   module.exports.plugins.push(new HtmlWebpackPlugin(conf));
 }
 </code></pre>
-
+ 
 #### webpack.prod.conf.js 配置：
  <pre><code>
  function getEntry(globPath) {
@@ -164,6 +163,6 @@ for (var pathname in pages) {
   webpackConfig.plugins.push(new HtmlWebpackPlugin(conf));
 }
 </code></pre>
-
-
+ 
+ 
 Welcome guidance ！！

build/build.js

@@ -1,36 +1,35 @@
-// https://github.com/shelljs/shelljs
 require('./check-versions')()
-require('shelljs/global')
-env.NODE_ENV = 'production'
 
-var path = require('path')
-var config = require('../config')
+process.env.NODE_ENV = 'production'
+
 var ora = require('ora')
+var rm = require('rimraf')
+var path = require('path')
+var chalk = require('chalk')
 var webpack = require('webpack')
+var config = require('../config')
 var webpackConfig = require('./webpack.prod.conf')
 
-console.log(
-  '  Tip:\n' +
-  '  Built files are meant to be served over an HTTP server.\n' +
-  '  Opening index.html over file:// won\'t work.\n'
-)
-
 var spinner = ora('building for production...')
 spinner.start()
 
-var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
-rm('-rf', assetsPath)
-mkdir('-p', assetsPath)
-cp('-R', 'static/*', assetsPath)
-
-webpack(webpackConfig, function (err, stats) {
-  spinner.stop()
+rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
   if (err) throw err
-  process.stdout.write(stats.toString({
-    colors: true,
-    modules: false,
-    children: false,
-    chunks: false,
-    chunkModules: false
-  }) + '\n')
+  webpack(webpackConfig, function (err, stats) {
+    spinner.stop()
+    if (err) throw err
+    process.stdout.write(stats.toString({
+      colors: true,
+      modules: false,
+      children: false,
+      chunks: false,
+      chunkModules: false
+    }) + '\n\n')
+
+    console.log(chalk.cyan('  Build complete.\n'))
+    console.log(chalk.yellow(
+      '  Tip: built files are meant to be served over an HTTP server.\n' +
+      '  Opening index.html over file:// won\'t work.\n'
+    ))
+  })
 })

build/check-versions.js

@@ -1,9 +1,9 @@
-var semver = require('semver')
 var chalk = require('chalk')
+var semver = require('semver')
 var packageConfig = require('../package.json')
-var exec = function (cmd) {
-  return require('child_process')
-    .execSync(cmd).toString().trim()
+var shell = require('shelljs')
+function exec (cmd) {
+  return require('child_process').execSync(cmd).toString().trim()
 }
 
 var versionRequirements = [
@@ -12,12 +12,15 @@ var versionRequirements = [
     currentVersion: semver.clean(process.version),
     versionRequirement: packageConfig.engines.node
   },
-  {
+]
+
+if (shell.which('npm')) {
+  versionRequirements.push({
     name: 'npm',
     currentVersion: exec('npm --version'),
     versionRequirement: packageConfig.engines.npm
-  }
-]
+  })
+}
 
 module.exports = function () {
   var warnings = []

build/dev-server.js

@@ -1,48 +1,54 @@
 require('./check-versions')()
+
 var config = require('../config')
-if (!process.env.NODE_ENV) process.env.NODE_ENV = config.dev.env
+if (!process.env.NODE_ENV) {
+    process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
+}
+
+var opn = require('opn')
 var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
-var opn = require('opn')
 var proxyMiddleware = require('http-proxy-middleware')
-var webpackConfig = process.env.NODE_ENV === 'testing'
-  ? require('./webpack.prod.conf')
-  : require('./webpack.dev.conf')
+var webpackConfig = process.env.NODE_ENV === 'testing' ?
+    require('./webpack.prod.conf') :
+    require('./webpack.dev.conf')
 
 // default port where dev server listens for incoming traffic
 var port = process.env.PORT || config.dev.port
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
+    // automatically open browser, if not set will be false
+var autoOpenBrowser = !!config.dev.autoOpenBrowser
+    // Define HTTP proxies to your custom API backend
+    // https://github.com/chimurai/http-proxy-middleware
 var proxyTable = config.dev.proxyTable
 
 var app = express()
 var compiler = webpack(webpackConfig)
 
 var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: webpackConfig.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
+    publicPath: webpackConfig.output.publicPath,
+    quiet: true
 })
 
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
+var hotMiddleware = require('webpack-hot-middleware')(compiler, {
+        log: false,
+        heartbeat: 2000
+    })
+    // force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function(compilation) {
+    compilation.plugin('html-webpack-plugin-after-emit', function(data, cb) {
+        hotMiddleware.publish({ action: 'reload' })
+        cb()
+    })
 })
 
 // proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
+Object.keys(proxyTable).forEach(function(context) {
+    var options = proxyTable[context]
+    if (typeof options === 'string') {
+        options = { target: options }
+    }
+    app.use(proxyMiddleware(options.filter || context, options))
 })
 
 // handle fallback for HTML5 history API
@@ -59,16 +65,28 @@ app.use(hotMiddleware)
 var staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
 app.use(staticPath, express.static('./static'))
 
-module.exports = app.listen(port, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  // var uri = 'http://localhost:' + port + '/officialdemo/app.html';
-  // console.log('Listening at ' + uri + '\n')
-  //
-  // // when env is testing, don't need open it
-  // if (process.env.NODE_ENV !== 'testing') {
-  //   opn(uri)
-  // }
+var uri = 'http://localhost:' + port + '/officialdemo.html'
+
+var _resolve
+var readyPromise = new Promise(resolve => {
+    _resolve = resolve
 })
+
+console.log('> Starting dev server...')
+devMiddleware.waitUntilValid(() => {
+    console.log('> Listening at ' + uri + '\n')
+        // when env is testing, don't need open it
+    if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
+        opn(uri)
+    }
+    _resolve()
+})
+
+var server = app.listen(port)
+
+module.exports = {
+    ready: readyPromise,
+    close: () => {
+        server.close()
+    }
+}