From 51dd583f034ce608f684e9058e12a4c190a06ad0 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 20 Oct 2022 08:45:51 -0400 Subject: [PATCH 1/3] Fixing wrong pr number --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b689fcf9..41e73ed9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ ### Bug Fixes -* Support for Vue 2 was accidentally dropped in 4.0.0, and was re-added - #157 thanks to @Kocal. +* Support for Vue 2 was accidentally dropped in 4.0.0, and was re-added - #1157 thanks to @Kocal. ## [v4.0.0](https://github.com/symfony/webpack-encore/releases/tag/v4.0.0) From 7e415b896805dc0f41a8cb98032cd97c3f120555 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Mon, 21 Nov 2022 10:19:24 +0100 Subject: [PATCH 2/3] Match `@vue/compiler-sfc` requirement with `vue` --- package.json | 2 +- test_apps/yarn-pnp-with-babel/yarn.lock | 2 +- test_apps/yarn-pnp-with-external-babel-config/yarn.lock | 2 +- test_apps/yarn-pnp/yarn.lock | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 7a8afff3..3c4818a2 100755 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "@symfony/stimulus-bridge": "^3.0.0", "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", "@vue/babel-preset-jsx": "^1.0.0", - "@vue/compiler-sfc": "^3.0.2", + "@vue/compiler-sfc": "^2.6 || ^3.0.2", "eslint": "^8.0.0", "eslint-webpack-plugin": "^3.1.0", "file-loader": "^6.0.0", diff --git a/test_apps/yarn-pnp-with-babel/yarn.lock b/test_apps/yarn-pnp-with-babel/yarn.lock index 3160d173..8dafdf57 100644 --- a/test_apps/yarn-pnp-with-babel/yarn.lock +++ b/test_apps/yarn-pnp-with-babel/yarn.lock @@ -2435,7 +2435,7 @@ __metadata: "resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.9.0#~builtin": version: 1.22.1 - resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b" + resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=c3c19d" dependencies: is-core-module: ^2.9.0 path-parse: ^1.0.7 diff --git a/test_apps/yarn-pnp-with-external-babel-config/yarn.lock b/test_apps/yarn-pnp-with-external-babel-config/yarn.lock index 3160d173..8dafdf57 100644 --- a/test_apps/yarn-pnp-with-external-babel-config/yarn.lock +++ b/test_apps/yarn-pnp-with-external-babel-config/yarn.lock @@ -2435,7 +2435,7 @@ __metadata: "resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.9.0#~builtin": version: 1.22.1 - resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b" + resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=c3c19d" dependencies: is-core-module: ^2.9.0 path-parse: ^1.0.7 diff --git a/test_apps/yarn-pnp/yarn.lock b/test_apps/yarn-pnp/yarn.lock index c0fd49c1..1a6ee9f1 100644 --- a/test_apps/yarn-pnp/yarn.lock +++ b/test_apps/yarn-pnp/yarn.lock @@ -2412,7 +2412,7 @@ __metadata: "resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.9.0#~builtin": version: 1.22.1 - resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b" + resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=c3c19d" dependencies: is-core-module: ^2.9.0 path-parse: ^1.0.7 From 9bb546919ce90c89b46e83e99c06e2d4f590d566 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Mon, 21 Nov 2022 12:26:36 -0500 Subject: [PATCH 3/3] Tagging 4.1.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c4818a2..cfe13277 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@symfony/webpack-encore", - "version": "4.1.1", + "version": "4.1.2", "description": "Webpack Encore is a simpler way to integrate Webpack into your application", "main": "index.js", "scripts": {