Skip to content

Commit 0e427f0

Browse files
committed
Auto merge of #3383 - rust-lang:renovate/embroider-monorepo, r=Turbo87
Update embroider monorepo to v0.37.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.36.0` -> `0.37.0`](https://renovatebot.com/diffs/npm/`@embroider%2fcompat/0.36.0/0.37.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.37.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.37.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.37.0/compatibility-slim/0.36.0)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fcompat/0.37.0/confidence-slim/0.36.0)](https://docs.renovatebot.com/merge-confidence/)` | | [`@embroider/core](https://togithub.com/embroider-build/embroider)` | [`0.36.0` -> `0.37.0`](https://renovatebot.com/diffs/npm/`@embroider%2fcore/0.36.0/0.37.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.37.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.37.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.37.0/compatibility-slim/0.36.0)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fcore/0.37.0/confidence-slim/0.36.0)](https://docs.renovatebot.com/merge-confidence/)` | | [`@embroider/webpack](https://togithub.com/embroider-build/embroider)` | [`0.36.0` -> `0.37.0`](https://renovatebot.com/diffs/npm/`@embroider%2fwebpack/0.36.0/0.37.0)` | [![age](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.37.0/age-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![adoption](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.37.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)` | [![passing](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.37.0/compatibility-slim/0.36.0)](https://docs.renovatebot.com/merge-confidence/)` | [![confidence](https://badges.renovateapi.com/packages/npm/`@embroider%2fwebpack/0.37.0/confidence-slim/0.36.0)](https://docs.renovatebot.com/merge-confidence/)` | --- ### Release Notes <details> <summary>embroider-build/embroider</summary> ### [`v0.37.0`](https://togithub.com/embroider-build/embroider/blob/master/CHANGELOG.md#v0370-2021-03-08) [Compare Source](https://togithub.com/embroider-build/embroider/compare/v0.36.0...v0.37.0) ##### 🚀 Enhancement - `core` - [#&#8203;713](https://togithub.com/embroider-build/embroider/pull/713) Avoid monkey patching template compiler for 3.24.3 and 3.25.2+. ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - [#&#8203;705](https://togithub.com/embroider-build/embroider/pull/705) Avoid patching the template compiler on Ember 3.26. ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - [#&#8203;700](https://togithub.com/embroider-build/embroider/pull/700) TemplateCompiler fixes / improvements (avoid monkey patch for Ember 3.27+) ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - `macros` - [#&#8203;712](https://togithub.com/embroider-build/embroider/pull/712) Allow macroCondition inside modifier ([`@&#8203;simonihmig](https://togithub.com/simonihmig))` - [#&#8203;694](https://togithub.com/embroider-build/embroider/pull/694) Run importSync transform later, so ember-auto-import can support importSync ([`@&#8203;simonihmig](https://togithub.com/simonihmig))` ##### 🐛 Bug Fix - `compat` - [#&#8203;710](https://togithub.com/embroider-build/embroider/pull/710) Fix case where `autoRun` is `false` but no other addon set content into the `{{content-for 'app-boot'}}` ([`@&#8203;thoov](https://togithub.com/thoov))` - [#&#8203;674](https://togithub.com/embroider-build/embroider/pull/674) adjust paths seen by css preprocessors ([`@&#8203;ef4](https://togithub.com/ef4))` - [#&#8203;702](https://togithub.com/embroider-build/embroider/pull/702) Handle case where node_modules are symlinked ([`@&#8203;thoov](https://togithub.com/thoov))` - [#&#8203;690](https://togithub.com/embroider-build/embroider/pull/690) Exclude 'babel-plugin-compact-reexports' during Stage 1 build ([`@&#8203;charlespierce](https://togithub.com/charlespierce))` - [#&#8203;687](https://togithub.com/embroider-build/embroider/pull/687) Strip `main` field from v1 addons' `package.json` once they are rewritten as V2 ([`@&#8203;ef4](https://togithub.com/ef4))` - `compat`, `core` - [#&#8203;709](https://togithub.com/embroider-build/embroider/pull/709) Fix the path to the on-disk styles file for in-repo engines ([`@&#8203;charlespierce](https://togithub.com/charlespierce))` - `core` - [#&#8203;686](https://togithub.com/embroider-build/embroider/pull/686) Prevent accidental duplication of babel plugin during rebuilds ([`@&#8203;ef4](https://togithub.com/ef4))` ##### 🏠 Internal - `compat` - [#&#8203;706](https://togithub.com/embroider-build/embroider/pull/706) Remove `ember-cli-htmlbars` dependency in ``@embroider/compat`.` ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - Other - [#&#8203;711](https://togithub.com/embroider-build/embroider/pull/711) Add release automation setup. ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - [#&#8203;704](https://togithub.com/embroider-build/embroider/pull/704) Avoid running CI jobs on both push and pull_request events. ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - [#&#8203;697](https://togithub.com/embroider-build/embroider/pull/697) Refactor suite-setup-util to avoid knock on errors. ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - `core`, `macros` - [#&#8203;707](https://togithub.com/embroider-build/embroider/pull/707) Fixup types for newer [`@&#8203;babel/types](https://togithub.com/babel/types).` ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - `router`, `util` - [#&#8203;703](https://togithub.com/embroider-build/embroider/pull/703) Add 3.20 and 3.24 to list of matrix tests. ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` ##### Committers: 5 - Charles Pierce ([`@&#8203;charlespierce](https://togithub.com/charlespierce))` - Edward Faulkner ([`@&#8203;ef4](https://togithub.com/ef4))` - Robert Jackson ([`@&#8203;rwjblue](https://togithub.com/rwjblue))` - Simon Ihmig ([`@&#8203;simonihmig](https://togithub.com/simonihmig))` - Travis Hoover ([`@&#8203;thoov](https://togithub.com/thoov))` </details> --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- 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 03666dd + 7fd48ce commit 0e427f0

File tree

2 files changed

+88
-36
lines changed

2 files changed

+88
-36
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
"@ember/optional-features": "2.0.0",
5353
"@ember/render-modifiers": "1.0.2",
5454
"@ember/test-helpers": "2.2.3",
55-
"@embroider/compat": "0.36.0",
56-
"@embroider/core": "0.36.0",
57-
"@embroider/webpack": "0.36.0",
55+
"@embroider/compat": "0.37.0",
56+
"@embroider/core": "0.37.0",
57+
"@embroider/webpack": "0.37.0",
5858
"@glimmer/component": "1.0.4",
5959
"@glimmer/tracking": "1.0.4",
6060
"@percy/ember": "2.1.4",

yarn.lock

Lines changed: 85 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,26 +1145,26 @@
11451145
ember-cli-version-checker "^5.1.2"
11461146
semver "^7.3.2"
11471147

1148-
"@embroider/babel-loader-7@0.36.0":
1149-
version "0.36.0"
1150-
resolved "https://registry.yarnpkg.com/@embroider/babel-loader-7/-/babel-loader-7-0.36.0.tgz#7f9d3a789fa9965363778e231ad43f4793e3616c"
1151-
integrity sha512-G7jGfawIZbgUIY5zd5GHxmI23rj3Ks8PPN4o3R/71ppLwY/2Tm5ETmxMM7C8SuV3jTV/tsQZDddkssZ1VLPK2w==
1148+
"@embroider/babel-loader-7@0.37.0":
1149+
version "0.37.0"
1150+
resolved "https://registry.yarnpkg.com/@embroider/babel-loader-7/-/babel-loader-7-0.37.0.tgz#4490858e02c969f741be5eb1be6308e1e8d66939"
1151+
integrity sha512-wfcRlRvdeqL4mDhY0pAcQfw4YH2FAWQhCQ6WzspoLFj/dBPpa5VylUYwP8KYVLfnxHj32A8KY+6ajmandgC9kw==
11521152
dependencies:
11531153
babel-core "^6.26.3"
11541154
babel-loader "7"
11551155

1156-
"@embroider/compat@0.36.0":
1157-
version "0.36.0"
1158-
resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.36.0.tgz#e6942fee900a8b508d4686ea9732c74429577057"
1159-
integrity sha512-7IMGfbbCnbsyVXcTHIl4KfDDzk4f1iFx78TZTibdUDJO2yT5rb0x21cYRi0vaERFCx5wN3NdRjJn3SjjLQo0zQ==
1156+
"@embroider/compat@0.37.0":
1157+
version "0.37.0"
1158+
resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.37.0.tgz#c59d93d22a009d7d9831617c085755e4058802bf"
1159+
integrity sha512-R7pBgQ6JNM5tNX8qAIyCVoiOIOSl8/sD6pL3noPxoA6JT/1sOPttioV1DBhOdd88SyoLOY49v9R6OowkmuNPpg==
11601160
dependencies:
11611161
"@babel/code-frame" "^7.10.4"
11621162
"@babel/core" "^7.12.3"
11631163
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
11641164
"@babel/preset-env" "^7.12.1"
11651165
"@babel/traverse" "^7.12.1"
11661166
"@babel/types" "^7.12.1"
1167-
"@embroider/macros" "0.36.0"
1167+
"@embroider/macros" "0.37.0"
11681168
"@types/babel__code-frame" "^7.0.2"
11691169
"@types/yargs" "^15.0.9"
11701170
assert-never "^1.1.0"
@@ -1181,8 +1181,6 @@
11811181
broccoli-source "^3.0.0"
11821182
chalk "^4.1.0"
11831183
debug "^3.1.0"
1184-
ember-cli-htmlbars "^4.0.9"
1185-
ember-cli-htmlbars-3 "npm:ember-cli-htmlbars@3"
11861184
fs-extra "^7.0.0"
11871185
fs-tree-diff "^2.0.0"
11881186
jsdom "^16.4.0"
@@ -1275,10 +1273,49 @@
12751273
walk-sync "^1.1.3"
12761274
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
12771275

1278-
"@embroider/[email protected]":
1279-
version "0.36.0"
1280-
resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-0.36.0.tgz#0d5daae298b247763d518d3d2e480a5d97f8c5ed"
1281-
integrity sha512-B1z6+wo1k/t9q/rj05p3i79jXfMd5dadf365rnVaWSz1NyuTNhuFDU+j2zOKrQmLpccMyGauA3DHGsHvt3tYcg==
1276+
"@embroider/[email protected]":
1277+
version "0.37.0"
1278+
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.37.0.tgz#bd7a7d63795794ffcd53d90a65b81e939ccf6cff"
1279+
integrity sha512-tkXD7qV9GJYb7cGlxLT4PTbPZ+B4vNDXp5oHyEz8EQSuZExN/40Hm90S5KrEC++TpqeVewSIXOz/fA53lkK6RQ==
1280+
dependencies:
1281+
"@babel/core" "^7.12.3"
1282+
"@babel/parser" "^7.12.3"
1283+
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
1284+
"@babel/plugin-transform-runtime" "^7.12.1"
1285+
"@babel/runtime" "^7.12.5"
1286+
"@babel/traverse" "^7.12.1"
1287+
"@babel/types" "^7.12.1"
1288+
"@embroider/macros" "0.37.0"
1289+
assert-never "^1.1.0"
1290+
babel-plugin-syntax-dynamic-import "^6.18.0"
1291+
broccoli-node-api "^1.7.0"
1292+
broccoli-persistent-filter "^3.1.2"
1293+
broccoli-plugin "^4.0.1"
1294+
broccoli-source "^3.0.0"
1295+
debug "^3.1.0"
1296+
escape-string-regexp "^4.0.0"
1297+
fast-sourcemap-concat "^1.4.0"
1298+
filesize "^4.1.2"
1299+
fs-extra "^7.0.1"
1300+
fs-tree-diff "^2.0.0"
1301+
handlebars "^4.4.2"
1302+
js-string-escape "^1.0.1"
1303+
jsdom "^16.4.0"
1304+
json-stable-stringify "^1.0.1"
1305+
lodash "^4.17.10"
1306+
pkg-up "^3.1.0"
1307+
resolve "^1.8.1"
1308+
resolve-package-path "^1.2.2"
1309+
semver "^7.3.2"
1310+
strip-bom "^3.0.0"
1311+
typescript-memoize "^1.0.0-alpha.3"
1312+
walk-sync "^1.1.3"
1313+
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
1314+
1315+
"@embroider/[email protected]":
1316+
version "0.37.0"
1317+
resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-0.37.0.tgz#cb0d38dfa4403ade010decf5bc94c2981ceed5a9"
1318+
integrity sha512-Gobt6L+N2tw316MHBlwSFBo9EyUAr2WLuVQJuBLGQdURkBVLlBTQCa4mpiEW+TCxQMFy0lVzX3HfJMb+11LRAQ==
12821319
dependencies:
12831320
loader-utils "^1.1.0"
12841321

@@ -1312,16 +1349,31 @@
13121349
resolve "^1.8.1"
13131350
semver "^7.3.2"
13141351

1315-
"@embroider/[email protected]":
1316-
version "0.36.0"
1317-
resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.36.0.tgz#5c5e7475d5ec1a6f3f08ca76fe14d1e1a6b95adb"
1318-
integrity sha512-xcbVDQGgZDfVS+c1nRSJO5HgcCQ0PEvXrY0KxGWtYD8MqwbobEj+tL8DCRSZLaXuDG2ajup9bNMcfLTIRrZAuw==
1352+
"@embroider/[email protected]":
1353+
version "0.37.0"
1354+
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.37.0.tgz#221013fc5bc0eaa78f1de98802fc03e588bfe1b1"
1355+
integrity sha512-VItxn4NzGR5prryXGbPGTuLMd+QPPKvAYZv2357iS+wmz6mTzC5nqXljwDQIOJbAji9giDO+FW2HzXYOcY3teQ==
1356+
dependencies:
1357+
"@babel/core" "^7.12.3"
1358+
"@babel/traverse" "^7.12.1"
1359+
"@babel/types" "^7.12.1"
1360+
"@embroider/core" "0.37.0"
1361+
assert-never "^1.1.0"
1362+
ember-cli-babel "^7.23.0"
1363+
lodash "^4.17.10"
1364+
resolve "^1.8.1"
1365+
semver "^7.3.2"
1366+
1367+
"@embroider/[email protected]":
1368+
version "0.37.0"
1369+
resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.37.0.tgz#47568879fa5413e6b4ccd2f93a70661de580af32"
1370+
integrity sha512-pLO7gtDdt4E8v83pf/M/CXasrOpOQoFVIjbeRQkmDFvQCvOkPm/lHovJLp8Cm/nMy55P8X2xuooldbLCjK1HNA==
13191371
dependencies:
13201372
"@babel/core" "^7.12.3"
13211373
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
13221374
"@babel/plugin-proposal-optional-chaining" "^7.12.1"
1323-
"@embroider/babel-loader-7" "0.36.0"
1324-
"@embroider/hbs-loader" "0.36.0"
1375+
"@embroider/babel-loader-7" "0.37.0"
1376+
"@embroider/hbs-loader" "0.37.0"
13251377
"@types/source-map" "^0.5.7"
13261378
babel-core "^6.26.3"
13271379
babel-loader "8"
@@ -6301,17 +6353,6 @@ ember-cli-head@^1.0.0:
63016353
ember-cli-htmlbars "^4.3.1"
63026354
ember-in-element-polyfill "^1.0.0"
63036355

6304-
"ember-cli-htmlbars-3@npm:ember-cli-htmlbars@3", ember-cli-htmlbars@^3.0.0:
6305-
name ember-cli-htmlbars-3
6306-
version "3.1.0"
6307-
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.1.0.tgz#87806c2a0bca2ab52d4fb8af8e2215c1ca718a99"
6308-
integrity sha512-cgvRJM73IT0aePUG7oQ/afB7vSRBV3N0wu9BrWhHX2zkR7A7cUBI7KC9VPk6tbctCXoM7BRGsCC4aIjF7yrfXA==
6309-
dependencies:
6310-
broccoli-persistent-filter "^2.3.1"
6311-
hash-for-dep "^1.5.1"
6312-
json-stable-stringify "^1.0.1"
6313-
strip-bom "^3.0.0"
6314-
63156356
[email protected], ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1:
63166357
version "5.6.4"
63176358
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.6.4.tgz#97c1ce813dfe79961c575b4516fbb30cbb782b43"
@@ -6333,7 +6374,18 @@ [email protected], ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1:
63336374
strip-bom "^4.0.0"
63346375
walk-sync "^2.2.0"
63356376

6336-
ember-cli-htmlbars@^4.0.9, ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.2.2, ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1:
6377+
ember-cli-htmlbars@^3.0.0:
6378+
name ember-cli-htmlbars-3
6379+
version "3.1.0"
6380+
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.1.0.tgz#87806c2a0bca2ab52d4fb8af8e2215c1ca718a99"
6381+
integrity sha512-cgvRJM73IT0aePUG7oQ/afB7vSRBV3N0wu9BrWhHX2zkR7A7cUBI7KC9VPk6tbctCXoM7BRGsCC4aIjF7yrfXA==
6382+
dependencies:
6383+
broccoli-persistent-filter "^2.3.1"
6384+
hash-for-dep "^1.5.1"
6385+
json-stable-stringify "^1.0.1"
6386+
strip-bom "^3.0.0"
6387+
6388+
ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.2.2, ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1:
63376389
version "4.5.0"
63386390
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e"
63396391
integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw==

0 commit comments

Comments
 (0)