Merge branch 'master' into fix/issue-110-update-mapbox-style-spec

config/wdio.conf.js

@@ -0,0 +1,47 @@
+var webpack          = require("webpack");
+var WebpackDevServer = require("webpack-dev-server");
+var webpackConfig    = require("./webpack.config");
+var testConfig       = require("../test/config/specs");
+
+
+var server;
+
+exports.config = {
+  specs: [
+    './test/specs/**/*.js'
+  ],
+  exclude: [
+  ],
+  maxInstances: 10,
+  capabilities: [{
+    maxInstances: 5,
+    browserName: 'firefox'
+  }],
+  sync: true,
+  logLevel: 'silent',
+  coloredLogs: true,
+  bail: 0,
+  screenshotPath: './errorShots/',
+  baseUrl: 'http://localhost',
+  waitforTimeout: 10000,
+  connectionRetryTimeout: 90000,
+  connectionRetryCount: 3,
+  services: ['phantomjs'],
+  framework: 'mocha',
+  reporters: ['spec'],
+  mochaOpts: {
+    ui: 'bdd',
+    // Because we don't know how long the initial build will take...
+    timeout: 2*60*1000
+  },
+  onPrepare: function (config, capabilities) {
+    var compiler = webpack(webpackConfig);
+    server = new WebpackDevServer(compiler, {
+      stats: "minimal"
+    });
+    server.listen(testConfig.port);
+  },
+  onComplete: function(exitCode) {
+    server.close();
+  }
+}

config/webpack.config.js

@@ -0,0 +1,54 @@
+"use strict";
+var webpack = require('webpack');
+var path = require('path');
+var loaders = require('./webpack.loaders');
+var HtmlWebpackPlugin = require('html-webpack-plugin');
+
+const HOST = process.env.HOST || "127.0.0.1";
+const PORT = process.env.PORT || "8888";
+
+module.exports = {
+  target: 'web',
+  entry: [
+    `webpack-dev-server/client?http://${HOST}:${PORT}`,
+    `webpack/hot/only-dev-server`,
+    `./src/index.jsx` // Your appʼs entry point
+  ],
+  devtool: process.env.WEBPACK_DEVTOOL || 'cheap-module-source-map',
+  output: {
+    path: path.join(__dirname, 'public'),
+    filename: 'bundle.js'
+  },
+  resolve: {
+    extensions: ['', '.js', '.jsx']
+  },
+  module: {
+    loaders
+  },
+  node: {
+    fs: "empty",
+    net: 'empty',
+    tls: 'empty'
+  },
+  devServer: {
+    contentBase: "./public",
+    // do not print bundle build stats
+    noInfo: true,
+    // enable HMR
+    hot: true,
+    // embed the webpack-dev-server runtime into the bundle
+    inline: true,
+    // serve index.html in place of 404 responses to allow HTML5 history
+    historyApiFallback: true,
+    port: PORT,
+    host: HOST
+  },
+  plugins: [
+    new webpack.NoErrorsPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new HtmlWebpackPlugin({
+      title: 'Maputnik',
+      template: './src/template.html'
+    }),
+  ]
+};

config/webpack.loaders.js

@@ -0,0 +1,43 @@
+module.exports = [
+  {
+    test: /\.jsx?$/,
+    exclude: /(node_modules|bower_components|public)/,
+    loaders: ['react-hot-loader/webpack']
+  },
+  {
+    test: /\.jsx?$/,
+    exclude: /(node_modules|bower_components|public)/,
+    loader: 'babel',
+    query: {
+      presets: ['es2015', 'react'],
+      plugins: ['transform-runtime', 'transform-decorators-legacy', 'transform-class-properties'],
+    }
+  },
+  {
+    test: /\.(eot|ttf|woff|woff2)$/,
+    loader: 'file?name=fonts/[name].[ext]'
+  },
+  {
+    test: /\.ico$/,
+    loader: 'file?name=[name].[ext]'
+  },
+  {
+    test: /\.(svg|gif|jpg|png)$/,
+    loader: 'file?name=img/[name].[ext]'
+  },
+  {
+    test: /\.json$/,
+    loader: 'json-loader'
+  },
+  {
+    test: /[\/\\](node_modules|global|src)[\/\\].*\.scss$/,
+    loaders: ["style-loader", "css-loader", "sass-loader"]
+  },
+  {
+    test: /[\/\\](node_modules|global|src)[\/\\].*\.css$/,
+    loaders: [
+      'style?sourceMap',
+      'css'
+    ]
+  }
+];

config/webpack.production.config.js

@@ -0,0 +1,73 @@
+
+var webpack = require('webpack');
+var path = require('path');
+var loaders = require('./webpack.loaders');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var HtmlWebpackPlugin = require('html-webpack-plugin');
+var WebpackCleanupPlugin = require('webpack-cleanup-plugin');
+
+module.exports = {
+  entry: {
+    app: './src/index.jsx',
+    vendor: [
+        'file-saver',
+        'mapbox-gl/dist/mapbox-gl.js',
+        "lodash.clonedeep",
+        "lodash.throttle",
+        'color',
+        'react',
+        "react-dom",
+        "react-color",
+        "react-file-reader-input",
+        "react-collapse",
+        "react-height",
+        "react-icon-base",
+        "react-motion",
+        "react-sortable-hoc",
+        "request",
+        //TODO: Icons raise multi vendor errors?
+        //"react-icons",
+    ]
+  },
+  output: {
+    path: path.join(__dirname, 'public'),
+    filename: '[name].[chunkhash].js',
+    chunkFilename: '[chunkhash].js'
+  },
+  resolve: {
+    extensions: ['', '.js', '.jsx']
+  },
+  module: {
+    loaders
+  },
+  node: {
+    fs: "empty",
+    net: 'empty',
+    tls: 'empty'
+  },
+  plugins: [
+    new webpack.NoErrorsPlugin(),
+    new webpack.optimize.CommonsChunkPlugin('vendor', '[chunkhash].vendor.js'),
+    new WebpackCleanupPlugin(),
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false,
+        screw_ie8: true,
+      }
+    }),
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new ExtractTextPlugin('[contenthash].css', {
+      allChunks: true
+    }),
+    new HtmlWebpackPlugin({
+      template: './src/template.html',
+      title: 'Maputnik'
+    }),
+    new webpack.optimize.DedupePlugin()
+  ]
+};