Skip to content

Commit ddcd6d8

Browse files
committed
Merge branch 'main' into webpack5
2 parents 444c37f + 32cc0af commit ddcd6d8

File tree

4 files changed

+28
-500
lines changed

4 files changed

+28
-500
lines changed

Diff for: fixtures/stimulus/controllers/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
module.exports = {
1+
export default {
22
'@symfony/mock-module/mock': import(/* webpackMode: "eager" */ '@symfony/mock-module/dist/controller'),
33
};

Diff for: lib/features.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const features = {
2121
packages: [
2222
{ name: 'sass-loader', enforce_version: true },
2323
// allow node-sass or sass to be installed
24-
[{ name: 'node-sass' }, { name: 'sass' }]
24+
[{ name: 'sass' }, { name: 'node-sass' }]
2525
],
2626
description: 'load Sass files'
2727
},

Diff for: package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@symfony/webpack-encore",
3-
"version": "0.32.1",
3+
"version": "0.33.0",
44
"description": "Webpack Encore is a simpler way to integrate Webpack into your application",
55
"main": "index.js",
66
"scripts": {
@@ -85,7 +85,6 @@
8585
"less": "^3.11.3",
8686
"less-loader": "^6.2.0",
8787
"mocha": "^7.1.2",
88-
"node-sass": "^4.5.3",
8988
"postcss-loader": "^4.0.0",
9089
"preact": "^8.2.1",
9190
"preact-compat": "^3.17.0",

0 commit comments

Comments
 (0)