From 0d523318233e8cec2bce5d521a93c3620855c94c Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 10 Jan 2024 18:30:50 +0100 Subject: [PATCH] DEV: Use ember 5 in package.json files by default (#25207) --- app/assets/javascripts/admin/package.json | 2 +- .../javascripts/discourse-common/package.json | 2 +- .../javascripts/discourse-hbr/package.json | 2 +- .../discourse-widget-hbs/package.json | 2 +- app/assets/javascripts/discourse/package.json | 2 +- app/assets/javascripts/float-kit/package.json | 2 +- app/assets/javascripts/package-ember3.json | 3 ++- app/assets/javascripts/package-ember5.json | 3 +-- app/assets/javascripts/pretty-text/package.json | 2 +- app/assets/javascripts/select-kit/package.json | 2 +- .../javascripts/theme-transpiler/package.json | 2 +- .../javascripts/truth-helpers/package.json | 2 +- app/assets/javascripts/yarn-ember3.lock | 17 ++++++++++++----- app/assets/javascripts/yarn-ember5.lock | 2 +- 14 files changed, 26 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json index b20657c677b..5ee223054a5 100644 --- a/app/assets/javascripts/admin/package.json +++ b/app/assets/javascripts/admin/package.json @@ -54,7 +54,7 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", "ember-resolver": "^10.1.1", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", "webpack": "^5.89.0" diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json index 80131fc617a..1fe1830a683 100644 --- a/app/assets/javascripts/discourse-common/package.json +++ b/app/assets/javascripts/discourse-common/package.json @@ -61,7 +61,7 @@ "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", "webpack": "^5.89.0" diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json index 7bdcec0d19e..6ecaa6af898 100644 --- a/app/assets/javascripts/discourse-hbr/package.json +++ b/app/assets/javascripts/discourse-hbr/package.json @@ -33,7 +33,7 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", "ember-resolver": "^10.1.1", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", "webpack": "^5.89.0" diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json index 0fe43c2aa67..d234b1f684e 100644 --- a/app/assets/javascripts/discourse-widget-hbs/package.json +++ b/app/assets/javascripts/discourse-widget-hbs/package.json @@ -34,7 +34,7 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", "ember-resolver": "^10.1.1", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", "webpack": "^5.89.0" diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index f8f16f3a818..fbc70473f7f 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -21,7 +21,7 @@ "discourse-hbr": "1.0.0", "discourse-widget-hbs": "1.0.0", "ember-route-template": "^1.0.3", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "handlebars": "^4.7.8", "highlight.js": "^11.9.0", "jspreadsheet-ce": "^4.13.4", diff --git a/app/assets/javascripts/float-kit/package.json b/app/assets/javascripts/float-kit/package.json index 5665eb5b663..082c702d35c 100644 --- a/app/assets/javascripts/float-kit/package.json +++ b/app/assets/javascripts/float-kit/package.json @@ -54,7 +54,7 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", "ember-resolver": "^10.1.1", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", "webpack": "^5.89.0" diff --git a/app/assets/javascripts/package-ember3.json b/app/assets/javascripts/package-ember3.json index 120e173d690..2f063e730cc 100644 --- a/app/assets/javascripts/package-ember3.json +++ b/app/assets/javascripts/package-ember3.json @@ -24,7 +24,8 @@ "truth-helpers" ], "resolutions": { - "**/unset-value": "2.0.1" + "**/unset-value": "2.0.1", + "**/ember-source": "3.28.12" }, "devDependencies": { "patch-package": "^8.0.0", diff --git a/app/assets/javascripts/package-ember5.json b/app/assets/javascripts/package-ember5.json index 48761fec3d8..120e173d690 100644 --- a/app/assets/javascripts/package-ember5.json +++ b/app/assets/javascripts/package-ember5.json @@ -24,8 +24,7 @@ "truth-helpers" ], "resolutions": { - "**/unset-value": "2.0.1", - "**/ember-source": "5.5.0" + "**/unset-value": "2.0.1" }, "devDependencies": { "patch-package": "^8.0.0", diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json index 5cc9d5e1afa..49e6afcc78f 100644 --- a/app/assets/javascripts/pretty-text/package.json +++ b/app/assets/javascripts/pretty-text/package.json @@ -54,7 +54,7 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", "ember-resolver": "^10.1.1", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", "webpack": "^5.89.0" diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json index 9ffde9e21f8..b74154571f0 100644 --- a/app/assets/javascripts/select-kit/package.json +++ b/app/assets/javascripts/select-kit/package.json @@ -53,7 +53,7 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", "ember-resolver": "^10.1.1", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", "webpack": "^5.89.0" diff --git a/app/assets/javascripts/theme-transpiler/package.json b/app/assets/javascripts/theme-transpiler/package.json index 36654b3cf85..717ebd53819 100644 --- a/app/assets/javascripts/theme-transpiler/package.json +++ b/app/assets/javascripts/theme-transpiler/package.json @@ -14,7 +14,7 @@ "discourse-common": "1.0.0", "discourse-widget-hbs": "1.0.0", "ember-cli-htmlbars": "^6.3.0", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "ember-this-fallback": "^0.4.0", "handlebars": "^4.7.8", "path-browserify": "^1.0.1", diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json index 10f6db451a5..169de9abddc 100644 --- a/app/assets/javascripts/truth-helpers/package.json +++ b/app/assets/javascripts/truth-helpers/package.json @@ -33,7 +33,7 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", "ember-resolver": "^10.1.1", - "ember-source": "~3.28.12", + "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", "webpack": "^5.89.0" diff --git a/app/assets/javascripts/yarn-ember3.lock b/app/assets/javascripts/yarn-ember3.lock index 37a5b52405c..1f140a9f9ca 100644 --- a/app/assets/javascripts/yarn-ember3.lock +++ b/app/assets/javascripts/yarn-ember3.lock @@ -499,13 +499,20 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-block-scoping@^7.22.15", "@babel/plugin-transform-block-scoping@^7.8.3": +"@babel/plugin-transform-block-scoping@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz#494eb82b87b5f8b1d8f6f28ea74078ec0a10a841" integrity sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw== dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-block-scoping@^7.8.3": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5" + integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-transform-class-properties@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77" @@ -705,9 +712,9 @@ "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-transform-object-assign@^7.8.3": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.22.5.tgz#290c1b9555dcea48bb2c29ad94237777600d04f9" - integrity sha512-iDhx9ARkXq4vhZ2CYOSnQXkmxkDgosLi3J8Z17mKz7LyzthtkdVchLD7WZ3aXeCuvJDOW3+1I5TpJmwIbF9MKQ== + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.23.3.tgz#64177e8cf943460c7f0e1c410277546804f59625" + integrity sha512-TPJ6O7gVC2rlQH2hvQGRH273G1xdoloCj9Pc07Q7JbIZYDi+Sv5gaE2fu+r5E7qK4zyt6vj0FbZaZTRU5C3OMA== dependencies: "@babel/helper-plugin-utils" "^7.22.5" @@ -5331,7 +5338,7 @@ ember-source-channel-url@^3.0.0: dependencies: node-fetch "^2.6.0" -ember-source@~3.28.12: +ember-source@3.28.12, ember-source@~5.5.0: version "3.28.12" resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.28.12.tgz#d8bb33d665d9c5adc858dce9d2d18be5ce58b2c0" integrity sha512-HGrBpY6TN+MAi7F6BS8XYtNFG6vtbKE9ttPcyj0Ps+76kP7isCHyN0hk8ecKciLq7JYDqiPDNWjdIXAn2JfhZA== diff --git a/app/assets/javascripts/yarn-ember5.lock b/app/assets/javascripts/yarn-ember5.lock index 8e6bc8b278d..68bf84fd1a6 100644 --- a/app/assets/javascripts/yarn-ember5.lock +++ b/app/assets/javascripts/yarn-ember5.lock @@ -5503,7 +5503,7 @@ ember-source-channel-url@^3.0.0: dependencies: node-fetch "^2.6.0" -ember-source@5.5.0, ember-source@~3.28.12: +ember-source@~5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-5.5.0.tgz#62f4f439d6642b7b70dd0cd53786be5058eab40b" integrity sha512-OTJ9kt76wyvEkdSdjmonoLUTTqYg5OaFxicSiwKsjX9gJ9bVzuCu3uInhBKEfTdC5lSBMEcVuGk8f9LUF3pxJQ==