system-clients 3.2.79 → 3.2.80

package/build/utils.js

@@ -1,71 +1,71 @@
-var path = require('path')
-var config = require('../config')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
-
-exports.assetsPath = function (_path) {
-  var assetsSubDirectory = process.env.NODE_ENV === 'production'
-    ? config.build.assetsSubDirectory
-    : config.dev.assetsSubDirectory
-  return path.posix.join(assetsSubDirectory, _path)
-}
-
-exports.cssLoaders = function (options) {
-  options = options || {}
-
-  var cssLoader = {
-    loader: 'css-loader',
-    options: {
-      minimize: process.env.NODE_ENV === 'production',
-      sourceMap: options.sourceMap
-    }
-  }
-
-  // generate loader string to be used with extract text plugin
-  function generateLoaders (loader, loaderOptions) {
-    var loaders = [cssLoader]
-    if (loader) {
-      loaders.push({
-        loader: loader + '-loader',
-        options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap
-        })
-      })
-    }
-
-    // Extract CSS when that option is specified
-    // (which is the case during production build)
-    if (options.extract) {
-      return ExtractTextPlugin.extract({
-        use: loaders,
-        fallback: 'vue-style-loader'
-      })
-    } else {
-      return ['vue-style-loader'].concat(loaders)
-    }
-  }
-
-  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
-  return {
-    css: generateLoaders(),
-    postcss: generateLoaders(),
-    less: generateLoaders('less'),
-    sass: generateLoaders('sass', { indentedSyntax: true }),
-    scss: generateLoaders('sass'),
-    stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
-  }
-}
-
-// Generate loaders for standalone style files (outside of .vue)
-exports.styleLoaders = function (options) {
-  var output = []
-  var loaders = exports.cssLoaders(options)
-  for (var extension in loaders) {
-    var loader = loaders[extension]
-    output.push({
-      test: new RegExp('\\.' + extension + '$'),
-      use: loader
-    })
-  }
-  return output
-}
+var path = require('path')
+var config = require('../config')
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
+
+exports.assetsPath = function (_path) {
+  var assetsSubDirectory = process.env.NODE_ENV === 'production'
+    ? config.build.assetsSubDirectory
+    : config.dev.assetsSubDirectory
+  return path.posix.join(assetsSubDirectory, _path)
+}
+
+exports.cssLoaders = function (options) {
+  options = options || {}
+
+  var cssLoader = {
+    loader: 'css-loader',
+    options: {
+      minimize: process.env.NODE_ENV === 'production',
+      sourceMap: options.sourceMap
+    }
+  }
+
+  // generate loader string to be used with extract text plugin
+  function generateLoaders (loader, loaderOptions) {
+    var loaders = [cssLoader]
+    if (loader) {
+      loaders.push({
+        loader: loader + '-loader',
+        options: Object.assign({}, loaderOptions, {
+          sourceMap: options.sourceMap
+        })
+      })
+    }
+
+    // Extract CSS when that option is specified
+    // (which is the case during production build)
+    if (options.extract) {
+      return ExtractTextPlugin.extract({
+        use: loaders,
+        fallback: 'vue-style-loader'
+      })
+    } else {
+      return ['vue-style-loader'].concat(loaders)
+    }
+  }
+
+  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
+  return {
+    css: generateLoaders(),
+    postcss: generateLoaders(),
+    less: generateLoaders('less'),
+    sass: generateLoaders('sass', { indentedSyntax: true }),
+    scss: generateLoaders('sass'),
+    stylus: generateLoaders('stylus'),
+    styl: generateLoaders('stylus')
+  }
+}
+
+// Generate loaders for standalone style files (outside of .vue)
+exports.styleLoaders = function (options) {
+  var output = []
+  var loaders = exports.cssLoaders(options)
+  for (var extension in loaders) {
+    var loader = loaders[extension]
+    output.push({
+      test: new RegExp('\\.' + extension + '$'),
+      use: loader
+    })
+  }
+  return output
+}

package/build/webpack.base.conf.js

@@ -1,85 +1,85 @@
-var path = require('path')
-var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
-
-module.exports = {
-  entry: {
-    app: './src/main.js'
-  },
-  output: {
-    path: path.resolve(__dirname, '../dist/mergeUser'),
-    publicPath: 'mergeUser/',
-    filename: '[name].js'
-  },
-  resolve: {
-    extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
-    alias: {
-      'src': path.resolve(__dirname, '../src'),
-      'test': path.resolve(__dirname, '../test')
-    }
-  },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel',
-        include: [
-          /src/,
-          /build/,
-          /examples/,
-          /test/,
-          /node_modules\/vue-client\/src/,
-          /node_modules\/vue-strap\/src/,
-          /node_modules\/system-clients\/src/,
-          /node_modules\/ldap-clients\/src/,
-          /node_modules\/address-client\/src/
-        ],
-        options: {
-          presets: ['es2015']
-        }
-      },
-      {
-        test: /\.json$/,
-        loader: 'json'
-      },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
-      {
-        test: /\.less$/,
-        loader: 'style!css!less'
-      },
-      {
-        test: /\.css$/,
-        loader: 'style!css'
-      },
-      {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
-        loader: 'url',
-        query: {
-          limit: 10000,
-          name: '[name].[ext]?[hash:7]'
-        }
-      }
-    ]
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: false,
-      extract: false
-    })
-  },
-  plugins: [],
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  }
-}
+var path = require('path')
+var cssLoaders = require('./css-loaders')
+var projectRoot = path.resolve(__dirname, '../')
+
+module.exports = {
+  entry: {
+    app: './src/main.js'
+  },
+  output: {
+    path: path.resolve(__dirname, '../dist/mergeUser'),
+    publicPath: 'mergeUser/',
+    filename: '[name].js'
+  },
+  resolve: {
+    extensions: ['', '.js', '.vue'],
+    fallback: [path.join(__dirname, '../node_modules')],
+    alias: {
+      'src': path.resolve(__dirname, '../src'),
+      'test': path.resolve(__dirname, '../test')
+    }
+  },
+  resolveLoader: {
+    fallback: [path.join(__dirname, '../node_modules')]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        include: [
+          /src/,
+          /build/,
+          /examples/,
+          /test/,
+          /node_modules\/vue-client\/src/,
+          /node_modules\/vue-strap\/src/,
+          /node_modules\/system-clients\/src/,
+          /node_modules\/ldap-clients\/src/,
+          /node_modules\/address-client\/src/
+        ],
+        options: {
+          presets: ['es2015']
+        }
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
+      {
+        test: /\.html$/,
+        loader: 'vue-html'
+      },
+      {
+        test: /\.less$/,
+        loader: 'style!css!less'
+      },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
+      {
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        loader: 'url',
+        query: {
+          limit: 10000,
+          name: '[name].[ext]?[hash:7]'
+        }
+      }
+    ]
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: false,
+      extract: false
+    })
+  },
+  plugins: [],
+  eslint: {
+    formatter: require('eslint-friendly-formatter')
+  }
+}

package/build/webpack.dev.conf.js

@@ -1,31 +1,31 @@
-var webpack = require('webpack')
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.base.conf')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
-
-// add hot-reload related code to entry chunks
-Object.keys(baseConfig.entry).forEach(function (name) {
-  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
-})
-
-module.exports = merge(baseConfig, {
-  // eval-source-map is faster for development
-  devtool: '#eval-source-map',
-  output: {
-    // necessary for the html plugin to work properly
-    // when serving the html from in-memory
-    publicPath: '/'
-  },
-  plugins: [
-    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
-    new webpack.optimize.OccurenceOrderPlugin(),
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin(),
-    // https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: 'index.html',
-      template: 'index.html',
-      inject: true
-    })
-  ]
-})
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// add hot-reload related code to entry chunks
+Object.keys(baseConfig.entry).forEach(function (name) {
+  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
+})
+
+module.exports = merge(baseConfig, {
+  // eval-source-map is faster for development
+  devtool: '#eval-source-map',
+  output: {
+    // necessary for the html plugin to work properly
+    // when serving the html from in-memory
+    publicPath: '/'
+  },
+  plugins: [
+    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: 'index.html',
+      inject: true
+    })
+  ]
+})

package/build/webpack.example.conf.js

@@ -1,49 +1,49 @@
-var fs = require('fs')
-var webpack = require('webpack')
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.base.conf')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
-
-// add hot-reload related code to entry chunks
-Object.keys(baseConfig.entry).forEach(function (name) {
-  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
-})
-
-// 把examples下所有index.html转换成测试例子.html
-fs.readdirSync('./examples').forEach((file) => {
-  baseConfig.plugins.push(
-    // https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: file + '.html',
-      template: `examples/${file}/index.html`,
-      inject: false
-    })
-  )
-})
-
-// 把examples下子目录里的main.js打包成对应组件名的App.js
-fs.readdirSync('./examples').forEach((file) => {
-  baseConfig.entry[file + 'App'] = `./examples/${file}/main.js`
-})
-
-module.exports = merge(baseConfig, {
-  // eval-source-map is faster for development
-  devtool: '#eval-source-map',
-  output: {
-    // necessary for the html plugin to work properly
-    // when serving the html from in-memory
-    publicPath: '/'
-  },
-  plugins: [
-    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
-    new webpack.optimize.OccurenceOrderPlugin(),
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin(),
-    // https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: 'index.html',
-      template: 'index.html',
-      inject: true
-    })
-  ]
-})
+var fs = require('fs')
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// add hot-reload related code to entry chunks
+Object.keys(baseConfig.entry).forEach(function (name) {
+  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
+})
+
+// 把examples下所有index.html转换成测试例子.html
+fs.readdirSync('./examples').forEach((file) => {
+  baseConfig.plugins.push(
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: file + '.html',
+      template: `examples/${file}/index.html`,
+      inject: false
+    })
+  )
+})
+
+// 把examples下子目录里的main.js打包成对应组件名的App.js
+fs.readdirSync('./examples').forEach((file) => {
+  baseConfig.entry[file + 'App'] = `./examples/${file}/main.js`
+})
+
+module.exports = merge(baseConfig, {
+  // eval-source-map is faster for development
+  devtool: '#eval-source-map',
+  output: {
+    // necessary for the html plugin to work properly
+    // when serving the html from in-memory
+    publicPath: '/'
+  },
+  plugins: [
+    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: 'index.html',
+      inject: true
+    })
+  ]
+})

package/build/webpack.prod.conf.js

@@ -1,60 +1,60 @@
-var webpack = require('webpack')
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.base.conf')
-var cssLoaders = require('./css-loaders')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
-
-// whether to generate source map for production files.
-// disabling this can speed up the build.
-var SOURCE_MAP = true
-
-module.exports = merge(baseConfig, {
-  stats: {
-    children: false
-  },
-  devtool: SOURCE_MAP ? '#source-map' : false,
-  output: {
-    // naming output files with hashes for better caching.
-    // dist/index.html will be auto-generated with correct URLs.
-    filename: '[name][chunkhash].js',
-    chunkFilename: '[id].[chunkhash].js'
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: SOURCE_MAP,
-      extract: true
-    })
-  },
-  plugins: [
-    // http://vuejs.github.io/vue-loader/workflow/production.html
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: '"production"'
-      }
-    }),
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
-      }
-    }),
-    new webpack.optimize.OccurenceOrderPlugin(),
-    // extract css into its own file
-    new ExtractTextPlugin('[name].css'),
-    // generate dist index.html with correct asset hash for caching.
-    // you can customize output by editing /index.html
-    // see https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: '../index.html',
-      template: 'index.html',
-      inject: true,
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeAttributeQuotes: true
-        // more options:
-        // https://github.com/kangax/html-minifier#options-quick-reference
-      }
-    })
-  ]
-})
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var cssLoaders = require('./css-loaders')
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// whether to generate source map for production files.
+// disabling this can speed up the build.
+var SOURCE_MAP = true
+
+module.exports = merge(baseConfig, {
+  stats: {
+    children: false
+  },
+  devtool: SOURCE_MAP ? '#source-map' : false,
+  output: {
+    // naming output files with hashes for better caching.
+    // dist/index.html will be auto-generated with correct URLs.
+    filename: '[name][chunkhash].js',
+    chunkFilename: '[id].[chunkhash].js'
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: SOURCE_MAP,
+      extract: true
+    })
+  },
+  plugins: [
+    // http://vuejs.github.io/vue-loader/workflow/production.html
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    new webpack.optimize.OccurenceOrderPlugin(),
+    // extract css into its own file
+    new ExtractTextPlugin('[name].css'),
+    // generate dist index.html with correct asset hash for caching.
+    // you can customize output by editing /index.html
+    // see https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: '../index.html',
+      template: 'index.html',
+      inject: true,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true
+        // more options:
+        // https://github.com/kangax/html-minifier#options-quick-reference
+      }
+    })
+  ]
+})

package/build/webpack.test.conf.js

@@ -1,31 +1,31 @@
-// This is the webpack config used for unit tests.
-
-var utils = require('./utils')
-var webpack = require('webpack')
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.base.conf')
-
-var webpackConfig = merge(baseConfig, {
-  module: {
-    rules: utils.styleLoaders()
-  },
-  // use inline sourcemap for karma-sourcemap-loader
-  devtool: '#inline-source-map',
-  resolveLoader: {
-    alias: {
-      // necessary to to make lang="scss" work in test when using vue-loader's ?inject option
-      // see discussion at https://github.com/vuejs/vue-loader/issues/724
-      'scss-loader': 'sass-loader'
-    }
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': require('../config/test.env')
-    })
-  ]
-})
-
-// no need for app entry during tests
-delete webpackConfig.entry
-
-module.exports = webpackConfig
+// This is the webpack config used for unit tests.
+
+var utils = require('./utils')
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+
+var webpackConfig = merge(baseConfig, {
+  module: {
+    rules: utils.styleLoaders()
+  },
+  // use inline sourcemap for karma-sourcemap-loader
+  devtool: '#inline-source-map',
+  resolveLoader: {
+    alias: {
+      // necessary to to make lang="scss" work in test when using vue-loader's ?inject option
+      // see discussion at https://github.com/vuejs/vue-loader/issues/724
+      'scss-loader': 'sass-loader'
+    }
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': require('../config/test.env')
+    })
+  ]
+})
+
+// no need for app entry during tests
+delete webpackConfig.entry
+
+module.exports = webpackConfig

package/build.gradle

@@ -1,6 +1,6 @@
-version = '3.0.49'
-
-task release(type:Exec) {
-	workingDir '.'
-	commandLine 'cmd', '/c', 'release.bat ' + version
-}
+version = '3.0.49'
+
+task release(type:Exec) {
+	workingDir '.'
+	commandLine 'cmd', '/c', 'release.bat ' + version
+}