Skip to content

Commit 02067a4

Browse files
committed
Auto merge of #4549 - rust-lang:renovate/embroider-monorepo, r=Turbo87
Update embroider monorepo to v1.2.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://github.com/embroider-build/embroider)` | [`1.1.0` -> `1.2.0`](https://renovatebot.com/diffs/npm/`@embroider%2fcompat/1.1.0/1.2.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/1.2.0/compatibility-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/1.2.0/confidence-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/)` | | [`@embroider/core](https://github.com/embroider-build/embroider)` | [`1.1.0` -> `1.2.0`](https://renovatebot.com/diffs/npm/`@embroider%2fcore/1.1.0/1.2.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/1.2.0/compatibility-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/1.2.0/confidence-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/)` | | [`@embroider/webpack](https://github.com/embroider-build/embroider)` | [`1.1.0` -> `1.2.0`](https://renovatebot.com/diffs/npm/`@embroider%2fwebpack/1.1.0/1.2.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/1.2.0/compatibility-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/1.2.0/confidence-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/)` | --- ### Release Notes <details> <summary>embroider-build/embroider</summary> ### [`v1.2.0`](https://github.com/embroider-build/embroider/blob/HEAD/CHANGELOG.md#v120-2022-02-10) [Compare Source](https://github.com/embroider-build/embroider/compare/v1.1.0...v1.2.0) ##### 🚀 Enhancement - `compat` - [#&#8203;1124](https://github.com/embroider-build/embroider/pull/1124) improving ember-data compatibility & test coverage ([`@&#8203;ef4](https://github.com/ef4))` - `macros` - [#&#8203;1119](https://github.com/embroider-build/embroider/pull/1119) Reuse the `loc` of the macroMaybeAttrs hashes for the created attributes ([`@&#8203;Windvis](https://github.com/Windvis))` ##### 📝 Documentation - [#&#8203;1122](https://github.com/embroider-build/embroider/pull/1122) small nitpicking edits in doc ([`@&#8203;angelayanpan](https://github.com/angelayanpan))` ##### 🏠 Internal - `macros` - [#&#8203;1123](https://github.com/embroider-build/embroider/pull/1123) Regenerate yarn.lock ([`@&#8203;ef4](https://github.com/ef4))` ##### Committers: 3 - Angela Pan ([`@&#8203;angelayanpan](https://github.com/angelayanpan))` - Edward Faulkner ([`@&#8203;ef4](https://github.com/ef4))` - Sam Van Campenhout ([`@&#8203;Windvis](https://github.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 414d61f + 51bbd62 commit 02067a4

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
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.4",
5858
"@ember/test-helpers": "2.6.0",
5959
"@ember/test-waiters": "3.0.1",
60-
"@embroider/compat": "1.1.0",
61-
"@embroider/core": "1.1.0",
62-
"@embroider/webpack": "1.1.0",
60+
"@embroider/compat": "1.2.0",
61+
"@embroider/core": "1.2.0",
62+
"@embroider/webpack": "1.2.0",
6363
"@glimmer/component": "1.0.4",
6464
"@glimmer/tracking": "1.0.4",
6565
"@percy/cli": "1.0.0-beta.74",

yarn.lock

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,29 +1182,29 @@
11821182
ember-cli-version-checker "^5.1.2"
11831183
semver "^7.3.5"
11841184

1185-
"@embroider/babel-loader-8@1.1.0":
1186-
version "1.1.0"
1187-
resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-1.1.0.tgz#54594c1b564f5592b2e9a2332f8e9a96171afb43"
1188-
integrity sha512-Fw0quc/nCsGy7EAxp5iM3Twn/qs3Z9XhvyvkNtd3BsDsWmHj1TB4QGiv1HmhUz5mAS0MyJXgMQ0nCtwyI2YqPg==
1185+
"@embroider/babel-loader-8@1.2.0":
1186+
version "1.2.0"
1187+
resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-1.2.0.tgz#9dc7832004c095b0178d5847de3a38fefea2aa2b"
1188+
integrity sha512-M13kT0sKULUItmNUKILo5/cdmkgU5DuXk5ifZui7LZfADcy/7TPnuwuJv3Tda0tyXLFIgEarXnEBw0RyuJ+2Nw==
11891189
dependencies:
11901190
"@babel/core" "^7.14.5"
11911191
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
11921192
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
1193-
"@embroider/core" "1.1.0"
1193+
"@embroider/core" "1.2.0"
11941194
babel-loader "8"
11951195

1196-
"@embroider/compat@1.1.0":
1197-
version "1.1.0"
1198-
resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-1.1.0.tgz#0aac3cadb570f1ff03d350f266fbf599b4b9a88c"
1199-
integrity sha512-kQ8UMiiU83Ho2pAE8k35xdAQZGVKAFauaOHfyd0Wx2wllRaLabjFZsxVfOGeiGQ57nl1n1zzK7LeKMVDLWWnVA==
1196+
"@embroider/compat@1.2.0":
1197+
version "1.2.0"
1198+
resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-1.2.0.tgz#1abecaa6d0fda4ae14415e5081f2f4947fac76bd"
1199+
integrity sha512-i2swTSuKkkGke9mQ1xPjtUikgo3HqOche0g/WaZoLv2lonu8aiV+DAJCKU+r0v0x7Ivo6aIKUtw4t0/TPYWYYw==
12001200
dependencies:
12011201
"@babel/code-frame" "^7.14.5"
12021202
"@babel/core" "^7.14.5"
12031203
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
12041204
"@babel/preset-env" "^7.14.5"
12051205
"@babel/traverse" "^7.14.5"
1206-
"@embroider/macros" "1.1.0"
1207-
"@embroider/shared-internals" "1.1.0"
1206+
"@embroider/macros" "1.2.0"
1207+
"@embroider/shared-internals" "1.2.0"
12081208
"@types/babel__code-frame" "^7.0.2"
12091209
"@types/yargs" "^17.0.3"
12101210
assert-never "^1.1.0"
@@ -1235,19 +1235,19 @@
12351235
walk-sync "^3.0.0"
12361236
yargs "^17.0.1"
12371237

1238-
"@embroider/core@1.1.0":
1239-
version "1.1.0"
1240-
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-1.1.0.tgz#f0bb306ea0ced01a136950ad030c447ef2eef502"
1241-
integrity sha512-E5eIENbHNy2/o9VnxAMJNHs+BED/HW1ndM7kqgae7STx5QCLvTGddGAUCQ4tHzcUbSmv01locAsKRWujhEeOiw==
1238+
"@embroider/core@1.2.0":
1239+
version "1.2.0"
1240+
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-1.2.0.tgz#38b842651d6654bd347ccd187941b6845b8644ff"
1241+
integrity sha512-Z+raixqpH3JnhRyHBj0QuekX/vJz1xz3qhJAYlLsRV5COXqzR55lZephCpQnYDs/66JegHPPIffP3v5dbmEU4A==
12421242
dependencies:
12431243
"@babel/core" "^7.14.5"
12441244
"@babel/parser" "^7.14.5"
12451245
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
12461246
"@babel/plugin-transform-runtime" "^7.14.5"
12471247
"@babel/runtime" "^7.14.5"
12481248
"@babel/traverse" "^7.14.5"
1249-
"@embroider/macros" "1.1.0"
1250-
"@embroider/shared-internals" "1.1.0"
1249+
"@embroider/macros" "1.2.0"
1250+
"@embroider/shared-internals" "1.2.0"
12511251
assert-never "^1.2.1"
12521252
babel-import-util "^1.1.0"
12531253
babel-plugin-ember-template-compilation "^1.0.0"
@@ -1272,17 +1272,17 @@
12721272
walk-sync "^3.0.0"
12731273
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
12741274

1275-
"@embroider/hbs-loader@1.1.0":
1276-
version "1.1.0"
1277-
resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-1.1.0.tgz#52e69d9738135e26059c88b51ae6f6e405fa4eee"
1278-
integrity sha512-1PHwPinVzILFpGyhr4etZqAcTfMcj9urvjcjjBdPi3DSQRSLWENAUGGCioH8ME4PW48mcci9PaukLyW1HfKrng==
1275+
"@embroider/hbs-loader@1.2.0":
1276+
version "1.2.0"
1277+
resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-1.2.0.tgz#73ef5ed18c22ca1ffcfeaf04e505f75ddc640eaf"
1278+
integrity sha512-xM/piVIQzyhZEVbwLkhZSYt8y0KOHDvY0AXoieia6VwRhNXb/P1q92qDO+uNodNRpq3/aJfkmbgWukiLjkF9rw==
12791279

1280-
"@embroider/macros@1.1.0", "@embroider/macros@^1.0.0":
1281-
version "1.1.0"
1282-
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.1.0.tgz#4e11a8a38be9ac20f20c9a09a8df7e97b47ede13"
1283-
integrity sha512-YwOKpgRjoFee7DMHFvAaE8xZVdlft0wcwGGsqW4oqiisfoHaf3YIpCDNy7aYFm9CoZseq827mxyjejxiOEmJaQ==
1280+
"@embroider/macros@1.2.0", "@embroider/macros@^1.0.0":
1281+
version "1.2.0"
1282+
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.2.0.tgz#9a2d99225fba6dcb69e795cddad9f4948c2a2b6b"
1283+
integrity sha512-WD2V3OKXZB73OymI/zC2+MbqIYaAskhjtSOVVY6yG6kWILyVsJ6+fcbNHEnZyGqs4sm0TvHVJfevmA2OXV8Pww==
12841284
dependencies:
1285-
"@embroider/shared-internals" "1.1.0"
1285+
"@embroider/shared-internals" "1.2.0"
12861286
assert-never "^1.2.1"
12871287
babel-import-util "^1.1.0"
12881288
ember-cli-babel "^7.26.6"
@@ -1316,10 +1316,10 @@
13161316
semver "^7.3.2"
13171317
typescript-memoize "^1.0.0-alpha.3"
13181318

1319-
"@embroider/shared-internals@1.1.0", "@embroider/shared-internals@^1.0.0":
1320-
version "1.1.0"
1321-
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.1.0.tgz#ffacee101bd051610e4990dd5d819300c2a9fbab"
1322-
integrity sha512-dLSUcNOwkYAsLMVOrBjgOicSuXF4LPmqLu+RSNZ+cbujvisGT4r/2C/VGL0QT38MYb4zELGuTH13j9wOTBS2Kw==
1319+
"@embroider/shared-internals@1.2.0", "@embroider/shared-internals@^1.0.0":
1320+
version "1.2.0"
1321+
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.2.0.tgz#edb3ca7e8528be713dab01818e8caad2dc937fba"
1322+
integrity sha512-11RfGuXxT+m2xPcpny/ENHjw53CuKPcrx7222LFQ53+I09hLxsvPCsH8be5E99LePDA46YGX41vxOxxfowD4OQ==
13231323
dependencies:
13241324
babel-import-util "^1.1.0"
13251325
ember-rfc176-data "^0.3.17"
@@ -1329,17 +1329,17 @@
13291329
semver "^7.3.5"
13301330
typescript-memoize "^1.0.1"
13311331

1332-
"@embroider/webpack@1.1.0":
1333-
version "1.1.0"
1334-
resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-1.1.0.tgz#13b56fea59cc83a827848af835feb33f0f5fb494"
1335-
integrity sha512-72nDRiLcuUqn3XpUyaGvmFbKUO+W2MDbq4wTPSHCaAUpQBLVDIvRW6IzCGWMMvlL9BoFjmMO5T6KUPbockLXmg==
1332+
"@embroider/webpack@1.2.0":
1333+
version "1.2.0"
1334+
resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-1.2.0.tgz#6bb04b34817f3154bc34c7463d3b928d0ae76ae5"
1335+
integrity sha512-bBVY4qpWX4rl41ss+qZZcBmDySzgH31NefaBFTQ5PvWcL71hG/9ZDWhy0V/+JzFCWT0plJkikSKeDPR+C2aImw==
13361336
dependencies:
13371337
"@babel/core" "^7.14.5"
13381338
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
13391339
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
1340-
"@embroider/babel-loader-8" "1.1.0"
1341-
"@embroider/hbs-loader" "1.1.0"
1342-
"@embroider/shared-internals" "1.1.0"
1340+
"@embroider/babel-loader-8" "1.2.0"
1341+
"@embroider/hbs-loader" "1.2.0"
1342+
"@embroider/shared-internals" "1.2.0"
13431343
"@types/source-map" "^0.5.7"
13441344
"@types/supports-color" "^8.1.0"
13451345
babel-loader "^8.2.2"

0 commit comments

Comments
 (0)