Skip to content

Commit 13ffeae

Browse files
committed
Revert "Well, that's goofy"
This reverts commit b44b166.
1 parent b44b166 commit 13ffeae

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,10 @@
332332
"@ember/utils/lib/is_present.js": "ember-source/@ember/utils/lib/is_present.js",
333333
"@ember/utils/lib/type-of.js": "ember-source/@ember/utils/lib/type-of.js",
334334
"@ember/version/index.js": "ember-source/@ember/version/index.js",
335+
"@glimmer/debug/index.js": "ember-source/@glimmer/debug/index.js",
335336
"@glimmer/destroyable/index.js": "ember-source/@glimmer/destroyable/index.js",
336337
"@glimmer/encoder/index.js": "ember-source/@glimmer/encoder/index.js",
338+
"@glimmer/env/index.js": "ember-source/@glimmer/env/index.js",
337339
"@glimmer/global-context/index.js": "ember-source/@glimmer/global-context/index.js",
338340
"@glimmer/manager/index.js": "ember-source/@glimmer/manager/index.js",
339341
"@glimmer/node/index.js": "ember-source/@glimmer/node/index.js",
@@ -342,8 +344,6 @@
342344
"@glimmer/program/index.js": "ember-source/@glimmer/program/index.js",
343345
"@glimmer/reference/index.js": "ember-source/@glimmer/reference/index.js",
344346
"@glimmer/runtime/index.js": "ember-source/@glimmer/runtime/index.js",
345-
"@glimmer/tracking/dist/index.js": "ember-source/@glimmer/tracking/dist/index.js",
346-
"@glimmer/tracking/dist/primitives/cache.js": "ember-source/@glimmer/tracking/dist/primitives/cache.js",
347347
"@glimmer/tracking/index.js": "ember-source/@glimmer/tracking/index.js",
348348
"@glimmer/tracking/primitives/cache.js": "ember-source/@glimmer/tracking/primitives/cache.js",
349349
"@glimmer/util/index.js": "ember-source/@glimmer/util/index.js",
@@ -400,4 +400,4 @@
400400
"node": "16.20.0",
401401
"pnpm": "8.10.0"
402402
}
403-
}
403+
}

rollup.config.mjs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,7 @@ export function resolvePackages(deps, isExternal) {
345345
if (pkgName) {
346346
// having a pkgName means this is not a relative import
347347

348-
// these packages are macros, handled by babel / transpilation
349-
if (
350-
pkgName === '@embroider/macros' ||
351-
pkgName === '@glimmer/debug' ||
352-
pkgName === '@glimmer/env'
353-
) {
348+
if (pkgName === '@embroider/macros') {
354349
return { external: true, id: pkgName };
355350
}
356351

@@ -397,7 +392,7 @@ export function externalizePackages(deps) {
397392
if (pkgName) {
398393
// having a pkgName means this is not a relative import
399394

400-
if (deps[source] || source === '@glimmer/env') {
395+
if (deps[source]) {
401396
return { external: true, id: source };
402397
}
403398

0 commit comments

Comments
 (0)