Skip to content

Commit cf3abb2

Browse files
authored
Merge pull request #3842 from cardstack/host-dep-upgrades
Host app dependency upgrades for vite
2 parents 942245e + 9affb17 commit cf3abb2

8 files changed

Lines changed: 395 additions & 369 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
"style-loader@2.0.0": "patches/style-loader@2.0.0.patch",
4242
"ember-css-url@1.0.0": "patches/ember-css-url@1.0.0.patch",
4343
"ember-basic-dropdown@8.0.4": "patches/ember-basic-dropdown@8.0.4.patch",
44-
"ember-source@5.4.1": "patches/ember-source@5.4.1.patch",
4544
"monaco-editor@0.52.2": "patches/monaco-editor@0.52.2.patch",
4645
"@embroider/compat": "patches/@embroider__compat.patch",
4746
"ember-eslint-parser": "patches/ember-eslint-parser.patch",
4847
"openai": "patches/openai.patch",
4948
"matrix-js-sdk@38.3.0": "patches/matrix-js-sdk@38.3.0.patch",
50-
"@embroider/webpack": "patches/@embroider__webpack.patch"
49+
"@embroider/webpack": "patches/@embroider__webpack.patch",
50+
"ember-source": "patches/ember-source.patch"
5151
},
5252
"onlyBuiltDependencies": [
5353
"@percy/core",

packages/host/app/components/operator-mode/code-submode/playground/spec-search.gts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type Owner from '@ember/owner';
2+
import { next } from '@ember/runloop';
23
import Component from '@glimmer/component';
34
import { tracked } from '@glimmer/tracking';
45

@@ -59,6 +60,11 @@ interface CreateCardSignature {
5960
class CreateCard extends Component<CreateCardSignature> {
6061
constructor(owner: Owner, args: CreateCardSignature['Args']) {
6162
super(owner, args);
62-
this.args.createNewCard();
63+
// "next" here is a workaround. This code should be refactored to not mutate
64+
// tracked state during rendering. I'm adding the workaround instead because
65+
// I'm in the middle of trying to upgrade deps.
66+
next(() => {
67+
this.args.createNewCard();
68+
});
6369
}
6470
}

packages/host/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"ember-concurrency": "catalog:",
123123
"ember-css-url": "^1.0.0",
124124
"ember-elsewhere": "^2.0.0",
125-
"ember-exam": "^9.0.0",
125+
"ember-exam": "^10.0.0",
126126
"ember-focus-trap": "^1.0.1",
127127
"ember-freestyle": "^0.20.0",
128128
"ember-keyboard": "^8.2.1",

packages/realm-server/tests/indexing-test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,11 @@ module(basename(__filename), function () {
622622
new URL(`${testRealm}boom2`),
623623
);
624624
if (entry?.type === 'error') {
625-
assert.strictEqual(
626-
entry.error.errorDetail.message,
627-
'Attempted to resolve a modifier in a strict mode template, but it was not in scope: did-insert',
625+
assert.ok(
626+
/Attempted to resolve a modifier in a strict mode template, but that value was not in scope: did-insert/.test(
627+
entry.error.errorDetail.message,
628+
),
629+
'error text is about did-insert not being in scope',
628630
);
629631
assert.deepEqual(entry.error.errorDetail.deps, [`${testRealm}boom2`]);
630632
} else {

patches/ember-source.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/dist/ember-template-compiler.js b/dist/ember-template-compiler.js
2+
index 01999af0c4c125af3c713318db7eb85fa492f72d..becb917a5b5fd7fd4883001210776ea34439c474 100644
3+
--- a/dist/ember-template-compiler.js
4+
+++ b/dist/ember-template-compiler.js
5+
@@ -8288,9 +8288,7 @@ var define, require;
6+
*/
7+
toSlice(expected) {
8+
const chars = this.data.asString();
9+
- return void 0 !== expected && chars !== expected &&
10+
- // eslint-disable-next-line no-console
11+
- console.warn(`unexpectedly found ${JSON.stringify(chars)} when slicing source, but expected ${JSON.stringify(expected)}`), new SourceSlice({
12+
+ return new SourceSlice({
13+
loc: this,
14+
chars: expected || chars
15+
});

patches/ember-source@5.4.1.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

pnpm-lock.yaml

Lines changed: 364 additions & 348 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ catalog:
129129
ember-modify-based-class-resource: ^1.1.0
130130
ember-qunit: ^8.0.1
131131
ember-resources: ^7.0.7
132-
ember-source: ~5.4.1
132+
ember-source: ~5.12.0
133133
ember-template-lint: ^7.8.1
134134
esbuild: ^0.24.0
135135
eslint: ^8.57.1

0 commit comments

Comments
 (0)