Skip to content

Commit 480084a

Browse files
authored
Merge pull request #462 from dotkernel/7.0-clean-packages
7.0 clean packages
2 parents 7f47248 + 6ab15ba commit 480084a

3 files changed

Lines changed: 18 additions & 17 deletions

File tree

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,25 @@
3434
"moment": "^2.30.1"
3535
},
3636
"devDependencies": {
37-
"@babel/core": "^7.24.7",
38-
"@babel/plugin-proposal-class-properties": "^7.18.6",
39-
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
40-
"@babel/plugin-transform-runtime": "^7.24.7",
41-
"@babel/runtime": "^7.24.7",
37+
"@babel/core": "^8.0.0",
38+
"@babel/plugin-transform-class-properties": "^8.0.0",
39+
"@babel/plugin-transform-object-rest-spread": "^8.0.0",
40+
"@babel/plugin-transform-runtime": "^8.0.0",
41+
"@babel/runtime": "^8.0.0",
4242
"ajv": "^8.18.0",
4343
"babel-loader": "^10.1.1",
4444
"clean-webpack-plugin": "^4.0.0",
4545
"copy-webpack-plugin": "^14.0.0",
46-
"cross-env": "^7.0.3",
47-
"css-loader": "5.2.7",
46+
"cross-env": "^10.0.0",
47+
"css-loader": "7.1.4",
4848
"expose-loader": "^5.0.0",
4949
"file-loader": "^6.2.0",
5050
"mini-css-extract-plugin": "^2.9.0",
5151
"sass": "^1.77.1",
52-
"sass-loader": "^14.2.1",
52+
"sass-loader": "^17.0.0",
5353
"terser-webpack-plugin": "^5.6.1",
5454
"webpack": "^5.92.1",
55-
"webpack-cli": "^5.1.4"
55+
"webpack-cli": "^7.0.0"
5656
},
5757
"overrides": {
5858
"graceful-fs": "^4.2.11"

public/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webpack.config.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,13 @@ function generateBaseRules()
246246
{
247247
test: /\.(woff|woff2|eot|ttf|otf|svg)$/,
248248
exclude: [/images?|img/],
249-
use: [
250-
// As SVG may count as both font or image,
251-
// we will not treat any file in a folder
252-
// with the name image(s) or img as a font
253-
'file-loader?name=fonts/[name].[ext]'
254-
]
249+
// As SVG may count as both font or image
250+
// we will not treat any file in a folder
251+
// with the name image(s) or img as a font
252+
type: 'asset/resource',
253+
generator: {
254+
filename: 'fonts/[name][ext]'
255+
}
255256
}
256257
];
257-
}
258+
}

0 commit comments

Comments
 (0)