Skip to content

Commit 179e1c2

Browse files
committed
more testing and cleanup webpack config
1 parent 47b9bf6 commit 179e1c2

File tree

2 files changed

+11
-24
lines changed

2 files changed

+11
-24
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "ui/index.js",
66
"scripts": {
77
"dev": "npm run development",
8-
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
8+
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=webpack.config.js --mode=development",
99
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
1010
"watch-poll": "npm run watch -- --watch-poll",
1111
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",

webpack.config.js

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = {
1414
alias: {
1515
Utilities: path.resolve(__dirname, 'ui/js/')
1616
},
17-
extensions: ['.wasm', '.mjs', '.js', '.json', '.jsx']
17+
extensions: ['.js', '.json', '.jsx']
1818
},
1919
module: {
2020
rules: [
@@ -39,24 +39,18 @@ module.exports = {
3939
{
4040
loader: "file-loader",
4141
options: {
42-
name: path => {
43-
console.log("es ist ein BILD!");
44-
console.log(path);
45-
if(!/node_modules|bower_components/.test(path)) {
42+
name: loader_path => {
43+
if(!/node_modules|bower_components/.test(loader_path)) {
4644
return "app/images/[name].[ext]?[hash]";
4745
}
4846

4947
return (
5048
"app/images/vendor/" +
51-
path.replace(/\\/g, "/")
52-
.replace(
53-
/((.*(node_modules|bower_components))|images|image|img|assets)\//g,
54-
''
55-
) +
49+
loader_path.replace(/\\/g, "/")
50+
.replace(/((.*(node_modules))|images|image|img|assets)\//g, '') +
5651
'?[hash]'
5752
);
5853
},
59-
publicPath: 'app/'
6054
}
6155
}
6256
]
@@ -67,26 +61,19 @@ module.exports = {
6761
{
6862
loader: "file-loader",
6963
options: {
70-
name: path => {
71-
console.log("testausgabe");
72-
console.log(path);
73-
if (!/node_modules|bower_components/.test(path)) {
64+
name: loader_path => {
65+
if (!/node_modules|bower_components/.test(loader_path)) {
7466
return 'app/fonts/[name].[ext]?[hash]';
7567
}
7668

7769
return (
78-
'app/fonts' +
79-
'/vendor/' +
80-
path
70+
'app/fonts/vendor/' +
71+
loader_path
8172
.replace(/\\/g, '/')
82-
.replace(
83-
/((.*(node_modules|bower_components))|fonts|font|assets)\//g,
84-
''
85-
) +
73+
.replace(/((.*(node_modules))|fonts|font|assets)\//g, '') +
8674
'?[hash]'
8775
);
8876
},
89-
publicPath: 'app/'
9077
}
9178
}
9279
]

0 commit comments

Comments
 (0)