update from GitLab

Author: JounQin

.babelrc

@@ -1,6 +1,6 @@
 {
   "presets": [
-    "es2015",
+    "env",
     "stage-0"
   ],
   "plugins": [

.flowconfig

@@ -0,0 +1,15 @@
+[ignore]
+.*/node_modules/.*
+.*/test/.*
+.*/build/.*
+.*/dist/.*
+.*/coverage/.*
+
+[include]
+.*/src/.*
+
+[libs]
+src/flow
+
+[options]
+unsafe.enable_getters_and_setters=true

build/bin/compile.js

@@ -9,6 +9,7 @@ require('webpack')(require('../webpack')).run((err, stats) => {
   const jsonStats = stats.toJson()
 
   debug('Webpack compile completed.')
+
   console.log(stats.toString({
     modules: false,
     children: false,
@@ -22,7 +23,7 @@ require('webpack')(require('../webpack')).run((err, stats) => {
     process.exit(1)
   } else if (jsonStats.errors.length > 0) {
     debug('Webpack compiler encountered errors.')
-    console.log(jsonStats.errors)
+    console.error(jsonStats.errors)
     process.exit(1)
   } else if (jsonStats.warnings.length > 0) {
     debug('Webpack compiler encountered warnings.')

build/webpack/utils.js

@@ -4,7 +4,7 @@ import {argv} from 'yargs'
 
 import config, {globals} from '../config'
 
-const {__DEV__, __TEST__, __PROD__} = globals
+const {__TEST__, __PROD__} = globals
 
 const sourceMap = !!config.compiler_devtool
 const browsers = config.compiler_browsers
@@ -16,45 +16,44 @@ export const generateLoaders = (loader, loaders, options = {}) => {
     return loader + (sourceMap && index ? hyphen + 'sourceMap' : '')
   }).join('!')
 
+  if (options.style === false) return sourceLoaders
+
   const styleLoader = `${options.vue ? 'vue-' : ''}style-loader`
 
-  let extract = options.extract
+  const extract = options.extract
   return extract ? (extract.extract ? extract : ExtractTextPlugin).extract({
-    fallbackLoader: styleLoader,
-    loader: sourceLoaders
+    fallback: styleLoader,
+    use: sourceLoaders
   }) : [styleLoader, sourceLoaders].join('!')
 }
 
-const minimize = (__TEST__ || __PROD__) && {
-  autoprefixer: {
-    add: true,
-    remove: true,
-    browsers
-  },
-  discardComments: {
-    removeAll: true
-  },
-  safe: true,
-  sourcemap: sourceMap
-}
-
 const cssOptions = {
-  minimize,
-  sourceMap,
-  ...minimize
+  minimize: (__TEST__ || __PROD__) && {
+    autoprefixer: {
+      add: true,
+      remove: true,
+      browsers
+    },
+    discardComments: {
+      removeAll: true
+    },
+    safe: true,
+    sourcemap: sourceMap
+  },
+  sourceMap
 }
 
 export const baseLoaders = ['css-loader?' + JSON.stringify(cssOptions)]
-export const localIdentName = __DEV__ ? '[name]__[local]___[hash:base64:5]' : '[hash:base64]'
+const localIdentName = __PROD__ ? '[hash:base64]' : '[name]__[local]___[hash:base64:5]'
 
-const cssModuleOptions = {
+export const cssModuleOptions = Object.assign({}, cssOptions, {
   modules: true,
   camelCase: true,
   importLoaders: 2,
   localIdentName
-}
+})
 
-export const cssModuleLoaders = ['css-loader?' + JSON.stringify(Object.assign({}, cssOptions, cssModuleOptions))]
+export const cssModuleLoaders = ['css-loader?' + JSON.stringify(cssModuleOptions)]
 
 const loaderMap = {
   css: '',
@@ -71,46 +70,45 @@ export const nodeModules = /\bnode_modules\b/
 
 const normalizeExclude = (exclude = []) => Array.isArray(exclude) ? exclude : [exclude]
 
-export default {
-  commonCssLoaders(options = {}) {
-    options.vue = false
+export const commonCssLoaders = (options = {}) => {
+  options.vue = false
 
-    const exclude = normalizeExclude(options.exclude)
-    const loader = []
+  const exclude = normalizeExclude(options.exclude)
+  const loader = []
 
-    for (const [key, value] of Object.entries(loaderMap)) {
-      if (exclude.includes(key)) continue
+  for (const [key, value] of Object.entries(loaderMap)) {
+    if (exclude.includes(key)) continue
 
-      const regExp = new RegExp(`\\.${key}$`)
+    const regExp = new RegExp(`\\.${key}$`)
 
-      loader.push({
-        test: regExp,
-        loader: generateLoaders(value, baseLoaders, options),
-        include: nodeModules
-      }, {
-        test: regExp,
-        loader: generateLoaders(value, cssModuleLoaders, options),
-        exclude: nodeModules
-      })
-    }
-
-    debug && _debug(`${debugPrefix}commonCssLoaders`)(loader)
+    loader.push({
+      test: regExp,
+      loader: generateLoaders(value, baseLoaders, options),
+      include: nodeModules
+    }, {
+      test: regExp,
+      loader: generateLoaders(value, cssModuleLoaders, options),
+      exclude: nodeModules
+    })
+  }
 
-    return loader
-  },
-  vueCssLoaders(options = {}) {
-    options.vue = true
+  debug && _debug(`${debugPrefix}commonCssLoaders`)(loader)
 
-    const exclude = normalizeExclude(options.exclude)
-    const loader = {}
+  return loader
+}
 
-    for (const [key, value] of Object.entries(loaderMap)) {
-      if (exclude.includes(key)) continue
-      loader[key] = generateLoaders(value, baseLoaders, options)
-    }
+export const vueCssLoaders = (options = {}) => {
+  options.vue = true
 
-    debug && _debug(`${debugPrefix}vueCssLoaders`)(loader)
+  const exclude = normalizeExclude(options.exclude)
+  const loader = {}
 
-    return loader
+  for (const [key, value] of Object.entries(loaderMap)) {
+    if (exclude.includes(key)) continue
+    loader[key] = generateLoaders(value, baseLoaders, options)
   }
+
+  debug && _debug(`${debugPrefix}vueCssLoaders`)(loader)
+
+  return loader
 }

packages/v-lazy/listener.js

@@ -1,6 +1,6 @@
 import {loadImageAsync} from './util'
 
-let imageCache = {}
+const imageCache = {}
 
 export default class ReactiveListener {
   constructor({el, src, error, loading, bindType, $parent, options, elRenderer}) {

packages/v-lazy/util.js

@@ -65,7 +65,7 @@ export function supportWebp() {
   const d = document
 
   try {
-    let el = d.createElement('object')
+    const el = d.createElement('object')
     el.type = 'image/webp'
     el.innerHTML = '!'
     d.body.appendChild(el)
@@ -79,7 +79,7 @@ export function supportWebp() {
 }
 
 export const loadImageAsync = (item, resolve, reject) => {
-  let image = new Image()
+  const image = new Image()
   image.src = item.src
 
   image.onload = function () {

packages/v-validator/index.js

@@ -54,7 +54,7 @@ export default (Vue, options = {}) => {
 
       validator.rules || (validator = {rules: validator})
 
-      let rules = validator.rules
+      const rules = validator.rules
       const auto = validator.auto
 
       if (!isObjectLike(rules)) return warn('rules of validator should be an object')

packages/v-validator/validators.js

@@ -20,12 +20,12 @@ export const mobile = flag => function (val, model) {
   return !!flag === MOBILE_REGEX.test(this[model])
 }
 
-export const integer = len => function (val, model) {
+export const integer = (len, transform = true) => function (val, model) {
   const flag = !!len
   let valid = true
   if (isNumber(len)) valid = length(len).call(this, val, model)
-  val = this[model].toString().replace(/[^\d]/g, '')
-  val = val === '' ? '' : +val
+  val = (this[model] || '').toString().replace(/[^\d]/g, '')
+  val = val === '' ? '' : transform ? +val : val
   return valid && flag === /\d+/.test(this[model] = val)
 }
 

server/dev.js

@@ -0,0 +1,6 @@
+module.exports = {
+  rules: {
+    'no-console': 2,
+    'vue/jsx-uses-vars': 2
+  }
+}

src/.eslintrc.js

@@ -20,7 +20,7 @@ const buildComponent = (comps, notFirst) => {
   if (!comps.length) return nonMsg('components')
 
   let wrapTemp = ''
-  let wrapComp = {}
+  const wrapComp = {}
   let count = 0
 
   // eslint-disable-next-line no-use-before-define
@@ -31,7 +31,7 @@ const buildComponent = (comps, notFirst) => {
     const component = wrapComp[name] = {template}
 
     if (isObject(methods)) {
-      let wrapMethods = {}
+      const wrapMethods = {}
       for (const [methodName, method] of Object.entries(methods)) {
         wrapMethods[methodName] = isFunction(method) ? method
           : Function[isArray(method) ? 'apply' : 'call'](null, method)

src/assets/activity/default-bg.jpg

@@ -0,0 +1,21 @@
+import classes from './card.styl'
+
+import {CARD} from 'flow/card'
+
+export default require('./card.pug')({
+  props: {
+    card: {
+      type: Object,
+      require: true,
+      validator: (card: CARD) => true
+    },
+    selected: true,
+    selectable: true,
+    unavailable: true
+  },
+  data() {
+    return {
+      classes
+    }
+  }
+})