Skip to content

Commit ae932ef

Browse files
jerknosejerknose
committed
Make build files consistent between types.
1 parent 04cb9fc commit ae932ef

File tree

3 files changed

+137
-146
lines changed

3 files changed

+137
-146
lines changed

‎webpack-gh-pages.config.js

Lines changed: 66 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -5,84 +5,80 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
55
const config = require('./server/config');
66

77
module.exports = {
8-
mode: "production",
9-
context: resolve(__dirname, 'src'),
10-
entry: [
11-
'./index.jsx',
12-
// the entry point of our app
13-
],
14-
output: {
15-
filename: 'bundle.js',
16-
// the output bundle
8+
mode: 'production',
9+
context: resolve(__dirname, 'src'),
10+
entry: [
11+
'./index.jsx',
12+
// the entry point of our app
13+
],
14+
output: {
15+
filename: 'bundle.js',
16+
// the output bundle
1717

18-
path: resolve(__dirname, 'docs/'),
19-
20-
// publicPath: resolve(__dirname, 'docs/')
21-
// necessary for HMR to know where to load the hot update chunks
22-
},
23-
module: {
24-
rules: [
25-
26-
{
27-
test: /\.(js|jsx)$/,
28-
exclude: /(node_modules|bower_components)/,
29-
use: {
30-
loader: 'babel-loader',
31-
options: {
32-
presets: ['env']
33-
}
34-
}
35-
},
36-
{
37-
test: /\.(woff|woff2|ttf|eot)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/,
38-
loader: 'file-loader?name=fonts/[name].[ext]&limit=10000',
39-
},
40-
{
41-
test: /\.css$/,
42-
loader: 'style-loader'
43-
}, {
44-
test: /\.css$/,
45-
loader: 'css-loader'
46-
},
47-
{
48-
test: /\.(jpe?g|gif|svg)$/i,
49-
use: [
50-
'url-loader?name=images/[name].[ext]&limit=10000',
51-
'img-loader?name=images/[name].[ext]'
52-
]
53-
},
54-
{
55-
test: /\.(png)$/i,
56-
use: [
57-
'base64-image-loader',
58-
]
59-
},
60-
{
61-
test: /\.glsl$/,
62-
loader: 'webpack-glsl-loader'
63-
},
64-
],
65-
},
66-
resolve: {
67-
extensions: ['.js', '.jsx', '.css']
68-
},
69-
plugins: [
70-
new CopyWebpackPlugin([
71-
{
18+
path: resolve(__dirname, 'docs/'),
19+
},
20+
module: {
21+
rules: [
22+
{
23+
test: /\.(js|jsx)$/,
24+
exclude: /(node_modules|bower_components)/,
25+
use: {
26+
loader: 'babel-loader',
27+
options: {
28+
presets: ['env'],
29+
},
30+
},
31+
},
32+
{
33+
test: /\.(woff|woff2|ttf|eot)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/,
34+
loader: 'file-loader?name=fonts/[name].[ext]&limit=10000',
35+
},
36+
{
37+
test: /\.css$/,
38+
loader: 'style-loader',
39+
}, {
40+
test: /\.css$/,
41+
loader: 'css-loader',
42+
},
43+
{
44+
test: /\.(jpe?g|gif|svg)$/i,
45+
use: [
46+
'url-loader?name=images/[name].[ext]&limit=10000',
47+
'img-loader?name=images/[name].[ext]',
48+
],
49+
},
50+
{
51+
test: /\.(png)$/i,
52+
use: [
53+
'base64-image-loader',
54+
],
55+
},
56+
{
57+
test: /\.glsl$/,
58+
loader: 'webpack-glsl-loader',
59+
},
60+
],
61+
},
62+
resolve: {
63+
extensions: ['.js', '.jsx', '.css'],
64+
},
65+
plugins: [
66+
new CopyWebpackPlugin([
67+
{
7268
from: resolve(__dirname, config.copy.all.src),
7369
to: resolve(__dirname, './docs/'),
7470
},
7571
]),
76-
new webpack.ProvidePlugin({
72+
new webpack.ProvidePlugin({
7773
$: 'jquery',
7874
jQuery: 'jquery',
7975
'window.jQuery': 'jquery',
8076
THREE: 'three',
8177
'window.THREE': 'three',
8278
TWEEN: 'tween.js',
83-
'window.TWEEN': 'tween.js',
84-
React: 'react',
85-
_: 'lodash',
86-
})
87-
]
88-
}
79+
'window.TWEEN': 'tween.js',
80+
React: 'react',
81+
_: 'lodash',
82+
}),
83+
],
84+
};

‎webpack-production.config.js

Lines changed: 65 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -5,84 +5,80 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
55
const config = require('./server/config');
66

77
module.exports = {
8-
mode: "production",
9-
context: resolve(__dirname, 'src'),
10-
entry: [
11-
'./index.jsx',
12-
// the entry point of our app
13-
],
14-
output: {
15-
filename: 'bundle.js',
16-
// the output bundle
8+
mode: 'production',
9+
context: resolve(__dirname, 'src'),
10+
entry: [
11+
'./index.jsx',
12+
// the entry point of our app
13+
],
14+
output: {
15+
filename: 'bundle.js',
16+
// the output bundle
1717

18-
path: resolve(__dirname, 'dist/'),
19-
20-
publicPath: resolve(__dirname, 'dist/')
21-
// necessary for HMR to know where to load the hot update chunks
22-
},
23-
module: {
24-
rules: [
25-
26-
{
27-
test: /\.(js|jsx)$/,
28-
exclude: /(node_modules|bower_components)/,
29-
use: {
30-
loader: 'babel-loader',
31-
options: {
32-
presets: ['env']
33-
}
34-
}
35-
},
36-
{
37-
test: /\.(png|woff|woff2|eot|ttf|svg)$/,
38-
loader: 'url-loader?name=/fonts/[name].[ext]&limit=10000',
39-
},
40-
{
41-
test: /\.css$/,
42-
loader: 'style-loader'
43-
}, {
44-
test: /\.css$/,
45-
loader: 'css-loader'
46-
},
47-
{
48-
test: /\.(jpe?g|gif|svg)$/i,
49-
use: [
50-
'url-loader?name=images/[name].[ext]&limit=10000',
51-
'img-loader?name=images/[name].[ext]'
52-
]
53-
},
54-
{
55-
test: /\.(png)$/i,
56-
use: [
57-
'base64-image-loader',
58-
]
59-
},
60-
{
61-
test: /\.glsl$/,
62-
loader: 'webpack-glsl-loader'
63-
},
64-
],
65-
},
66-
resolve: {
67-
extensions: ['.js', '.jsx', '.css']
68-
},
69-
plugins: [
70-
new CopyWebpackPlugin([
18+
path: resolve(__dirname, 'dist/'),
19+
},
20+
module: {
21+
rules: [
22+
{
23+
test: /\.(js|jsx)$/,
24+
exclude: /(node_modules|bower_components)/,
25+
use: {
26+
loader: 'babel-loader',
27+
options: {
28+
presets: ['env'],
29+
},
30+
},
31+
},
32+
{
33+
test: /\.(woff|woff2|ttf|eot)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/,
34+
loader: 'file-loader?name=fonts/[name].[ext]&limit=10000',
35+
},
36+
{
37+
test: /\.css$/,
38+
loader: 'style-loader',
39+
}, {
40+
test: /\.css$/,
41+
loader: 'css-loader',
42+
},
43+
{
44+
test: /\.(jpe?g|gif|svg)$/i,
45+
use: [
46+
'url-loader?name=images/[name].[ext]&limit=10000',
47+
'img-loader?name=images/[name].[ext]',
48+
],
49+
},
50+
{
51+
test: /\.(png)$/i,
52+
use: [
53+
'base64-image-loader',
54+
],
55+
},
56+
{
57+
test: /\.glsl$/,
58+
loader: 'webpack-glsl-loader',
59+
},
60+
],
61+
},
62+
resolve: {
63+
extensions: ['.js', '.jsx', '.css'],
64+
},
65+
plugins: [
66+
new CopyWebpackPlugin([
7167
{
7268
from: resolve(__dirname, config.copy.all.src),
7369
to: resolve(__dirname, './dist/'),
7470
},
7571
]),
76-
new webpack.ProvidePlugin({
72+
new webpack.ProvidePlugin({
7773
$: 'jquery',
7874
jQuery: 'jquery',
7975
'window.jQuery': 'jquery',
8076
THREE: 'three',
8177
'window.THREE': 'three',
8278
TWEEN: 'tween.js',
83-
'window.TWEEN': 'tween.js',
84-
React: 'react',
85-
_: 'lodash',
86-
})
87-
]
88-
}
79+
'window.TWEEN': 'tween.js',
80+
React: 'react',
81+
_: 'lodash',
82+
}),
83+
],
84+
};

‎webpack.config.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,16 @@ module.exports = {
6060
},
6161
},
6262
{
63-
test: /\.css$/,
64-
loader: 'style-loader',
63+
test: /\.(woff|woff2|ttf|eot)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/,
64+
loader: 'file-loader?name=fonts/[name].[ext]&limit=10000',
6565
},
6666
{
67+
test: /\.css$/,
68+
loader: 'style-loader',
69+
}, {
6770
test: /\.css$/,
6871
loader: 'css-loader',
6972
},
70-
{
71-
test: /\.(eot|ttf|woff|woff2)$/,
72-
loader: 'file-loader?name=fonts/[name].[ext]',
73-
},
7473
{
7574
test: /\.(jpe?g|gif|svg)$/i,
7675
use: [
@@ -86,7 +85,7 @@ module.exports = {
8685
},
8786
{
8887
test: /\.glsl$/,
89-
loader: 'webpack-glsl-loader'
88+
loader: 'webpack-glsl-loader',
9089
},
9190
],
9291
},

0 commit comments

Comments
 (0)