system-clients 3.2.5 → 3.2.6-1

package/.eslintrc.js

@@ -1,16 +1,16 @@
-module.exports = {
-  root: true,
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'standard',
-  // required to lint *.vue files
-  plugins: [
-    'eslint-plugin-html'
-  ],
-  // add your custom rules here
-  'rules': {
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
-}
+// module.exports = {
+//   root: true,
+//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+//   extends: 'standard',
+//   // required to lint *.vue files
+//   plugins: [
+//     'eslint-plugin-html'
+//   ],
+//   // add your custom rules here
+//   'rules': {
+//     // allow paren-less arrow functions
+//     'arrow-parens': 0,
+//     // allow debugger during development
+//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+//   }
+// }

package/.npmignore

@@ -0,0 +1,10 @@
+src/bootstrap
+.idea/
+.DS_Store
+node_modules/
+dist/static/*.map
+npm-debug.log
+selenium-debug.log
+test/unit/coverage
+test/e2e/reports
+yarn.lock

package/SystemClient.iml

@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.6.18" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

package/build/.npmignore

@@ -0,0 +1 @@
+/dev-server.js

package/build/webpack.base.conf.js

@@ -7,16 +7,16 @@ module.exports = {
     app: './src/main.js'
   },
   output: {
-    path: path.resolve(__dirname, '../dist/static'),
-    publicPath: 'static/',
+    path: path.resolve(__dirname, '../dist/mergeUser'),
+    publicPath: 'mergeUser/',
     filename: '[name].js'
   },
   resolve: {
     extensions: ['', '.js', '.vue'],
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
-      'test': path.resolve(__dirname, '../test'),
-      'src': path.resolve(__dirname, '../src')
+      'src': path.resolve(__dirname, '../src'),
+      'test': path.resolve(__dirname, '../test')
     }
   },
   resolveLoader: {
@@ -32,13 +32,19 @@ module.exports = {
         test: /\.js$/,
         loader: 'babel',
         include: [
-          `${projectRoot}\\src`,
-          `${projectRoot}\\build`,
-          `${projectRoot}\\examples`,
-          `${projectRoot}\\test`,
-          `${projectRoot}\\node_modules\\vue-client\\src`,
-          `${projectRoot}\\node_modules\\vue-strap\\src`
-        ]
+          /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$/,
@@ -52,6 +58,10 @@ module.exports = {
         test: /\.less$/,
         loader: 'style!css!less'
       },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
       {
         test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
         loader: 'url',