Skip to content

Commit 4b7e1c0

Browse files
committed
Auto merge of #4310 - rust-lang:renovate/embroider-monorepo, r=Turbo87
Update embroider monorepo to v0.49.0 [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [`@embroider/compat](https://togithub.com/embroider-build/embroider)` | [`0.48.1` -> `0.49.0`](https://renovatebot.com/diffs/npm/`@embroider%2fcompat/0.48.1/0.49.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.49.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.49.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.49.0/compatibility-slim/0.48.1)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.49.0/confidence-slim/0.48.1)](https://docs.renovatebot.com/merge-confidence/)` | | [`@embroider/core](https://togithub.com/embroider-build/embroider)` | [`0.48.1` -> `0.49.0`](https://renovatebot.com/diffs/npm/`@embroider%2fcore/0.48.1/0.49.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.49.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.49.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.49.0/compatibility-slim/0.48.1)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.49.0/confidence-slim/0.48.1)](https://docs.renovatebot.com/merge-confidence/)` | | [`@embroider/webpack](https://togithub.com/embroider-build/embroider)` | [`0.48.1` -> `0.49.0`](https://renovatebot.com/diffs/npm/`@embroider%2fwebpack/0.48.1/0.49.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.49.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.49.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.49.0/compatibility-slim/0.48.1)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.49.0/confidence-slim/0.48.1)](https://docs.renovatebot.com/merge-confidence/)` | --- ### Release Notes <details> <summary>embroider-build/embroider</summary> ### [`v0.49.0`](https://togithub.com/embroider-build/embroider/blob/HEAD/CHANGELOG.md#v0490-2021-12-21) [Compare Source](https://togithub.com/embroider-build/embroider/compare/v0.48.1...v0.49.0) ##### 🚀 Enhancement - `webpack` - [#&#8203;1055](https://togithub.com/embroider-build/embroider/pull/1055) Accept custom `css-loader` and `style-loader` config in ``@embroider/webpack`` ([`@&#8203;dfreeman](https://togithub.com/dfreeman))` - `addon-shim` - [#&#8203;1052](https://togithub.com/embroider-build/embroider/pull/1052) restore tree caching via `cacheKeyForTree` ([`@&#8203;RuslanZavacky](https://togithub.com/RuslanZavacky))` ##### 🐛 Bug Fix - `core` - [#&#8203;1048](https://togithub.com/embroider-build/embroider/pull/1048) Fix imported CSS with FastBoot ([`@&#8203;simonihmig](https://togithub.com/simonihmig))` - [#&#8203;1045](https://togithub.com/embroider-build/embroider/pull/1045) Append styles imported in JS to end of `document.head` ([`@&#8203;simonihmig](https://togithub.com/simonihmig))` - `macros` - [#&#8203;1059](https://togithub.com/embroider-build/embroider/pull/1059) cleanup test copy-paste errors ([`@&#8203;ef4](https://togithub.com/ef4))` - `compat`, `util` - [#&#8203;1053](https://togithub.com/embroider-build/embroider/pull/1053) resolve failed macro condition in ember-private-api ([`@&#8203;NullVoxPopuli](https://togithub.com/NullVoxPopuli))` - `compat`, `core`, `shared-internals` - [#&#8203;1043](https://togithub.com/embroider-build/embroider/pull/1043) Make extraImports lazy ([`@&#8203;ef4](https://togithub.com/ef4))` ##### 🏠 Internal - [#&#8203;1044](https://togithub.com/embroider-build/embroider/pull/1044) Fix typo in file assertion test matcher ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` ##### Committers: 6 - Dan Freeman ([`@&#8203;dfreeman](https://togithub.com/dfreeman))` - Edward Faulkner ([`@&#8203;ef4](https://togithub.com/ef4))` - Robert Jackson ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - Ruslan Zavacky ([`@&#8203;RuslanZavacky](https://togithub.com/RuslanZavacky))` - Simon Ihmig ([`@&#8203;simonihmig](https://togithub.com/simonihmig))` - [`@&#8203;NullVoxPopuli](https://togithub.com/NullVoxPopuli)` </details> --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/rust-lang/crates.io).
2 parents 889c86d + 5e51864 commit 4b7e1c0

File tree

2 files changed

+47
-42
lines changed

2 files changed

+47
-42
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
"@ember/render-modifiers": "2.0.2",
5858
"@ember/test-helpers": "2.6.0",
5959
"@ember/test-waiters": "3.0.0",
60-
"@embroider/compat": "0.48.1",
61-
"@embroider/core": "0.48.1",
62-
"@embroider/webpack": "0.48.1",
60+
"@embroider/compat": "0.49.0",
61+
"@embroider/core": "0.49.0",
62+
"@embroider/webpack": "0.49.0",
6363
"@glimmer/component": "1.0.4",
6464
"@glimmer/tracking": "1.0.4",
6565
"@percy/cli": "1.0.0-beta.71",

yarn.lock

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,29 +1198,29 @@
11981198
ember-cli-version-checker "^5.1.2"
11991199
semver "^7.3.5"
12001200

1201-
"@embroider/babel-loader-8@0.48.1":
1202-
version "0.48.1"
1203-
resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-0.48.1.tgz#6d11602ad98fdab369f500eecc11c36d107fd7e9"
1204-
integrity sha512-GnkfJXo1pntrfXl52UV/S48XoBl4ucGOa6/k6pzFOd489wa3PVuiSXqj6Tfqdc1Z8vMi3ZM6PJZOWPSrG4wrzw==
1201+
"@embroider/babel-loader-8@0.49.0":
1202+
version "0.49.0"
1203+
resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-0.49.0.tgz#4c157417b80d339d217a47cbceaed186f4da5f7d"
1204+
integrity sha512-Pggo2ERxxtojiK6dQTOth3Fvnq/A8xY0tAfjAOS3DbCMWiQTJ/4sHZzokmo5JA8dB0VTRStzs9SzWvVVh+swbg==
12051205
dependencies:
12061206
"@babel/core" "^7.14.5"
12071207
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
12081208
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
1209-
"@embroider/core" "0.48.1"
1209+
"@embroider/core" "0.49.0"
12101210
babel-loader "8"
12111211

1212-
"@embroider/compat@0.48.1":
1213-
version "0.48.1"
1214-
resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.48.1.tgz#c8c601fecccaf26eb5d31c5150ebc3b3244e4b94"
1215-
integrity sha512-raszTYd+CIuPss6ZGgAvzjBdGK3KY1HVaNDqNMFXBw/Hulj6oHWAnYhIVI9ArU8avjCtFKWZjup3Aw83blEcjw==
1212+
"@embroider/compat@0.49.0":
1213+
version "0.49.0"
1214+
resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.49.0.tgz#36febce2af757618907874a1bee5fa949fb68f3d"
1215+
integrity sha512-Y9+o3TTmI/NPE4Kh+yj2ASeZIhYg3VJBgQdhVemlmEvrv/ExjgCxDMnMGpYVBvFWBGbWUGZkMy8JJxRgnVqjLg==
12161216
dependencies:
12171217
"@babel/code-frame" "^7.14.5"
12181218
"@babel/core" "^7.14.5"
12191219
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
12201220
"@babel/preset-env" "^7.14.5"
12211221
"@babel/traverse" "^7.14.5"
1222-
"@embroider/macros" "0.48.1"
1223-
"@embroider/shared-internals" "0.48.1"
1222+
"@embroider/macros" "0.49.0"
1223+
"@embroider/shared-internals" "0.49.0"
12241224
"@types/babel__code-frame" "^7.0.2"
12251225
"@types/yargs" "^17.0.3"
12261226
assert-never "^1.1.0"
@@ -1291,21 +1291,21 @@
12911291
walk-sync "^1.1.3"
12921292
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
12931293

1294-
"@embroider/core@0.48.1":
1295-
version "0.48.1"
1296-
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.48.1.tgz#a37c8e7d3b52a0b47076b99fc9741afea1fed010"
1297-
integrity sha512-P+nbBoR5/ffbHDBZQe7o33tmzGjCZ13V0M+oLl16qMnwTwPn7rUOux5kFh5A7zKZYXYKp81haM3foAgihsWjjw==
1294+
"@embroider/core@0.49.0":
1295+
version "0.49.0"
1296+
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.49.0.tgz#134b126d375ffaa1401bd67ce8ee23133a9af7db"
1297+
integrity sha512-n88xgifyM1wpR4arRVpUDmzH5v/kaf+u39zuuQggbl3tvqlYcm4yk+mT5oJhAJUfuBvN/vCXijwcFEXsYgK0PA==
12981298
dependencies:
12991299
"@babel/core" "^7.14.5"
13001300
"@babel/parser" "^7.14.5"
13011301
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
13021302
"@babel/plugin-transform-runtime" "^7.14.5"
13031303
"@babel/runtime" "^7.14.5"
13041304
"@babel/traverse" "^7.14.5"
1305-
"@embroider/macros" "0.48.1"
1306-
"@embroider/shared-internals" "0.48.1"
1305+
"@embroider/macros" "0.49.0"
1306+
"@embroider/shared-internals" "0.49.0"
13071307
assert-never "^1.2.1"
1308-
babel-import-util "^0.2.0"
1308+
babel-import-util "^1.1.0"
13091309
babel-plugin-ember-template-compilation "^1.0.0"
13101310
broccoli-node-api "^1.7.0"
13111311
broccoli-persistent-filter "^3.1.2"
@@ -1328,10 +1328,10 @@
13281328
walk-sync "^3.0.0"
13291329
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
13301330

1331-
"@embroider/hbs-loader@0.48.1":
1332-
version "0.48.1"
1333-
resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-0.48.1.tgz#fcd5326d2ef5ba9c7165e2040873abb9f0a35968"
1334-
integrity sha512-w0pa9JRhTQiBhDiLjgCxQWFvAzSqBv4gNIy+ujnlWmcWlMQlZNg1eoWF4r3LJSDyVfNfPcJ8Q3+16MUEAT7Sjw==
1331+
"@embroider/hbs-loader@0.49.0":
1332+
version "0.49.0"
1333+
resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-0.49.0.tgz#a3135570864f6984b43132ad07cd1c8b42ad5fee"
1334+
integrity sha512-yrgoDlJsKH+sg3CGrsCoU8yNasRhQlJ0j/3D6rcmNqyRGaRKo7EUE0cDOd/LNOOb0aIBhVcUbocLYMq5jWw/ZQ==
13351335

13361336
"@embroider/macros@0.33.0":
13371337
version "0.33.0"
@@ -1348,12 +1348,12 @@
13481348
resolve "^1.8.1"
13491349
semver "^7.3.2"
13501350

1351-
"@embroider/macros@0.48.1", "@embroider/macros@>= 0.48.1 < 2.0.0-alpha.1":
1352-
version "0.48.1"
1353-
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.48.1.tgz#fc1fd10857d40e80a20c0d366a1a8007aa424e83"
1354-
integrity sha512-JtcOL3pSxI8prstQomzNNHPBqG1K5JwrIuZwH+Q9TK4nONIH2F4z0Z0pd0SZmTEjF17E4gZN3g1J3vSX4zKuww==
1351+
"@embroider/macros@0.49.0", "@embroider/macros@>= 0.48.1 < 2.0.0-alpha.1":
1352+
version "0.49.0"
1353+
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.49.0.tgz#65b4ed734d1266013a452aed2a3adb8694832112"
1354+
integrity sha512-4VsvlE0h8l1LPI6V2VufQimf7LGkSXd9AJLsrGs4/W8SqqdJHv4oY2DGzX1c0Te4VcD61lIzCkeOkzN2PMV3WQ==
13551355
dependencies:
1356-
"@embroider/shared-internals" "0.48.1"
1356+
"@embroider/shared-internals" "0.49.0"
13571357
assert-never "^1.2.1"
13581358
ember-cli-babel "^7.26.6"
13591359
find-up "^5.0.0"
@@ -1412,30 +1412,30 @@
14121412
semver "^7.3.5"
14131413
typescript-memoize "^1.0.1"
14141414

1415-
"@embroider/shared-internals@0.48.1":
1416-
version "0.48.1"
1417-
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.48.1.tgz#4f0dcde8dba2fa47c862746898a1846a31e27f80"
1418-
integrity sha512-6Q73QXGUQianIb3xRpMNl8VMECSatA1NhjXxeIyYzwKraWhhMBpXvysLpbJ8ib1rQe1ajmkoDdXgT5pAnVMXrg==
1415+
"@embroider/shared-internals@0.49.0":
1416+
version "0.49.0"
1417+
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.49.0.tgz#c9e179b33b3e036b064e72b69639e48d53984229"
1418+
integrity sha512-uCDB2rw45xinctS5JOTsl7DF6yxlMc3RlZF/jkNeiGUrphCr0T1CMnUSnQvDAWkdMjvTuOEIWFb/e56h2NBWvw==
14191419
dependencies:
1420-
babel-import-util "^0.2.0"
1420+
babel-import-util "^1.1.0"
14211421
ember-rfc176-data "^0.3.17"
14221422
fs-extra "^9.1.0"
14231423
lodash "^4.17.21"
14241424
resolve-package-path "^4.0.1"
14251425
semver "^7.3.5"
14261426
typescript-memoize "^1.0.1"
14271427

1428-
"@embroider/webpack@0.48.1":
1429-
version "0.48.1"
1430-
resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.48.1.tgz#82226920a6b2a536e07a34d776bc86f077e261f4"
1431-
integrity sha512-50vFm3e/KliysfNInoSHwK/ULBohmwI7wR7to+uLdvPiO9LCvb//YSEbjD3jRrU9JEkfUVpA5XbUFYEA4vQDcQ==
1428+
"@embroider/webpack@0.49.0":
1429+
version "0.49.0"
1430+
resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.49.0.tgz#eee4b3ac2056316388e9d44786c94fab1e9c8195"
1431+
integrity sha512-1Mj+//AlnpCsUp44JG9hqLdYLKFLU3qBGVhAlXAgLf7BHzU5fbcbFrgZGdnYqrgmPb9jGpyWNHe+Av0ChVo6VA==
14321432
dependencies:
14331433
"@babel/core" "^7.14.5"
14341434
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
14351435
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
1436-
"@embroider/babel-loader-8" "0.48.1"
1437-
"@embroider/hbs-loader" "0.48.1"
1438-
"@embroider/shared-internals" "0.48.1"
1436+
"@embroider/babel-loader-8" "0.49.0"
1437+
"@embroider/hbs-loader" "0.49.0"
1438+
"@embroider/shared-internals" "0.49.0"
14391439
"@types/source-map" "^0.5.7"
14401440
"@types/supports-color" "^8.1.0"
14411441
babel-loader "^8.2.2"
@@ -3339,6 +3339,11 @@ babel-import-util@^0.2.0:
33393339
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
33403340
integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
33413341

3342+
babel-import-util@^1.1.0:
3343+
version "1.1.0"
3344+
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93"
3345+
integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA==
3346+
33423347
babel-loader@8, babel-loader@^8.0.6, babel-loader@^8.2.2:
33433348
version "8.2.3"
33443349
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"

0 commit comments

Comments
 (0)