Skip to content

Commit 00d06fa

Browse files
authored
Merge pull request #537 from bendemboski/fix-build
Fix CI build
2 parents c6ed562 + d20dd0f commit 00d06fa

File tree

2 files changed

+18
-71
lines changed

2 files changed

+18
-71
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@ember/string": "^3.0.1",
3636
"@ember/test-helpers": "^2.9.3",
3737
"@ember/test-waiters": "^3.0.0",
38-
"@embroider/macros": "^0.48.1",
38+
"@embroider/macros": "^1.13.0",
3939
"@embroider/test-setup": "^2.1.1",
4040
"@glimmer/component": "^1.1.2",
4141
"@glimmer/tracking": "^1.0.4",

yarn.lock

+17-70
Original file line numberDiff line numberDiff line change
@@ -1308,80 +1308,27 @@
13081308
ember-cli-version-checker "^5.1.2"
13091309
semver "^7.3.5"
13101310

1311-
"@embroider/macros@^0.48.1":
1312-
version "0.48.1"
1313-
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.48.1.tgz#fc1fd10857d40e80a20c0d366a1a8007aa424e83"
1314-
integrity sha512-JtcOL3pSxI8prstQomzNNHPBqG1K5JwrIuZwH+Q9TK4nONIH2F4z0Z0pd0SZmTEjF17E4gZN3g1J3vSX4zKuww==
1315-
dependencies:
1316-
"@embroider/shared-internals" "0.48.1"
1317-
assert-never "^1.2.1"
1318-
ember-cli-babel "^7.26.6"
1319-
find-up "^5.0.0"
1320-
lodash "^4.17.21"
1321-
resolve "^1.20.0"
1322-
semver "^7.3.2"
1323-
1324-
"@embroider/macros@^1.0.0":
1325-
version "1.8.3"
1326-
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.8.3.tgz#2f0961ab8871f6ad819630208031d705b357757e"
1327-
integrity sha512-gnIOfTL/pUkoD6oI7JyWOqXlVIUgZM+CnbH10/YNtZr2K0hij9eZQMdgjOZZVgN0rKOFw9dIREqc1ygrJHRYQA==
1328-
dependencies:
1329-
"@embroider/shared-internals" "1.8.3"
1330-
assert-never "^1.2.1"
1331-
babel-import-util "^1.1.0"
1332-
ember-cli-babel "^7.26.6"
1333-
find-up "^5.0.0"
1334-
lodash "^4.17.21"
1335-
resolve "^1.20.0"
1336-
semver "^7.3.2"
1337-
1338-
"@embroider/macros@^1.10.0":
1339-
version "1.10.0"
1340-
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
1341-
integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==
1311+
"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.0":
1312+
version "1.13.0"
1313+
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.0.tgz#84d46bfcb7a8afbb52048e7bef9c3c7c0ee2d020"
1314+
integrity sha512-V89lvlNPIjcvbuew+FLxcCcgdPO0cZrgHHmX6dHO3TpiweC5G6DN4/QogvdnSprPvWOMQS9u3bSFmR7DBkmSgg==
13421315
dependencies:
1343-
"@embroider/shared-internals" "2.0.0"
1316+
"@embroider/shared-internals" "2.3.0"
13441317
assert-never "^1.2.1"
1345-
babel-import-util "^1.1.0"
1318+
babel-import-util "^2.0.0"
13461319
ember-cli-babel "^7.26.6"
13471320
find-up "^5.0.0"
13481321
lodash "^4.17.21"
13491322
resolve "^1.20.0"
13501323
semver "^7.3.2"
13511324

1352-
"@embroider/shared-internals@0.48.1":
1353-
version "0.48.1"
1354-
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.48.1.tgz#4f0dcde8dba2fa47c862746898a1846a31e27f80"
1355-
integrity sha512-6Q73QXGUQianIb3xRpMNl8VMECSatA1NhjXxeIyYzwKraWhhMBpXvysLpbJ8ib1rQe1ajmkoDdXgT5pAnVMXrg==
1356-
dependencies:
1357-
babel-import-util "^0.2.0"
1358-
ember-rfc176-data "^0.3.17"
1359-
fs-extra "^9.1.0"
1360-
lodash "^4.17.21"
1361-
resolve-package-path "^4.0.1"
1362-
semver "^7.3.5"
1363-
typescript-memoize "^1.0.1"
1364-
1365-
"@embroider/shared-internals@1.8.3":
1366-
version "1.8.3"
1367-
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.8.3.tgz#52d868dc80016e9fe983552c0e516f437bf9b9f9"
1368-
integrity sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w==
1369-
dependencies:
1370-
babel-import-util "^1.1.0"
1371-
ember-rfc176-data "^0.3.17"
1372-
fs-extra "^9.1.0"
1373-
js-string-escape "^1.0.1"
1374-
lodash "^4.17.21"
1375-
resolve-package-path "^4.0.1"
1376-
semver "^7.3.5"
1377-
typescript-memoize "^1.0.1"
1378-
1379-
"@embroider/shared-internals@2.0.0", "@embroider/shared-internals@^2.0.0":
1380-
version "2.0.0"
1381-
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316"
1382-
integrity sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==
1325+
"@embroider/shared-internals@2.3.0", "@embroider/shared-internals@^2.0.0":
1326+
version "2.3.0"
1327+
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.3.0.tgz#97215f6263a4013fbdb3d1e4890cc069f2d9df12"
1328+
integrity sha512-5h7hUcci10ixXecJj/peqNQJO8kWe4b4tRx7mZjf7I6+P6zDcdVk3QxQZ+/gwrG6cbEfpLzEGKIEiLjZvPtqIA==
13831329
dependencies:
1384-
babel-import-util "^1.1.0"
1330+
babel-import-util "^2.0.0"
1331+
debug "^4.3.2"
13851332
ember-rfc176-data "^0.3.17"
13861333
fs-extra "^9.1.0"
13871334
js-string-escape "^1.0.1"
@@ -2711,16 +2658,16 @@ babel-import-util@^0.2.0:
27112658
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
27122659
integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
27132660

2714-
babel-import-util@^1.1.0:
2715-
version "1.2.2"
2716-
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.2.2.tgz#1027560e143a4a68b1758e71d4fadc661614e495"
2717-
integrity sha512-8HgkHWt5WawRFukO30TuaL9EiDUOdvyKtDwLma4uBNeUSDbOO0/hiPfavrOWxSS6J6TKXfukWHZ3wiqZhJ8ONQ==
2718-
27192661
babel-import-util@^1.3.0:
27202662
version "1.3.0"
27212663
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e"
27222664
integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==
27232665

2666+
babel-import-util@^2.0.0:
2667+
version "2.0.0"
2668+
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-2.0.0.tgz#99a2e7424bcde01898bc61bb19700ff4c74379a3"
2669+
integrity sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==
2670+
27242671
babel-loader@^8.0.6:
27252672
version "8.2.5"
27262673
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"

0 commit comments

Comments
 (0)