Merge branch 'main' into glimmer-component

emberjs · Sep 24, 2024 · 0c77dc0 · 0c77dc0
2 parents 816c17c + 1322efb
commit 0c77dc0
Show file tree

Hide file tree

Showing 33 changed files with 740 additions and 612 deletions.
diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
@@ -52,7 +52,7 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
       - name: push tag
         # Push in a way that will NOT trigger other workflows
-        run: git push origin v${{env.NEXT_ALPHA}}
+        run: git push origin v${{env.NEXT_ALPHA}}-ember-source
 
   notify:
     name: Notify Discord

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -128,7 +128,7 @@ jobs:
         run: pnpm vite build --mode=development
 
       - name: Set BrowserStack Local Identifier
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-ember-source')
         run: |
           BROWSERSTACK_LOCAL_IDENTIFIER="$GITHUB_RUN_ID-$GITHUB_RUN_ATTEMPT"
           echo "BROWSERSTACK_LOCAL_IDENTIFIER=$BROWSERSTACK_LOCAL_IDENTIFIER" >> $GITHUB_ENV
@@ -212,7 +212,7 @@ jobs:
         blueprint-test,
         browser-test,
       ]
-    if: startsWith(github.ref, 'refs/tags/v')
+    if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-ember-source')
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,21 @@
 # Ember Changelog
 
+## v5.12.0-beta.3 (September 23, 2024)
+
+- [#20746](https://github.com/emberjs/ember.js/pull/20746) [BUGFIX] Upgrade glimmer-vm for some perf improvements
+
+## v5.12.0-beta.2 (September 16, 2024)
+
+- [#20734](https://github.com/emberjs/ember.js/pull/20734) Circularity fixes
+
 ## v5.12.0-beta.1 (August 19, 2024)
 
 - [#20714](https://github.com/emberjs/ember.js/pull/20714) [BUGFIX] Break eager cycle for "deprecate" function
 
+## v5.11.1 (September 23, 2024)
+
+- [#20734](https://github.com/emberjs/ember.js/pull/20734) Circularity fixes
+
 ## v5.11.0 (August 19, 2024)
 
 - [#20716](https://github.com/emberjs/ember.js/pull/20716) [BREAKING] Drop Node 16 support

diff --git a/RELEASE.md b/RELEASE.md
diff --git a/broccoli/build-info.js b/broccoli/build-info.js
@@ -125,7 +125,9 @@ function readPackageVersion(root) {
  * @param {string} tag
  */
 function parseTagVersion(tag) {
-  return tag && semver.parse(tag).version;
+  if (tag) {
+    return semver.parse(tag.replace(/-ember-source$/, '')).version;
+  }
 }
 
 /**

diff --git a/package.json b/package.json
@@ -65,23 +65,23 @@
   "dependencies": {
     "@babel/core": "^7.24.4",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/compiler": "0.92.0",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/compiler": "0.92.4",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.92.0",
-    "@glimmer/interfaces": "0.92.0",
-    "@glimmer/manager": "0.92.0",
-    "@glimmer/node": "0.92.0",
-    "@glimmer/opcode-compiler": "0.92.0",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/program": "0.92.0",
-    "@glimmer/reference": "0.92.0",
-    "@glimmer/runtime": "0.92.0",
-    "@glimmer/syntax": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
-    "@glimmer/vm": "0.92.0",
-    "@glimmer/vm-babel-plugins": "0.92.0",
+    "@glimmer/global-context": "0.92.3",
+    "@glimmer/interfaces": "0.92.3",
+    "@glimmer/manager": "0.92.4",
+    "@glimmer/node": "0.92.4",
+    "@glimmer/opcode-compiler": "0.92.4",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/program": "0.92.4",
+    "@glimmer/reference": "0.92.3",
+    "@glimmer/runtime": "0.92.4",
+    "@glimmer/syntax": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
+    "@glimmer/vm": "0.92.3",
+    "@glimmer/vm-babel-plugins": "0.92.3",
     "@simple-dom/interface": "^1.4.0",
     "backburner.js": "^2.8.0",
     "broccoli-file-creator": "^2.1.1",
@@ -107,8 +107,6 @@
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.321.1",
-    "babel-plugin-debug-macros": "1.0.0",
-    "babel-plugin-ember-template-compilation": "^2.1.1",
     "@babel/plugin-transform-typescript": "^7.22.9",
     "@babel/preset-env": "^7.16.11",
     "@babel/types": "^7.22.5",
@@ -125,6 +123,8 @@
     "@typescript-eslint/parser": "^5.62.0",
     "ast-types": "^0.14.2",
     "auto-dist-tag": "^2.1.1",
+    "babel-plugin-debug-macros": "1.0.0",
+    "babel-plugin-ember-template-compilation": "^2.1.1",
     "dag-map": "^2.0.2",
     "decorator-transforms": "2.0.0",
     "ember-cli": "^4.10.0",

diff --git a/packages/@ember/-internals/package.json b/packages/@ember/-internals/package.json
@@ -40,23 +40,23 @@
     "@ember/service": "workspace:*",
     "@ember/template-factory": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/compiler": "0.92.0",
+    "@glimmer/compiler": "0.92.4",
     "@glimmer/component": "workspace:^",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.92.0",
-    "@glimmer/interfaces": "0.92.0",
-    "@glimmer/manager": "0.92.0",
-    "@glimmer/node": "0.92.0",
-    "@glimmer/opcode-compiler": "0.92.0",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/program": "0.92.0",
-    "@glimmer/reference": "0.92.0",
-    "@glimmer/runtime": "0.92.0",
-    "@glimmer/syntax": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
-    "@glimmer/vm": "0.92.0",
+    "@glimmer/global-context": "0.92.3",
+    "@glimmer/interfaces": "0.92.3",
+    "@glimmer/manager": "0.92.4",
+    "@glimmer/node": "0.92.4",
+    "@glimmer/opcode-compiler": "0.92.4",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/program": "0.92.4",
+    "@glimmer/reference": "0.92.3",
+    "@glimmer/runtime": "0.92.4",
+    "@glimmer/syntax": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
+    "@glimmer/vm": "0.92.3",
     "@simple-dom/interface": "^1.4.0",
     "backburner.js": "^2.7.0",
     "dag-map": "^2.0.2",

diff --git a/packages/@ember/application/package.json b/packages/@ember/application/package.json
@@ -19,11 +19,11 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
     "backburner.js": "^2.7.0",
     "dag-map": "^2.0.2",
     "ember": "workspace:*",

diff --git a/packages/@ember/array/package.json b/packages/@ember/array/package.json
@@ -17,12 +17,12 @@
     "@ember/object": "workspace:*",
     "@ember/runloop": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.92.0",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/manager": "0.92.4",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }

diff --git a/packages/@ember/component/package.json b/packages/@ember/component/package.json
@@ -9,8 +9,8 @@
   },
   "dependencies": {
     "@ember/-internals": "workspace:*",
-    "@glimmer/manager": "0.92.0",
-    "@glimmer/runtime": "0.92.0",
+    "@glimmer/manager": "0.92.4",
+    "@glimmer/runtime": "0.92.4",
     "expect-type": "^0.15.0"
   }
 }
diff --git a/packages/@ember/controller/package.json b/packages/@ember/controller/package.json
@@ -11,11 +11,11 @@
     "@ember/debug": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/service": "workspace:*",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }

diff --git a/packages/@ember/debug/package.json b/packages/@ember/debug/package.json
@@ -18,12 +18,12 @@
     "@ember/routing": "workspace:*",
     "@ember/runloop": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.92.0",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/manager": "0.92.4",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
     "backburner.js": "^2.7.0",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"

diff --git a/packages/@ember/destroyable/package.json b/packages/@ember/destroyable/package.json
@@ -6,7 +6,7 @@
     ".": "./index.ts"
   },
   "dependencies": {
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "expect-type": "^0.15.0"
   }
 }
diff --git a/packages/@ember/engine/package.json b/packages/@ember/engine/package.json
@@ -19,11 +19,11 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
     "dag-map": "^2.0.2",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*",

diff --git a/packages/@ember/enumerable/package.json b/packages/@ember/enumerable/package.json
@@ -11,11 +11,11 @@
     "@ember/array": "workspace:*",
     "@ember/debug": "workspace:*",
     "@ember/object": "workspace:*",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
     "internal-test-helpers": "workspace:*"
   }
 }
diff --git a/packages/@ember/helper/package.json b/packages/@ember/helper/package.json
@@ -8,8 +8,8 @@
   "dependencies": {
     "@ember/-internals": "workspace:*",
     "@ember/component": "workspace:*",
-    "@glimmer/manager": "0.92.0",
-    "@glimmer/runtime": "0.92.0",
+    "@glimmer/manager": "0.92.4",
+    "@glimmer/runtime": "0.92.4",
     "expect-type": "^0.15.0"
   }
 }
diff --git a/packages/@ember/instrumentation/package.json b/packages/@ember/instrumentation/package.json
@@ -14,7 +14,7 @@
     "@ember/runloop": "workspace:*",
     "@ember/utils": "workspace:*",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/validator": "0.92.3",
     "internal-test-helpers": "workspace:*"
   }
 }
diff --git a/packages/@ember/modifier/package.json b/packages/@ember/modifier/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@ember/-internals": "workspace:*",
-    "@glimmer/manager": "0.92.0",
-    "@glimmer/runtime": "0.92.0"
+    "@glimmer/manager": "0.92.4",
+    "@glimmer/runtime": "0.92.4"
   }
 }
diff --git a/packages/@ember/object/package.json b/packages/@ember/object/package.json
@@ -26,12 +26,12 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.92.0",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/manager": "0.92.4",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }

diff --git a/packages/@ember/routing/package.json b/packages/@ember/routing/package.json
@@ -25,12 +25,12 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.92.0",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/manager": "0.92.4",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
     "backburner.js": "^2.7.0",
     "dag-map": "^2.0.2",
     "expect-type": "^0.15.0",

diff --git a/packages/@ember/runloop/package.json b/packages/@ember/runloop/package.json
@@ -13,7 +13,7 @@
     "@ember/object": "workspace:*",
     "@ember/utils": "workspace:*",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/validator": "0.92.3",
     "backburner.js": "^2.7.0",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"

diff --git a/packages/@ember/service/package.json b/packages/@ember/service/package.json
@@ -10,11 +10,11 @@
     "@ember/array": "workspace:*",
     "@ember/debug": "workspace:*",
     "@ember/object": "workspace:*",
-    "@glimmer/destroyable": "0.92.0",
+    "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.92.0",
-    "@glimmer/util": "0.92.0",
-    "@glimmer/validator": "0.92.0",
+    "@glimmer/owner": "0.92.3",
+    "@glimmer/util": "0.92.3",
+    "@glimmer/validator": "0.92.3",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }

diff --git a/packages/@ember/template-compilation/package.json b/packages/@ember/template-compilation/package.json
@@ -8,9 +8,9 @@
   "dependencies": {
     "@ember/-internals": "workspace:*",
     "@ember/canary-features": "workspace:*",
-    "@glimmer/compiler": "0.92.0",
+    "@glimmer/compiler": "0.92.4",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/syntax": "0.92.0",
+    "@glimmer/syntax": "0.92.3",
     "ember": "workspace:*",
     "ember-template-compiler": "workspace:*"
   }

diff --git a/packages/@ember/template-factory/package.json b/packages/@ember/template-factory/package.json
@@ -6,6 +6,6 @@
     ".": "./index.ts"
   },
   "dependencies": {
-    "@glimmer/opcode-compiler": "0.92.0"
+    "@glimmer/opcode-compiler": "0.92.4"
   }
 }