Skip to content

Commit 9774499

Browse files
committed
keep glimmer packages in "exposedDependencies" and not also "packages"
1 parent bf3bc3c commit 9774499

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
"type-check:internals": "tsc --noEmit",
6262
"type-check:types": "tsc --noEmit --project type-tests",
6363
"type-check": "npm-run-all type-check:*"
64-
6564
},
6665
"dependencies": {
6766
"@babel/core": "^7.24.4",
@@ -322,7 +321,6 @@
322321
"@ember/version/index.js": "ember-source/@ember/version/index.js",
323322
"@glimmer/destroyable/index.js": "ember-source/@glimmer/destroyable/index.js",
324323
"@glimmer/encoder/index.js": "ember-source/@glimmer/encoder/index.js",
325-
"@glimmer/env/index.js": "ember-source/@glimmer/env/index.js",
326324
"@glimmer/global-context/index.js": "ember-source/@glimmer/global-context/index.js",
327325
"@glimmer/manager/index.js": "ember-source/@glimmer/manager/index.js",
328326
"@glimmer/node/index.js": "ember-source/@glimmer/node/index.js",
@@ -332,15 +330,14 @@
332330
"@glimmer/reference/index.js": "ember-source/@glimmer/reference/index.js",
333331
"@glimmer/runtime/index.js": "ember-source/@glimmer/runtime/index.js",
334332
"@glimmer/tracking/index.js": "ember-source/@glimmer/tracking/index.js",
335-
"@glimmer/tracking/primitives/cache.js": "ember-source/@glimmer/tracking/primitives/cache.js",
333+
"@glimmer/tracking/primitives/cache/index.js": "ember-source/@glimmer/tracking/primitives/cache/index.js",
336334
"@glimmer/util/index.js": "ember-source/@glimmer/util/index.js",
337335
"@glimmer/validator/index.js": "ember-source/@glimmer/validator/index.js",
338336
"@glimmer/vm/index.js": "ember-source/@glimmer/vm/index.js",
339337
"@glimmer/wire-format/index.js": "ember-source/@glimmer/wire-format/index.js",
340338
"@simple-dom/document/index.js": "ember-source/@simple-dom/document/index.js",
341339
"backburner.js/index.js": "ember-source/backburner.js/index.js",
342340
"dag-map/index.js": "ember-source/dag-map/index.js",
343-
"ember-template-compiler/index.js": "ember-source/ember-template-compiler/index.js",
344341
"ember-testing/index.js": "ember-source/ember-testing/index.js",
345342
"ember-testing/lib/adapters/adapter.js": "ember-source/ember-testing/lib/adapters/adapter.js",
346343
"ember-testing/lib/adapters/qunit.js": "ember-source/ember-testing/lib/adapters/qunit.js",
@@ -384,4 +381,4 @@
384381
}
385382
},
386383
"packageManager": "pnpm@10.5.0"
387-
}
384+
}

rollup.config.mjs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,11 @@ function packages() {
218218
'@ember/-internals/*/type-tests/**' /* internal packages */,
219219
'*/*/type-tests/**' /* scoped packages */,
220220
'*/type-tests/**' /* packages */,
221+
222+
// all the glimmer-vm packages are handled instead as
223+
// "exposedDependencies" since they used to actually be dependencies.
224+
'@glimmer-workspace/**',
225+
'@glimmer/**',
221226
],
222227
cwd: 'packages',
223228
});
@@ -264,6 +269,11 @@ export function exposedDependencies() {
264269
'@glimmer/runtime',
265270
'@glimmer/validator',
266271
]),
272+
'@glimmer/tracking': resolve(packageCache.appRoot, 'packages/@glimmer/tracking/index.ts'),
273+
'@glimmer/tracking/primitives/cache': resolve(
274+
packageCache.appRoot,
275+
'packages/@glimmer/tracking/primitives/cache.ts'
276+
),
267277
};
268278
}
269279

@@ -363,7 +373,7 @@ function resolveTS() {
363373
name: 'resolve-ts',
364374
async resolveId(source, importer) {
365375
let result = await this.resolve(source, importer);
366-
if (result === null) {
376+
if (result === null && importer) {
367377
// the rest of rollup couldn't find it
368378
let stem = resolve(dirname(importer), source);
369379
for (let candidate of ['.ts', '/index.ts']) {

0 commit comments

Comments
 (0)