From 839639326c20bb7e7a404862a5dd1bd3e9716e83 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 14 Mar 2022 10:25:52 +0000 Subject: [PATCH] DEV: Install the `@ember/jquery` package to remove warning (#16165) Eventually we want to remove JQuery, but that's a long way off. Installing this package will stop ember-cli printing the deprecation warning on every boot ``` DEPRECATION: The integration of jQuery into Ember has been deprecated and will be removed with Ember 4.0. You can either opt-out of using jQuery, or install the `@ember/jquery` addon to provide the jQuery integration. Please consult the deprecation guide for further details: https://emberjs.com/deprecations/v3.x#toc_jquery-apis ``` --- app/assets/javascripts/discourse/package.json | 1 + app/assets/javascripts/yarn.lock | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 8c557e878f3..95f27709c93 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -18,6 +18,7 @@ "dependencies": { "@babel/core": "^7.14.3", "@discourse/itsatrap": "^2.0.10", + "@ember/jquery": "^2.0.0", "@ember/optional-features": "^1.1.0", "@ember/test-helpers": "^2.2.0", "@glimmer/component": "^1.0.4", diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock index 0b8ed4e0aeb..a0d559d5aec 100644 --- a/app/assets/javascripts/yarn.lock +++ b/app/assets/javascripts/yarn.lock @@ -1761,6 +1761,17 @@ resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6" integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog== +"@ember/jquery@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@ember/jquery/-/jquery-2.0.0.tgz#083a1de32333b3fc938fad246a6f3ea7eefe5b10" + integrity sha512-f8+WNqzXBNxl96jo0IwJBO5QCi0bnUlba9I7WbZcGhgnzszC76INJkw6l8UepZ1PMGG1H1wYpoIGoBBp5ZVmFA== + dependencies: + broccoli-funnel "^3.0.6" + broccoli-merge-trees "^4.2.0" + ember-cli-babel "^7.26.6" + jquery "^3.5.0" + resolve "^1.15.1" + "@ember/optional-features@^1.1.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-1.3.0.tgz#d7da860417b85a56cec88419f30da5ee1dde2756" @@ -4281,7 +4292,7 @@ broccoli-funnel@^3.0.3: path-posix "^1.0.0" walk-sync "^2.0.2" -broccoli-funnel@^3.0.8: +broccoli-funnel@^3.0.6, broccoli-funnel@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b" integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ== @@ -9195,7 +9206,7 @@ jest-worker@^27.4.1: merge-stream "^2.0.0" supports-color "^8.0.0" -jquery@^3.4.1: +jquery@^3.4.1, jquery@^3.5.0: version "3.6.0" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==