Rebuild

paritytech · Aug 3, 2017 · 3454d7d · 3454d7d
1 parent 801cea2
commit 3454d7d
Show file tree

Hide file tree

Showing 21 changed files with 60 additions and 40 deletions.
diff --git a/dist.css b/dist.css
diff --git a/dist.css.map b/dist.css.map
diff --git a/dist.js b/dist.js
diff --git a/dist.js.map b/dist.js.map
diff --git a/dist/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.85b8ec3ad2.woff2 b/dist/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.85b8ec3ad2.woff2
diff --git a/dist/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.9b68886401.woff2 b/dist/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.9b68886401.woff2
diff --git a/dist/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.af34a57573.woff2 b/dist/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.af34a57573.woff2
diff --git a/dist/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.16a9467557.woff2 b/dist/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.16a9467557.woff2
diff --git a/dist/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.890137f2a9.woff2 b/dist/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.890137f2a9.woff2
diff --git a/dist/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.62f2f972e0.woff2 b/dist/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.62f2f972e0.woff2
diff --git a/dist/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.c9e9d851eb.woff2 b/dist/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.c9e9d851eb.woff2
diff --git a/dist/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.3c4e397d8b.woff2 b/dist/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.3c4e397d8b.woff2
diff --git a/dist/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.200142f539.woff2 b/dist/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.200142f539.woff2
diff --git a/dist/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.bd43bb45b2.woff2 b/dist/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.bd43bb45b2.woff2
diff --git a/dist/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.63cba37360.woff2 b/dist/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.63cba37360.woff2
diff --git a/dist/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.efb845429d.woff2 b/dist/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.efb845429d.woff2
diff --git a/dist/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.bcb5918360.woff2 b/dist/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.bcb5918360.woff2
diff --git a/dist/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.89028d2d23.woff2 b/dist/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.89028d2d23.woff2
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/index.html b/index.html
@@ -22,11 +22,11 @@
         color: #999;
       }
     </style>
-  </head>
+  <link href="dist/../dist.css" rel="stylesheet"></head>
   <body>
     <div id="container">
       <div class="loading">Loading</div>
     </div>
     <script src="/parity-utils/inject.js"></script>
-  <script type="text/javascript" src="dist/bundle.js"></script></body>
+  <script type="text/javascript" src="dist/../dist.js"></script></body>
 </html>
diff --git a/webpack.config.js b/webpack.config.js
@@ -15,23 +15,23 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 const path = require('path');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const HappyPack = require('happypack');
 const webpack = require('webpack');
 
 const isProd = process.env.NODE_ENV === 'production';
 
 module.exports = {
-  devtool: isProd
-    ? '#hidden-source-map'
-    : '#source-map',
+  devtool: '#source-map',
   context: path.join(__dirname, 'src'),
   entry: {
-    bundle: './index.js'
+    dist: './index.js'
   },
   output: {
     path: path.join(__dirname, 'dist'),
-    filename: '[name].js'
+    publicPath: 'dist/',
+    filename: '../dist.js'
   },
 
   module: {
@@ -71,45 +71,56 @@ module.exports = {
       {
         test: /\.css$/,
         include: /semantic-ui-css/,
-        use: ['style-loader', 'css-loader']
+        use: ExtractTextPlugin.extract({
+          fallback: 'style-loader',
+          use: [
+            {
+              loader: 'css-loader',
+              options: {
+                minimize: true
+              }
+            }
+          ]
+        })
       },
       {
         test: /\.css$/,
         exclude: /semantic-ui-css/,
-        use: [
-          'style-loader',
-          {
-            loader: 'css-loader',
-            options: {
-              importLoaders: 1,
-              localIdentName: '[name]_[local]_[hash:base64:10]',
-              minimize: true,
-              modules: true
+        use: ExtractTextPlugin.extract({
+          fallback: 'style-loader',
+          use: [
+            {
+              loader: 'css-loader',
+              options: {
+                importLoaders: 1,
+                localIdentName: '[name]_[local]_[hash:base64:10]',
+                minimize: true,
+                modules: true
+              }
+            },
+            {
+              loader: 'postcss-loader',
+              options: {
+                plugins: (loader) => [
+                  require('postcss-import'),
+                  require('postcss-nested'),
+                  require('postcss-simple-vars')
+                ]
+              }
             }
-        },
-        {
-        loader: 'postcss-loader',
-        options: {
-          plugins: (loader) => [
-            require('postcss-import'),
-            require('postcss-nested'),
-            require('postcss-simple-vars')
           ]
-     }
-        }
-      ]
-    },
-      {
-        test: /\.(png|jpg)$/,
-        use: ['base64-inline-loader']
-      },
-      {
-        test: /\.(woff|woff2|ttf|eot|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        use: ['base64-inline-loader']
+        })
       },
       {
-        test: /\.svg$/,
-        use: ['svg-inline-loader']
+        test: /\.(png|jpg|svg|woff|woff2|ttf|eot|otf)(\?.*)?$/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: '[name].[hash:10].[ext]',
+            outputPath: '',
+            useRelativePath: false
+          }
+        }
       }
     ],
     noParse: [
@@ -128,6 +139,9 @@ module.exports = {
     fs: 'empty'
   },
   plugins: [
+    new ExtractTextPlugin({
+      filename: '../dist.css'
+    }),
     new HappyPack({
       id: 'babel',
       threads: 4,
@@ -136,10 +150,11 @@ module.exports = {
     new HtmlWebpackPlugin({
       filename: '../index.html',
       template: './index.ejs',
-      chunks: ['bundle']
+      chunks: ['dist']
     }),
     isProd && new webpack.optimize.UglifyJsPlugin({
       screwIe8: true,
+      sourceMap: true,
       compress: {
         warnings: false
       },