Skip to content

Commit 4e79ede

Browse files
borsbors
committed
Auto merge of #4242 - rust-lang:renovate/embroider-monorepo, r=Turbo87
Update embroider monorepo to v0.48.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.47.2` -> `0.48.0`](https://renovatebot.com/diffs/npm/`@embroider%2fcompat/0.47.2/0.48.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.48.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.48.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.48.0/compatibility-slim/0.47.2)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.48.0/confidence-slim/0.47.2)](https://docs.renovatebot.com/merge-confidence/)` | | [`@embroider/core](https://togithub.com/embroider-build/embroider)` | [`0.47.2` -> `0.48.0`](https://renovatebot.com/diffs/npm/`@embroider%2fcore/0.47.2/0.48.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.48.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.48.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.48.0/compatibility-slim/0.47.2)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.48.0/confidence-slim/0.47.2)](https://docs.renovatebot.com/merge-confidence/)` | | [`@embroider/webpack](https://togithub.com/embroider-build/embroider)` | [`0.47.2` -> `0.48.0`](https://renovatebot.com/diffs/npm/`@embroider%2fwebpack/0.47.2/0.48.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.48.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.48.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.48.0/compatibility-slim/0.47.2)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.48.0/confidence-slim/0.47.2)](https://docs.renovatebot.com/merge-confidence/)` | --- ### Release Notes <details> <summary>embroider-build/embroider</summary> ### [`v0.48.0`](https://togithub.com/embroider-build/embroider/blob/master/CHANGELOG.md#v0480-2021-12-07) [Compare Source](https://togithub.com/embroider-build/embroider/compare/v0.47.2...v0.48.0) ##### 🚀 Enhancement - `compat`, `core`, `router` - [#&#8203;1021](https://togithub.com/embroider-build/embroider/pull/1021) Add `staticModifiers` option ([`@&#8203;Windvis](https://togithub.com/Windvis))` ##### 🐛 Bug Fix - `compat` - [#&#8203;1029](https://togithub.com/embroider-build/embroider/pull/1029) Don't resolve built-in components when used with the component helper ([`@&#8203;Windvis](https://togithub.com/Windvis))` - [#&#8203;1030](https://togithub.com/embroider-build/embroider/pull/1030) fix the ember-get-config compat adapter ([`@&#8203;ef4](https://togithub.com/ef4))` - [#&#8203;1035](https://togithub.com/embroider-build/embroider/pull/1035) Optimize ember-cli-babel handling ([`@&#8203;ef4](https://togithub.com/ef4))` ##### 📝 Documentation - `macros` - [#&#8203;1031](https://togithub.com/embroider-build/embroider/pull/1031) Add `isTesting` and `isDevelopingApp` to readme ([`@&#8203;mydea](https://togithub.com/mydea))` ##### 🏠 Internal - `router` - [#&#8203;1027](https://togithub.com/embroider-build/embroider/pull/1027) ``@embroider/router`` Ember 4 CI job compatibility ([`@&#8203;Windvis](https://togithub.com/Windvis))` ##### Committers: 3 - Edward Faulkner ([`@&#8203;ef4](https://togithub.com/ef4))` - Francesco Novy ([`@&#8203;mydea](https://togithub.com/mydea))` - Sam Van Campenhout ([`@&#8203;Windvis](https://togithub.com/Windvis))` </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 4353665 + 747655f commit 4e79ede

File tree

2 files changed

+62
-36
lines changed

2 files changed

+62
-36
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.0",
5858
"@ember/test-helpers": "2.6.0",
5959
"@ember/test-waiters": "3.0.0",
60-
"@embroider/compat": "0.47.2",
61-
"@embroider/core": "0.47.2",
62-
"@embroider/webpack": "0.47.2",
60+
"@embroider/compat": "0.48.0",
61+
"@embroider/core": "0.48.0",
62+
"@embroider/webpack": "0.48.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: 59 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,29 +1189,29 @@
11891189
ember-cli-version-checker "^5.1.2"
11901190
semver "^7.3.5"
11911191

1192-
"@embroider/babel-loader-8@0.47.2":
1193-
version "0.47.2"
1194-
resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-0.47.2.tgz#e8070224a986576d05f62ea2aa0714eb45cba5f6"
1195-
integrity sha512-/WEJQiwW1UUo+ANqtKK7o0OdF93fDlPey37St2dGz7NMdjnM8tfV2YZWgwFWK5dBslL5eOMjpKLM3NyFud91IQ==
1192+
"@embroider/babel-loader-8@0.48.0":
1193+
version "0.48.0"
1194+
resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-0.48.0.tgz#4fc1180bd6b6c4d484d3c8256b87a63a09e9319e"
1195+
integrity sha512-8HE14t0ZqqT/VOE+6FwBtmNa92+FacgndnG0Xh+syFyNEWoQy3vAIAj3EQcYch5fqlFoi32PX+xOjOK66pAK7Q==
11961196
dependencies:
11971197
"@babel/core" "^7.14.5"
11981198
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
11991199
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
1200-
"@embroider/core" "0.47.2"
1200+
"@embroider/core" "0.48.0"
12011201
babel-loader "8"
12021202

1203-
"@embroider/compat@0.47.2":
1204-
version "0.47.2"
1205-
resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.47.2.tgz#1f5710ee0f2cea62cd28fdab6844cca5e43c74e0"
1206-
integrity sha512-E8jpBk2aSIdzCpuuDQU8So1ZYRkcinPXy3ya2P+dt6R0rP/JOsz2ggjDtQDywdMn7yLWKZcHmh31HQfDL1wKSw==
1203+
"@embroider/compat@0.48.0":
1204+
version "0.48.0"
1205+
resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.48.0.tgz#bf172cb26357474827a4c7f3cefc7a8ae10dff70"
1206+
integrity sha512-mFoGh8tl3eNS8c5VK4vxOQ58WLVlYaoj+VBOzZRSJ921infzlY40ZZJzrWvXVuNH6xjbh+X9HNK9UCH2DqY4RQ==
12071207
dependencies:
12081208
"@babel/code-frame" "^7.14.5"
12091209
"@babel/core" "^7.14.5"
12101210
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
12111211
"@babel/preset-env" "^7.14.5"
12121212
"@babel/traverse" "^7.14.5"
1213-
"@embroider/macros" "0.47.2"
1214-
"@embroider/shared-internals" "0.47.2"
1213+
"@embroider/macros" "0.48.0"
1214+
"@embroider/shared-internals" "0.48.0"
12151215
"@types/babel__code-frame" "^7.0.2"
12161216
"@types/yargs" "^17.0.3"
12171217
assert-never "^1.1.0"
@@ -1282,19 +1282,19 @@
12821282
walk-sync "^1.1.3"
12831283
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
12841284

1285-
"@embroider/core@0.47.2":
1286-
version "0.47.2"
1287-
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.47.2.tgz#333c77b377892c41e16a21ade7eedc2c5f8b97a2"
1288-
integrity sha512-93zjU1uovLFkokSWwygUZEC21lHs4pNSyTYaVqp0o0I7f6Gzh+grTjkCsaYCUjnHOIORGUb7LVX2clBnOmwTLg==
1285+
"@embroider/core@0.48.0":
1286+
version "0.48.0"
1287+
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.48.0.tgz#0da0afab5a4dd8416620713ce1c944a1267315b5"
1288+
integrity sha512-4pshhhRri2hzE0vnl4E3DI+QPkYDwH36K2xAG+hNhHvMosJxHvQD8xm/5obgj6dL1dhbHYpQiLd6Bv2zQd8qVA==
12891289
dependencies:
12901290
"@babel/core" "^7.14.5"
12911291
"@babel/parser" "^7.14.5"
12921292
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
12931293
"@babel/plugin-transform-runtime" "^7.14.5"
12941294
"@babel/runtime" "^7.14.5"
12951295
"@babel/traverse" "^7.14.5"
1296-
"@embroider/macros" "0.47.2"
1297-
"@embroider/shared-internals" "0.47.2"
1296+
"@embroider/macros" "0.48.0"
1297+
"@embroider/shared-internals" "0.48.0"
12981298
assert-never "^1.2.1"
12991299
babel-import-util "^0.2.0"
13001300
babel-plugin-ember-template-compilation "^1.0.0"
@@ -1319,10 +1319,10 @@
13191319
walk-sync "^3.0.0"
13201320
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
13211321

1322-
"@embroider/hbs-loader@0.47.2":
1323-
version "0.47.2"
1324-
resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-0.47.2.tgz#e1d8281185c75db63f9d6e4c82e3de0524d39487"
1325-
integrity sha512-4n/2SrWZW5tPbpcx1rmPJlz6B5TFn3oR9/7t4RYUq99GYjkjAn4wNekNtNU0V3y2Y6kbJrVG8jpAVVRVWblFGA==
1322+
"@embroider/hbs-loader@0.48.0":
1323+
version "0.48.0"
1324+
resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-0.48.0.tgz#064a60d796b36940de0573b3e95007ac94a7ce69"
1325+
integrity sha512-ZTbItRClUUDiiZdIR6Fo5KaVXSLxwx5ywt528MNKsUvaq9Z52o6Hd6MahSn7j6Ufmc1gdqzqa4EKvoF/ml0DCg==
13261326

13271327
"@embroider/macros@0.33.0":
13281328
version "0.33.0"
@@ -1339,12 +1339,12 @@
13391339
resolve "^1.8.1"
13401340
semver "^7.3.2"
13411341

1342-
"@embroider/macros@0.47.2", "@embroider/macros@^0.47.0":
1343-
version "0.47.2"
1344-
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.47.2.tgz#23cbe92cac3c24747f054e1eea2a22538bf7ebd0"
1345-
integrity sha512-ViNWluJCeM5OPlM3rs8kdOz3RV5rpfXX5D2rDnc/q86xRS0xf4NFEjYRV7W6fBcD0b3v5jSHDTwrjq9Kee4rHg==
1342+
"@embroider/macros@0.48.0":
1343+
version "0.48.0"
1344+
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.48.0.tgz#c826a9d51530aef3e7c58a99c394005e997f874b"
1345+
integrity sha512-wpfrE9WuYblZIRrr0dV6Ix3d5irexw6UodKI2LGgxziw83qDuLqzoymPfhVVdJocXUc4VU9R+kj4J2YB7zyZoQ==
13461346
dependencies:
1347-
"@embroider/shared-internals" "0.47.2"
1347+
"@embroider/shared-internals" "0.48.0"
13481348
assert-never "^1.2.1"
13491349
ember-cli-babel "^7.26.6"
13501350
find-up "^5.0.0"
@@ -1364,6 +1364,19 @@
13641364
resolve "^1.8.1"
13651365
semver "^7.3.2"
13661366

1367+
"@embroider/macros@^0.47.0":
1368+
version "0.47.2"
1369+
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.47.2.tgz#23cbe92cac3c24747f054e1eea2a22538bf7ebd0"
1370+
integrity sha512-ViNWluJCeM5OPlM3rs8kdOz3RV5rpfXX5D2rDnc/q86xRS0xf4NFEjYRV7W6fBcD0b3v5jSHDTwrjq9Kee4rHg==
1371+
dependencies:
1372+
"@embroider/shared-internals" "0.47.2"
1373+
assert-never "^1.2.1"
1374+
ember-cli-babel "^7.26.6"
1375+
find-up "^5.0.0"
1376+
lodash "^4.17.21"
1377+
resolve "^1.20.0"
1378+
semver "^7.3.2"
1379+
13671380
"@embroider/shared-internals@0.40.0", "@embroider/shared-internals@^0.40.0":
13681381
version "0.40.0"
13691382
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
@@ -1390,17 +1403,30 @@
13901403
semver "^7.3.5"
13911404
typescript-memoize "^1.0.1"
13921405

1393-
"@embroider/webpack@0.47.2":
1394-
version "0.47.2"
1395-
resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.47.2.tgz#9762ef4a784537c88035172a2e48775d12357235"
1396-
integrity sha512-Y0AIkUfsNCcEnI8LuuYOTK7g88RkbyMtwyfzZGVBw1SULmg2TSGP69d9xJMZgSf+ffGAkbnjlDSbJFIUkWWWiw==
1406+
"@embroider/shared-internals@0.48.0":
1407+
version "0.48.0"
1408+
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.48.0.tgz#398d653b5b382232d2bf14658ec2880195a67356"
1409+
integrity sha512-kd5EHqHb0lX0S/Cn+HdPBpv3LWaELxENFCQ6JwR/FgCFrXZq+quHmYyoOAFcxDDHSr8Z6NJJMMUoU3mceQs/6Q==
1410+
dependencies:
1411+
babel-import-util "^0.2.0"
1412+
ember-rfc176-data "^0.3.17"
1413+
fs-extra "^9.1.0"
1414+
lodash "^4.17.21"
1415+
resolve-package-path "^4.0.1"
1416+
semver "^7.3.5"
1417+
typescript-memoize "^1.0.1"
1418+
1419+
"@embroider/webpack@0.48.0":
1420+
version "0.48.0"
1421+
resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.48.0.tgz#0c0b5545d7bafd356969f97996b6f528f6cd828f"
1422+
integrity sha512-9llqJd84951qI/99UGY2nNMv5FzqfSAC30/z/cqqKiHnKstBMCDclT7Y/8HjG9um+5WN4bhtTltoI8Zh4VBbQw==
13971423
dependencies:
13981424
"@babel/core" "^7.14.5"
13991425
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
14001426
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
1401-
"@embroider/babel-loader-8" "0.47.2"
1402-
"@embroider/hbs-loader" "0.47.2"
1403-
"@embroider/shared-internals" "0.47.2"
1427+
"@embroider/babel-loader-8" "0.48.0"
1428+
"@embroider/hbs-loader" "0.48.0"
1429+
"@embroider/shared-internals" "0.48.0"
14041430
"@types/source-map" "^0.5.7"
14051431
"@types/supports-color" "^8.1.0"
14061432
babel-loader "^8.2.2"

0 commit comments

Comments
 (0)