Skip to content

Commit 206b1dc

Browse files
authored
better handling of resources
1 parent a5605d0 commit 206b1dc

File tree

7 files changed

+42
-14
lines changed

7 files changed

+42
-14
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@lastui/rocker",
3-
"version": "0.20.31",
3+
"version": "0.20.32",
44
"license": "Apache-2.0",
55
"author": "[email protected]",
66
"homepage": "https://github.com/lastui/rocker#readme",

webpack/config/dll/index.js

+8
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ module.exports = merge(require("../../internal/base.js"), require("../../interna
6565
test: /\.txt$/,
6666
type: "asset/source",
6767
},
68+
{
69+
test: /\.json5?$/,
70+
type: "javascript/auto",
71+
loader: "json5-loader",
72+
options: {
73+
esModule: false,
74+
},
75+
},
6876
],
6977
},
7078
plugins: [

webpack/config/module/development.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,20 @@ module.exports = merge(require("../../internal/base.js"), require("../../interna
109109
},
110110
],
111111
},
112+
{
113+
test: /\.json5?$/,
114+
type: "javascript/auto",
115+
loader: "json5-loader",
116+
options: {
117+
esModule: false,
118+
},
119+
},
112120
{
113121
test: /\.txt$/,
114122
type: "asset/source",
115123
},
116124
{
117-
test: /\.(mp3|png|jpe?g|gif)$/i,
125+
test: /\.(mp3|png|jpe?g|gif|ico)$/i,
118126
dependency: { not: ["url"] },
119127
type: "asset/inline",
120128
},

webpack/config/module/production.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,20 @@ module.exports = merge(require("../../internal/base.js"), require("../../interna
106106
},
107107
],
108108
},
109+
{
110+
test: /\.json5?$/,
111+
type: "javascript/auto",
112+
loader: "json5-loader",
113+
options: {
114+
esModule: false,
115+
},
116+
},
109117
{
110118
test: /\.txt$/,
111119
type: "asset/source",
112120
},
113121
{
114-
test: /\.(mp3|png|jpe?g|gif)$/i,
122+
test: /\.(mp3|png|jpe?g|gif|ico)$/i,
115123
dependency: { not: ["url"] },
116124
type: "asset/inline",
117125
},

webpack/config/spa/development.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ module.exports = merge(require("../../internal/base.js"), require("../../interna
9696
},
9797
],
9898
},
99+
{
100+
test: /\.json5?$/,
101+
type: "javascript/auto",
102+
loader: "json5-loader",
103+
options: {
104+
esModule: false,
105+
},
106+
},
99107
{
100108
test: /\.txt$/,
101109
type: "asset/source",
@@ -120,7 +128,7 @@ module.exports = merge(require("../../internal/base.js"), require("../../interna
120128
],
121129
},
122130
{
123-
test: /\.(png|jpe?g|gif)$/i,
131+
test: /\.(png|jpe?g|gif|ico)$/i,
124132
dependency: { not: ["url"] },
125133
type: "asset/inline",
126134
},

webpack/config/spa/production.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,13 @@ module.exports = merge(require("../../internal/base.js"), require("../../interna
113113
},
114114
],
115115
},
116+
{
117+
test: /\.json5?$/,
118+
type: "asset/resource",
119+
},
116120
{
117121
test: /\.txt$/,
118-
type: "asset/source",
122+
type: "asset/resource",
119123
},
120124
{
121125
test: /\.css$/i,
@@ -134,7 +138,7 @@ module.exports = merge(require("../../internal/base.js"), require("../../interna
134138
],
135139
},
136140
{
137-
test: /\.(mp3|woff|woff2|svg|eot|otf|ttf|png|jpe?g|gif)(\?.*$|$)/,
141+
test: /\.(mp3|woff|woff2|svg|eot|otf|ttf|png|jpe?g|gif|ico)(\?.*$|$)/,
138142
type: "asset/resource",
139143
},
140144
],

webpack/internal/base.js

-8
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ module.exports = {
3535
{
3636
parser: { requireEnsure: false },
3737
},
38-
{
39-
test: /\.json5?$/,
40-
type: "javascript/auto",
41-
loader: "json5-loader",
42-
options: {
43-
esModule: false,
44-
},
45-
},
4638
],
4739
},
4840
cache: {

0 commit comments

Comments
 (0)