From 4a49c22780ead1cf808bb3408260b8d3a697beb3 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 16 Nov 2022 09:10:58 +0100 Subject: [PATCH] DEV: Make more dependencies explicit (#19047) --- app/assets/javascripts/admin/package.json | 1 + .../javascripts/discourse-common/package.json | 3 +- .../javascripts/discourse-hbr/package.json | 1 + .../discourse-plugins/package.json | 7 ++- .../discourse-widget-hbs/package.json | 1 + app/assets/javascripts/discourse/package.json | 25 ++++++----- .../javascripts/pretty-text/package.json | 1 + .../javascripts/select-kit/package.json | 1 + .../javascripts/truth-helpers/package.json | 1 + app/assets/javascripts/wizard/package.json | 1 + app/assets/javascripts/yarn.lock | 45 ++++++------------- 11 files changed, 43 insertions(+), 44 deletions(-) diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json index 03d34c80960..f641a8104a6 100644 --- a/app/assets/javascripts/admin/package.json +++ b/app/assets/javascripts/admin/package.json @@ -22,6 +22,7 @@ "xss": "^1.0.14" }, "devDependencies": { + "@babel/core": "^7.20.2", "@ember/optional-features": "^2.0.0", "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json index 4146910d92c..80599126e89 100644 --- a/app/assets/javascripts/discourse-common/package.json +++ b/app/assets/javascripts/discourse-common/package.json @@ -26,10 +26,11 @@ "ember-cli-htmlbars": "^6.1.1", "ember-resolver": "^8.0.3", "handlebars": "^4.7.0", - "truth-helpers": "^1.0.0", + "truth-helpers": "1.0.0", "webpack": "^5.75.0" }, "devDependencies": { + "@babel/core": "^7.20.2", "@ember/optional-features": "^2.0.0", "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json index a070d83f16a..5f474b73c64 100644 --- a/app/assets/javascripts/discourse-hbr/package.json +++ b/app/assets/javascripts/discourse-hbr/package.json @@ -22,6 +22,7 @@ "webpack": "^5.75.0" }, "devDependencies": { + "@babel/core": "^7.20.2", "@ember/optional-features": "^2.0.0", "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", diff --git a/app/assets/javascripts/discourse-plugins/package.json b/app/assets/javascripts/discourse-plugins/package.json index e57cc55bccb..b3ea492b986 100644 --- a/app/assets/javascripts/discourse-plugins/package.json +++ b/app/assets/javascripts/discourse-plugins/package.json @@ -9,10 +9,13 @@ ], "repository": "", "dependencies": { + "discourse-widget-hbs": "1.0.0", "ember-auto-import": "^2.4.3", "ember-cli-babel": "^7.26.10", - "ember-cli-htmlbars": "^6.1.1", - "discourse-widget-hbs": "1.0" + "ember-cli-htmlbars": "^6.1.1" + }, + "devDependencies": { + "@babel/core": "^7.20.2" }, "engines": { "node": "16.* || >= 18", diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json index 2a7ba4b1b43..903680b4e60 100644 --- a/app/assets/javascripts/discourse-widget-hbs/package.json +++ b/app/assets/javascripts/discourse-widget-hbs/package.json @@ -22,6 +22,7 @@ "webpack": "^5.75.0" }, "devDependencies": { + "@babel/core": "^7.20.2", "@ember/optional-features": "^2.0.0", "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index b0e2fa6d126..654965c4e8a 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -18,8 +18,8 @@ "dependencies": { "@babel/core": "^7.20.2", "@babel/standalone": "^7.20.4", - "@discourse/itsatrap": "^2.0.10", "@discourse/backburner.js": "^2.7.1-0", + "@discourse/itsatrap": "^2.0.10", "@ember/jquery": "^2.0.0", "@ember/optional-features": "^2.0.0", "@ember/render-modifiers": "^2.0.4", @@ -35,16 +35,17 @@ "@uppy/utils": "^4.1.0", "@uppy/xhr-upload": "^2.1.2", "a11y-dialog": "7.5.2", - "admin": "^1.0.0", - "discourse-plugins": "^1.0.0", + "admin": "1.0.0", + "babel-import-util": "^1.2.2", "babel-plugin-ember-template-compilation": "^1.0.2", "bootstrap": "3.4.1", "broccoli-asset-rev": "^3.0.0", "deepmerge": "^4.2.2", - "discourse-common": "^1.0.0", - "discourse-ensure-deprecation-order": "^1.0.0", - "discourse-hbr": "^1.0.0", - "discourse-widget-hbs": "^1.0.0", + "discourse-common": "1.0.0", + "discourse-ensure-deprecation-order": "1.0.0", + "discourse-hbr": "1.0.0", + "discourse-plugins": "1.0.0", + "discourse-widget-hbs": "1.0.0", "ember-auto-import": "^2.4.3", "ember-auto-import-chunks-json-generator": "^1.0.0", "ember-buffered-proxy": "^2.1.1", @@ -70,6 +71,7 @@ "ember-test-selectors": "^6.0.0", "eslint": "^8.26.0", "eslint-plugin-qunit": "^6.2.0", + "handlebars": "^4.7.7", "html-entities": "^2.3.3", "js-yaml": "^4.1.0", "jsdom": "^20.0.2", @@ -79,16 +81,19 @@ "messageformat": "0.1.5", "node-fetch": "^2.6.7", "pretender": "^3.4.7", - "pretty-text": "^1.0.0", + "pretty-text": "1.0.0", "qunit": "^2.19.3", "qunit-dom": "^2.0.0", "sass": "^1.56.1", - "select-kit": "^1.0.0", + "select-kit": "1.0.0", "sinon": "^14.0.2", + "source-map": "^0.6.1", + "terser": "5.10.0", "tippy.js": "^6.3.7", "virtual-dom": "^2.1.1", "webpack": "^5.75.0", - "wizard": "^1.0.0" + "wizard": "1.0.0", + "xss": "^1.0.14" }, "engines": { "node": "16.* || >= 18", diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json index 8482ad6b2a4..42ed9424f29 100644 --- a/app/assets/javascripts/pretty-text/package.json +++ b/app/assets/javascripts/pretty-text/package.json @@ -22,6 +22,7 @@ "xss": "^1.0.14" }, "devDependencies": { + "@babel/core": "^7.20.2", "@ember/optional-features": "^2.0.0", "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json index 35543b6f6c7..cf9414e1f99 100644 --- a/app/assets/javascripts/select-kit/package.json +++ b/app/assets/javascripts/select-kit/package.json @@ -21,6 +21,7 @@ "webpack": "^5.75.0" }, "devDependencies": { + "@babel/core": "^7.20.2", "@ember/optional-features": "^2.0.0", "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json index 35cc307fa52..7a648edfd72 100644 --- a/app/assets/javascripts/truth-helpers/package.json +++ b/app/assets/javascripts/truth-helpers/package.json @@ -21,6 +21,7 @@ "webpack": "^5.75.0" }, "devDependencies": { + "@babel/core": "^7.20.2", "@ember/optional-features": "^2.0.0", "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", diff --git a/app/assets/javascripts/wizard/package.json b/app/assets/javascripts/wizard/package.json index feb3ec699eb..4cbb7b41d79 100644 --- a/app/assets/javascripts/wizard/package.json +++ b/app/assets/javascripts/wizard/package.json @@ -22,6 +22,7 @@ "xss": "^1.0.14" }, "devDependencies": { + "@babel/core": "^7.20.2", "@ember/optional-features": "^2.0.0", "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock index d610ba79748..c0cfb8bc755 100644 --- a/app/assets/javascripts/yarn.lock +++ b/app/assets/javascripts/yarn.lock @@ -17,12 +17,7 @@ dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.3.tgz#707b939793f867f5a73b2666e6d9a3396eb03151" - integrity sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw== - -"@babel/compat-data@^7.20.0": +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.20.0": version "7.20.1" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30" integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ== @@ -218,14 +213,7 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-simple-access@^7.16.7": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7" - integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg== - dependencies: - "@babel/types" "^7.19.4" - -"@babel/helper-simple-access@^7.20.2": +"@babel/helper-simple-access@^7.16.7", "@babel/helper-simple-access@^7.20.2": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== @@ -997,7 +985,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.1.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.4.4", "@babel/types@^7.7.2": +"@babel/types@^7.1.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.4.4", "@babel/types@^7.7.2": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842" integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog== @@ -6179,7 +6167,7 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.7.0, handlebars@^4.7.3, handlebars@^4.7.6: +handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.7.0, handlebars@^4.7.3, handlebars@^4.7.6, handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== @@ -7815,12 +7803,7 @@ minimist@^0.2.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455" integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg== -minimist@^1.1.1, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -minimist@^1.2.0: +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== @@ -10007,6 +9990,15 @@ terser-webpack-plugin@^5.1.3: source-map "^0.6.1" terser "^5.7.2" +terser@5.10.0, terser@^5.3.0, terser@^5.7.2: + version "5.10.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== + dependencies: + commander "^2.20.0" + source-map "~0.7.2" + source-map-support "~0.5.20" + terser@^4.1.2: version "4.8.1" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" @@ -10016,15 +10008,6 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.3.0, terser@^5.7.2: - version "5.10.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" - integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== - dependencies: - commander "^2.20.0" - source-map "~0.7.2" - source-map-support "~0.5.20" - testem@^3.2.0: version "3.9.0" resolved "https://registry.yarnpkg.com/testem/-/testem-3.9.0.tgz#a82ccf01e5a248e3924244186e348c665ab90f7d"