Skip to content

Commit df4f258

Browse files
authored
Merge pull request #21024 from emberjs/nvp/ember-reactive-in-amd
[Bugfix LTS] Add @ember/reactive into the AMD bundles
2 parents 4abca82 + 5096922 commit df4f258

File tree

5 files changed

+90
-7
lines changed

5 files changed

+90
-7
lines changed

broccoli/amd-compat-entrypoints/ember.debug.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,12 @@ d('@ember/object/proxy', emberObjectProxy);
275275
import * as emberOwnerIndex from '@ember/owner/index';
276276
d('@ember/owner/index', emberOwnerIndex);
277277

278+
import * as emberReactiveIndex from '@ember/reactive/index';
279+
d('@ember/reactive/index', emberReactiveIndex);
280+
281+
import * as emberReactiveCollections from '@ember/reactive/collections';
282+
d('@ember/reactive/collections', emberReactiveCollections);
283+
278284
import * as emberRendererIndex from '@ember/renderer/index';
279285
d('@ember/renderer/index', emberRendererIndex);
280286

pnpm-lock.yaml

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

smoke-tests/app-template/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"prettier": "^3.2.5",
6262
"qunit": "^2.19.2",
6363
"qunit-dom": "^3.1.1",
64+
"tracked-built-ins": "^4.1.0",
6465
"webpack": "^5.74.0"
6566
},
6667
"engines": {

smoke-tests/scenarios/basic-test.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,18 @@ function basicTest(scenarios: Scenarios, appName: string) {
106106
`,
107107
},
108108
integration: {
109+
'tracked-built-ins-macro-test.gjs': `
110+
import { module, test } from 'qunit';
111+
import { TrackedArray } from 'tracked-built-ins';
112+
import { trackedArray } from '@ember/reactive/collections';
113+
114+
module('tracked-built-ins', function () {
115+
test('it works', function (assert) {
116+
assert.ok(new TrackedArray());
117+
assert.ok(trackedArray());
118+
});
119+
});
120+
`,
109121
'destruction-test.gjs': `
110122
import { module, test } from 'qunit';
111123
import { clearRender, render } from '@ember/test-helpers';

smoke-tests/v2-app-template/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"stylelint": "^16.19.1",
8181
"stylelint-config-standard": "^38.0.0",
8282
"testem": "^3.16.0",
83-
"tracked-built-ins": "^4.0.0",
83+
"tracked-built-ins": "^4.1.0",
8484
"vite": "^6.3.5"
8585
},
8686
"engines": {

0 commit comments

Comments
 (0)