Skip to content

Commit 0c77dc0

Browse files
ef4ef4
committed
Merge branch 'main' into glimmer-component
2 parents 816c17c + 1322efb commit 0c77dc0

File tree

33 files changed

+740
-612
lines changed

33 files changed

+740
-612
lines changed

‎.github/workflows/alpha-releases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
5353
- name: push tag
5454
# Push in a way that will NOT trigger other workflows
55-
run: git push origin v${{env.NEXT_ALPHA}}
55+
run: git push origin v${{env.NEXT_ALPHA}}-ember-source
5656

5757
notify:
5858
name: Notify Discord

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
run: pnpm vite build --mode=development
129129

130130
- name: Set BrowserStack Local Identifier
131-
if: startsWith(github.ref, 'refs/tags/v')
131+
if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-ember-source')
132132
run: |
133133
BROWSERSTACK_LOCAL_IDENTIFIER="$GITHUB_RUN_ID-$GITHUB_RUN_ATTEMPT"
134134
echo "BROWSERSTACK_LOCAL_IDENTIFIER=$BROWSERSTACK_LOCAL_IDENTIFIER" >> $GITHUB_ENV
@@ -212,7 +212,7 @@ jobs:
212212
blueprint-test,
213213
browser-test,
214214
]
215-
if: startsWith(github.ref, 'refs/tags/v')
215+
if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-ember-source')
216216
steps:
217217
- uses: actions/checkout@v4
218218
- uses: ./.github/actions/setup

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
# Ember Changelog
22

3+
## v5.12.0-beta.3 (September 23, 2024)
4+
5+
- [#20746](https://github.com/emberjs/ember.js/pull/20746) [BUGFIX] Upgrade glimmer-vm for some perf improvements
6+
7+
## v5.12.0-beta.2 (September 16, 2024)
8+
9+
- [#20734](https://github.com/emberjs/ember.js/pull/20734) Circularity fixes
10+
311
## v5.12.0-beta.1 (August 19, 2024)
412

513
- [#20714](https://github.com/emberjs/ember.js/pull/20714) [BUGFIX] Break eager cycle for "deprecate" function
614

15+
## v5.11.1 (September 23, 2024)
16+
17+
- [#20734](https://github.com/emberjs/ember.js/pull/20734) Circularity fixes
18+
719
## v5.11.0 (August 19, 2024)
820

921
- [#20716](https://github.com/emberjs/ember.js/pull/20716) [BREAKING] Drop Node 16 support

‎RELEASE.md

Lines changed: 238 additions & 145 deletions
Large diffs are not rendered by default.

‎broccoli/build-info.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ function readPackageVersion(root) {
125125
* @param {string} tag
126126
*/
127127
function parseTagVersion(tag) {
128-
return tag && semver.parse(tag).version;
128+
if (tag) {
129+
return semver.parse(tag.replace(/-ember-source$/, '')).version;
130+
}
129131
}
130132

131133
/**

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@
6565
"dependencies": {
6666
"@babel/core": "^7.24.4",
6767
"@ember/edition-utils": "^1.2.0",
68-
"@glimmer/compiler": "0.92.0",
69-
"@glimmer/destroyable": "0.92.0",
68+
"@glimmer/compiler": "0.92.4",
69+
"@glimmer/destroyable": "0.92.3",
7070
"@glimmer/env": "^0.1.7",
71-
"@glimmer/global-context": "0.92.0",
72-
"@glimmer/interfaces": "0.92.0",
73-
"@glimmer/manager": "0.92.0",
74-
"@glimmer/node": "0.92.0",
75-
"@glimmer/opcode-compiler": "0.92.0",
76-
"@glimmer/owner": "0.92.0",
77-
"@glimmer/program": "0.92.0",
78-
"@glimmer/reference": "0.92.0",
79-
"@glimmer/runtime": "0.92.0",
80-
"@glimmer/syntax": "0.92.0",
81-
"@glimmer/util": "0.92.0",
82-
"@glimmer/validator": "0.92.0",
83-
"@glimmer/vm": "0.92.0",
84-
"@glimmer/vm-babel-plugins": "0.92.0",
71+
"@glimmer/global-context": "0.92.3",
72+
"@glimmer/interfaces": "0.92.3",
73+
"@glimmer/manager": "0.92.4",
74+
"@glimmer/node": "0.92.4",
75+
"@glimmer/opcode-compiler": "0.92.4",
76+
"@glimmer/owner": "0.92.3",
77+
"@glimmer/program": "0.92.4",
78+
"@glimmer/reference": "0.92.3",
79+
"@glimmer/runtime": "0.92.4",
80+
"@glimmer/syntax": "0.92.3",
81+
"@glimmer/util": "0.92.3",
82+
"@glimmer/validator": "0.92.3",
83+
"@glimmer/vm": "0.92.3",
84+
"@glimmer/vm-babel-plugins": "0.92.3",
8585
"@simple-dom/interface": "^1.4.0",
8686
"backburner.js": "^2.8.0",
8787
"broccoli-file-creator": "^2.1.1",
@@ -107,8 +107,6 @@
107107
},
108108
"devDependencies": {
109109
"@aws-sdk/client-s3": "^3.321.1",
110-
"babel-plugin-debug-macros": "1.0.0",
111-
"babel-plugin-ember-template-compilation": "^2.1.1",
112110
"@babel/plugin-transform-typescript": "^7.22.9",
113111
"@babel/preset-env": "^7.16.11",
114112
"@babel/types": "^7.22.5",
@@ -125,6 +123,8 @@
125123
"@typescript-eslint/parser": "^5.62.0",
126124
"ast-types": "^0.14.2",
127125
"auto-dist-tag": "^2.1.1",
126+
"babel-plugin-debug-macros": "1.0.0",
127+
"babel-plugin-ember-template-compilation": "^2.1.1",
128128
"dag-map": "^2.0.2",
129129
"decorator-transforms": "2.0.0",
130130
"ember-cli": "^4.10.0",

‎packages/@ember/-internals/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@
4040
"@ember/service": "workspace:*",
4141
"@ember/template-factory": "workspace:*",
4242
"@ember/utils": "workspace:*",
43-
"@glimmer/compiler": "0.92.0",
43+
"@glimmer/compiler": "0.92.4",
4444
"@glimmer/component": "workspace:^",
45-
"@glimmer/destroyable": "0.92.0",
45+
"@glimmer/destroyable": "0.92.3",
4646
"@glimmer/env": "^0.1.7",
47-
"@glimmer/global-context": "0.92.0",
48-
"@glimmer/interfaces": "0.92.0",
49-
"@glimmer/manager": "0.92.0",
50-
"@glimmer/node": "0.92.0",
51-
"@glimmer/opcode-compiler": "0.92.0",
52-
"@glimmer/owner": "0.92.0",
53-
"@glimmer/program": "0.92.0",
54-
"@glimmer/reference": "0.92.0",
55-
"@glimmer/runtime": "0.92.0",
56-
"@glimmer/syntax": "0.92.0",
57-
"@glimmer/util": "0.92.0",
58-
"@glimmer/validator": "0.92.0",
59-
"@glimmer/vm": "0.92.0",
47+
"@glimmer/global-context": "0.92.3",
48+
"@glimmer/interfaces": "0.92.3",
49+
"@glimmer/manager": "0.92.4",
50+
"@glimmer/node": "0.92.4",
51+
"@glimmer/opcode-compiler": "0.92.4",
52+
"@glimmer/owner": "0.92.3",
53+
"@glimmer/program": "0.92.4",
54+
"@glimmer/reference": "0.92.3",
55+
"@glimmer/runtime": "0.92.4",
56+
"@glimmer/syntax": "0.92.3",
57+
"@glimmer/util": "0.92.3",
58+
"@glimmer/validator": "0.92.3",
59+
"@glimmer/vm": "0.92.3",
6060
"@simple-dom/interface": "^1.4.0",
6161
"backburner.js": "^2.7.0",
6262
"dag-map": "^2.0.2",

‎packages/@ember/application/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"@ember/runloop": "workspace:*",
2020
"@ember/service": "workspace:*",
2121
"@ember/utils": "workspace:*",
22-
"@glimmer/destroyable": "0.92.0",
22+
"@glimmer/destroyable": "0.92.3",
2323
"@glimmer/env": "^0.1.7",
24-
"@glimmer/owner": "0.92.0",
25-
"@glimmer/util": "0.92.0",
26-
"@glimmer/validator": "0.92.0",
24+
"@glimmer/owner": "0.92.3",
25+
"@glimmer/util": "0.92.3",
26+
"@glimmer/validator": "0.92.3",
2727
"backburner.js": "^2.7.0",
2828
"dag-map": "^2.0.2",
2929
"ember": "workspace:*",

‎packages/@ember/array/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
"@ember/object": "workspace:*",
1818
"@ember/runloop": "workspace:*",
1919
"@ember/utils": "workspace:*",
20-
"@glimmer/destroyable": "0.92.0",
20+
"@glimmer/destroyable": "0.92.3",
2121
"@glimmer/env": "^0.1.7",
22-
"@glimmer/manager": "0.92.0",
23-
"@glimmer/owner": "0.92.0",
24-
"@glimmer/util": "0.92.0",
25-
"@glimmer/validator": "0.92.0",
22+
"@glimmer/manager": "0.92.4",
23+
"@glimmer/owner": "0.92.3",
24+
"@glimmer/util": "0.92.3",
25+
"@glimmer/validator": "0.92.3",
2626
"expect-type": "^0.15.0",
2727
"internal-test-helpers": "workspace:*"
2828
}

‎packages/@ember/component/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
},
1010
"dependencies": {
1111
"@ember/-internals": "workspace:*",
12-
"@glimmer/manager": "0.92.0",
13-
"@glimmer/runtime": "0.92.0",
12+
"@glimmer/manager": "0.92.4",
13+
"@glimmer/runtime": "0.92.4",
1414
"expect-type": "^0.15.0"
1515
}
1616
}

0 commit comments

Comments
 (0)