# HG changeset patch
# User Alexandre Segura <mex.zktk@gmail.com>
# Date 1487848017 -3600
# Node ID e435cad79dfe15a0ed93b9e821632124a4fd93b7
# Parent  f07ea33693774bcfdf5b43ab9ac979d7650d875e
Move JS conf files back to iconolab-bundle folder.

diff -r f07ea3369377 -r e435cad79dfe .babelrc
--- a/.babelrc	Thu Feb 23 11:55:36 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-{
-  "presets": ["es2015"],
-}
diff -r f07ea3369377 -r e435cad79dfe .eslintignore
--- a/.eslintignore	Thu Feb 23 11:55:36 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-build/*.js
-config/*.js
diff -r f07ea3369377 -r e435cad79dfe .eslintrc.js
--- a/.eslintrc.js	Thu Feb 23 11:55:36 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    sourceType: 'module'
-  },
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'standard',
-  // required to lint *.vue files
-  plugins: [
-    'html'
-  ],
-  // add your custom rules here
-  'rules': {
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // no-multiple-empty-lines
-    'no-multiple-empty-lines': 0,
-    'semi': 1,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-
-  }
-}
diff -r f07ea3369377 -r e435cad79dfe package.json
--- a/package.json	Thu Feb 23 11:55:36 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-{
-  "name": "iconolab-bundle",
-  "description": "iconolab js bundle",
-  "author": "hbaptiste",
-  "private": true,
-  "scripts": {
-    "start": "webpack --progress --colors --watch",
-    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
-    "watch": "webpack-dev-server",
-    "standalone": "webpack-dev-server --content-base src_js/iconolab-bundle/"
-  },
-  "dependencies": {
-    "bootstrap": "^3.3.6",
-    "bootstrap-sass": "^3.3.7",
-    "diff": "^3.0.0",
-    "event-emitter": "^0.3.4",
-    "expose-loader": "^0.7.1",
-    "font-awesome": "^4.6.3",
-    "import": "0.0.6",
-    "imports-loader": "^0.6.5",
-    "jquery": "^3.0.0",
-    "jsdiff": "^1.1.1",
-    "jsondiffpatch": "^0.1.43",
-    "loader": "^2.1.1",
-    "node-sass": "^4.5.0",
-    "resolve-url-loader": "^1.6.1",
-    "sass-loader": "^4.1.1",
-    "snapsvg": "^0.4.0",
-    "url-loader": "^0.5.7",
-    "vue": "^2.0.0-alpha.8",
-    "vue-loader": "^9.1.1",
-    "vue-resource": "^0.9.1",
-    "vue-typeahead": "^2.1.0"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-es2015-shorthand-properties": "^6.8.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-es2015-mod": "^6.6.0",
-    "cross-env": "^1.0.6",
-    "css-loader": "^0.23.1",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "minimalist": "^1.0.0",
-    "ncp": "^2.0.0",
-    "postcss-loader": "^1.2.2",
-    "rimraf": "^2.5.4",
-    "style-loader": "^0.13.1",
-    "vue-loader": "^9.0.0",
-    "webpack": "^1.12.2",
-    "webpack-dev-server": "^1.12.0"
-  }
-}
diff -r f07ea3369377 -r e435cad79dfe postcss.config.js
--- a/postcss.config.js	Thu Feb 23 11:55:36 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-module.exports = {
-  plugins: [
-    require('autoprefixer')({ /* ...options */ })
-  ]
-}
diff -r f07ea3369377 -r e435cad79dfe src_js/iconolab-bundle/.babelrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src_js/iconolab-bundle/.babelrc	Thu Feb 23 12:06:57 2017 +0100
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"],
+}
diff -r f07ea3369377 -r e435cad79dfe src_js/iconolab-bundle/.eslintignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src_js/iconolab-bundle/.eslintignore	Thu Feb 23 12:06:57 2017 +0100
@@ -0,0 +1,2 @@
+build/*.js
+config/*.js
diff -r f07ea3369377 -r e435cad79dfe src_js/iconolab-bundle/.eslintrc.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src_js/iconolab-bundle/.eslintrc.js	Thu Feb 23 12:06:57 2017 +0100
@@ -0,0 +1,23 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    sourceType: 'module'
+  },
+  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+  extends: 'standard',
+  // required to lint *.vue files
+  plugins: [
+    'html'
+  ],
+  // add your custom rules here
+  'rules': {
+    // allow paren-less arrow functions
+    'arrow-parens': 0,
+    // no-multiple-empty-lines
+    'no-multiple-empty-lines': 0,
+    'semi': 1,
+    // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+
+  }
+}
diff -r f07ea3369377 -r e435cad79dfe src_js/iconolab-bundle/package.json
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src_js/iconolab-bundle/package.json	Thu Feb 23 12:06:57 2017 +0100
@@ -0,0 +1,54 @@
+{
+  "name": "iconolab-bundle",
+  "description": "iconolab js bundle",
+  "author": "hbaptiste",
+  "private": true,
+  "scripts": {
+    "start": "webpack --progress --colors --watch",
+    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
+    "watch": "webpack-dev-server",
+    "standalone": "webpack-dev-server --content-base src_js/iconolab-bundle/"
+  },
+  "dependencies": {
+    "bootstrap": "^3.3.6",
+    "bootstrap-sass": "^3.3.7",
+    "diff": "^3.0.0",
+    "event-emitter": "^0.3.4",
+    "expose-loader": "^0.7.1",
+    "font-awesome": "^4.6.3",
+    "import": "0.0.6",
+    "imports-loader": "^0.6.5",
+    "jquery": "^3.0.0",
+    "jsdiff": "^1.1.1",
+    "jsondiffpatch": "^0.1.43",
+    "loader": "^2.1.1",
+    "node-sass": "^4.5.0",
+    "resolve-url-loader": "^1.6.1",
+    "sass-loader": "^4.1.1",
+    "snapsvg": "^0.4.0",
+    "url-loader": "^0.5.7",
+    "vue": "^2.0.0-alpha.8",
+    "vue-loader": "^9.1.1",
+    "vue-resource": "^0.9.1",
+    "vue-typeahead": "^2.1.0"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-es2015-shorthand-properties": "^6.8.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-es2015-mod": "^6.6.0",
+    "cross-env": "^1.0.6",
+    "css-loader": "^0.23.1",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "minimalist": "^1.0.0",
+    "ncp": "^2.0.0",
+    "postcss-loader": "^1.2.2",
+    "rimraf": "^2.5.4",
+    "style-loader": "^0.13.1",
+    "vue-loader": "^9.0.0",
+    "webpack": "^1.12.2",
+    "webpack-dev-server": "^1.12.0"
+  }
+}
diff -r f07ea3369377 -r e435cad79dfe src_js/iconolab-bundle/postcss.config.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src_js/iconolab-bundle/postcss.config.js	Thu Feb 23 12:06:57 2017 +0100
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: [
+    require('autoprefixer')({ /* ...options */ })
+  ]
+}
diff -r f07ea3369377 -r e435cad79dfe src_js/iconolab-bundle/webpack.config.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src_js/iconolab-bundle/webpack.config.js	Thu Feb 23 12:06:57 2017 +0100
@@ -0,0 +1,111 @@
+var path = require('path')
+var webpack = require('webpack')
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+var projectRoot = path.resolve(__dirname)
+
+module.exports = {
+  entry: {
+    vendor: [
+      'jquery',
+      'bootstrap',
+    ],
+    iconolab: [
+      './src/main.js',
+      './src/main.scss',
+    ]
+  },
+  output: {
+    path: __dirname + '/../../src/iconolab/static',
+    publicPath: '/static/',
+    filename: 'iconolab/js/[name].js'
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        test: /\.css$/,
+        loader: ExtractTextPlugin.extract("style-loader", "css-loader?modules&localIdentName=[local]"),
+        include: [
+          __dirname + '/src',
+          /node_modules/
+        ]
+      },
+      {
+        test: /\.scss$/,
+        loader: ExtractTextPlugin.extract("style-loader", "css-loader?modules&importLoaders=1&localIdentName=[local]!resolve-url-loader!postcss-loader!sass-loader"),
+        include: [
+          __dirname + '/src',
+          /node_modules/
+        ]
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        include: [
+          path.join(projectRoot, 'src')
+        ],
+        query: {
+          presets: ['es2015']
+        },
+        "plugins": ["transform-es2015-shorthand-properties"]
+      },
+      {
+        test: /\.(png|jpg|gif|svg)$/,
+        loader: 'file',
+        query: {
+          name: '[name].[ext]?[hash]'
+        }
+      },
+      {
+        test: /\.(ttf|eot|svg|woff|woff2)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        loader: 'file-loader?name=iconolab/fonts/[name].[ext]'
+      },
+      {
+        test: require.resolve('snapsvg'),
+        loader: 'imports-loader?this=>window,fix=>module.exports=0'
+      },
+    ]
+  },
+  plugins: [
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor'
+    }),
+    new ExtractTextPlugin("iconolab/css/[name].css"),
+    new webpack.ProvidePlugin({
+      $: "jquery",
+      jQuery: "jquery"
+    })
+  ],
+  devServer: {
+    port: 8001,
+    contentBase: __dirname + '/../../src/iconolab',
+    publicPath: '/static/',
+    stats: 'minimal',
+    compress: true,
+    headers: { 'Access-Control-Allow-Origin': '*' },
+    historyApiFallback: true,
+  },
+  devtool: '#source-map'
+}
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports.devtool = '#source-map'
+  // http://vue-loader.vuejs.org/en/workflow/production.html
+  module.exports.plugins = (module.exports.plugins || []).concat([
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    new webpack.optimize.OccurenceOrderPlugin()
+  ])
+}
diff -r f07ea3369377 -r e435cad79dfe webpack.config.js
--- a/webpack.config.js	Thu Feb 23 11:55:36 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-var path = require('path')
-var webpack = require('webpack')
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
-var projectRoot = path.resolve(__dirname, 'src_js/iconolab-bundle')
-
-module.exports = {
-  entry: {
-    vendor: [
-      'jquery',
-      'bootstrap',
-    ],
-    iconolab: [
-      './src_js/iconolab-bundle/src/main.js',
-      './src_js/iconolab-bundle/src/main.scss',
-    ]
-  },
-  output: {
-    path: __dirname + '/src/iconolab/static',
-    publicPath: '/static/',
-    filename: 'iconolab/js/[name].js'
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        test: /\.css$/,
-        loader: ExtractTextPlugin.extract("style-loader", "css-loader?modules&localIdentName=[local]"),
-        include: [
-          __dirname + '/src_js/iconolab-bundle/src',
-          /node_modules/
-        ]
-      },
-      {
-        test: /\.scss$/,
-        loader: ExtractTextPlugin.extract("style-loader", "css-loader?modules&importLoaders=1&localIdentName=[local]!resolve-url-loader!postcss-loader!sass-loader"),
-        include: [
-          __dirname + '/src_js/iconolab-bundle/src',
-          /node_modules/
-        ]
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-        include: [
-          path.join(projectRoot, 'src')
-        ],
-        query: {
-          presets: ['es2015']
-        },
-        "plugins": ["transform-es2015-shorthand-properties"]
-      },
-      {
-        test: /\.(png|jpg|gif|svg)$/,
-        loader: 'file',
-        query: {
-          name: '[name].[ext]?[hash]'
-        }
-      },
-      {
-        test: /\.(ttf|eot|svg|woff|woff2)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: 'file-loader?name=iconolab/fonts/[name].[ext]'
-      },
-      {
-        test: require.resolve('snapsvg'),
-        loader: 'imports-loader?this=>window,fix=>module.exports=0'
-      },
-    ]
-  },
-  plugins: [
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'vendor'
-    }),
-    new ExtractTextPlugin("iconolab/css/[name].css"),
-    new webpack.ProvidePlugin({
-      $: "jquery",
-      jQuery: "jquery"
-    })
-  ],
-  devServer: {
-    port: 8001,
-    contentBase: __dirname + '/src/iconolab',
-    publicPath: '/static/',
-    stats: 'minimal',
-    compress: true,
-    headers: { 'Access-Control-Allow-Origin': '*' },
-    historyApiFallback: true,
-  },
-  devtool: '#source-map'
-}
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports.devtool = '#source-map'
-  // http://vue-loader.vuejs.org/en/workflow/production.html
-  module.exports.plugins = (module.exports.plugins || []).concat([
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: '"production"'
-      }
-    }),
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
-      }
-    }),
-    new webpack.optimize.OccurenceOrderPlugin()
-  ])
-}