From 11f19594a67d7dddd78faa4c607951faaa101f8f Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sun, 3 May 2026 00:41:54 -0400 Subject: [PATCH 1/4] Make the rendering benchmark focus more on rendering --- smoke-tests/benchmark-app/app/app.js | 9 --------- .../benchmark-app/app/config/environment.js | 10 ---------- smoke-tests/benchmark-app/app/router.js | 9 --------- .../app/{services => templates}/cell.js | 0 .../app/{services => templates}/state.js | 7 +++---- .../benchmark-app/app/templates/the-table.gjs | 8 ++++---- .../app/{services => templates}/utils.js | 5 ----- smoke-tests/benchmark-app/index.html | 14 +++++++------- smoke-tests/benchmark-app/package.json | 1 - 9 files changed, 14 insertions(+), 49 deletions(-) delete mode 100644 smoke-tests/benchmark-app/app/app.js delete mode 100644 smoke-tests/benchmark-app/app/config/environment.js delete mode 100644 smoke-tests/benchmark-app/app/router.js rename smoke-tests/benchmark-app/app/{services => templates}/cell.js (100%) rename smoke-tests/benchmark-app/app/{services => templates}/state.js (87%) rename smoke-tests/benchmark-app/app/{services => templates}/utils.js (94%) diff --git a/smoke-tests/benchmark-app/app/app.js b/smoke-tests/benchmark-app/app/app.js deleted file mode 100644 index 98252c239e2..00000000000 --- a/smoke-tests/benchmark-app/app/app.js +++ /dev/null @@ -1,9 +0,0 @@ -import Application from 'ember-strict-application-resolver'; - -export default class App extends Application { - modules = { - ...import.meta.glob('./router.*', { eager: true }), - ...import.meta.glob('./templates/application.*', { eager: true }), - ...import.meta.glob('./services/state.*', { eager: true }), - }; -} diff --git a/smoke-tests/benchmark-app/app/config/environment.js b/smoke-tests/benchmark-app/app/config/environment.js deleted file mode 100644 index 8530468c0fd..00000000000 --- a/smoke-tests/benchmark-app/app/config/environment.js +++ /dev/null @@ -1,10 +0,0 @@ -const ENV = { - modulePrefix: 'benchmark-app', - environment: import.meta.env.DEV ? 'development' : 'production', - rootURL: '/', - locationType: 'history', - EmberENV: {}, - APP: {}, -}; - -export default ENV; diff --git a/smoke-tests/benchmark-app/app/router.js b/smoke-tests/benchmark-app/app/router.js deleted file mode 100644 index ce92066c976..00000000000 --- a/smoke-tests/benchmark-app/app/router.js +++ /dev/null @@ -1,9 +0,0 @@ -import EmberRouter from '@embroider/router'; -import config from 'benchmark-app/config/environment'; - -export default class Router extends EmberRouter { - location = config.locationType; - rootURL = config.rootURL; -} - -Router.map(function () {}); diff --git a/smoke-tests/benchmark-app/app/services/cell.js b/smoke-tests/benchmark-app/app/templates/cell.js similarity index 100% rename from smoke-tests/benchmark-app/app/services/cell.js rename to smoke-tests/benchmark-app/app/templates/cell.js diff --git a/smoke-tests/benchmark-app/app/services/state.js b/smoke-tests/benchmark-app/app/templates/state.js similarity index 87% rename from smoke-tests/benchmark-app/app/services/state.js rename to smoke-tests/benchmark-app/app/templates/state.js index 3b1249018ae..4a4f977d9c9 100644 --- a/smoke-tests/benchmark-app/app/services/state.js +++ b/smoke-tests/benchmark-app/app/templates/state.js @@ -1,10 +1,9 @@ -import Service from '@ember/service'; import { tracked } from '@glimmer/tracking'; import { trackedArray } from '@ember/reactive/collections'; -import { run, runLots, add, update, swapRows, deleteRow } from './utils.js'; +import { run, runLots, add, update, swapRows } from './utils.js'; -export default class State extends Service { +export class State { data = new trackedArray(); id = 1; @tracked selected; @@ -60,4 +59,4 @@ export default class State extends Service { isSelected = ({ id }) => { return this.selected === id; }; -} \ No newline at end of file +} diff --git a/smoke-tests/benchmark-app/app/templates/the-table.gjs b/smoke-tests/benchmark-app/app/templates/the-table.gjs index 79c38146d68..4b2c8da84ea 100644 --- a/smoke-tests/benchmark-app/app/templates/the-table.gjs +++ b/smoke-tests/benchmark-app/app/templates/the-table.gjs @@ -1,13 +1,13 @@ import Component from '@glimmer/component'; import { fn } from '@ember/helper'; -import { service } from '@ember/service'; +import { State } from './state.js'; export class TheTable extends Component { - @service state; + state = new State(); /** * We currently don't have a way to emit HTML with no invisible characters - * and have the template look nice. + * and have the template look nice. */ -} \ No newline at end of file +} diff --git a/smoke-tests/benchmark-app/app/services/utils.js b/smoke-tests/benchmark-app/app/templates/utils.js similarity index 94% rename from smoke-tests/benchmark-app/app/services/utils.js rename to smoke-tests/benchmark-app/app/templates/utils.js index f6f3f1b5179..b5f2d06820e 100644 --- a/smoke-tests/benchmark-app/app/services/utils.js +++ b/smoke-tests/benchmark-app/app/templates/utils.js @@ -120,8 +120,3 @@ export const swapRows = (data) => { } }; -export const deleteRow = (data, id) => { - return data.filter((d) => { - return d.id !== id; - }); -}; \ No newline at end of file diff --git a/smoke-tests/benchmark-app/index.html b/smoke-tests/benchmark-app/index.html index d9a7949c5ca..4f08e3408e8 100644 --- a/smoke-tests/benchmark-app/index.html +++ b/smoke-tests/benchmark-app/index.html @@ -6,18 +6,18 @@ - + - + diff --git a/smoke-tests/benchmark-app/package.json b/smoke-tests/benchmark-app/package.json index c5d26558137..05021b791a0 100644 --- a/smoke-tests/benchmark-app/package.json +++ b/smoke-tests/benchmark-app/package.json @@ -31,7 +31,6 @@ "babel-plugin-ember-template-compilation": "^4.0.0", "decorator-transforms": "^2.3.1", "ember-source": "workspace:*", - "ember-strict-application-resolver": "^0.1.1", "vite": "^7.3.0" }, "engines": { From 186668ecf3cf46eaaad6469b9565f8480e019a48 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sun, 3 May 2026 00:44:50 -0400 Subject: [PATCH 2/4] Move a bit --- build-metadata.json | 6 ++++++ package.json | 9 +++++++-- pnpm-lock.yaml | 14 -------------- smoke-tests/benchmark-app/index.html | 4 ++-- .../{app/templates/application.gjs => src/app.gjs} | 6 +++--- .../{app/templates => src/jsfb}/cell.js | 0 .../{app/templates => src/jsfb}/jumbotron.gjs | 0 .../{app/templates => src/jsfb}/state.js | 0 .../{app/templates => src/jsfb}/the-table.gjs | 0 .../{app/templates => src/jsfb}/utils.js | 0 .../benchmark-app/{app => src}/run-benchmark.js | 0 11 files changed, 18 insertions(+), 21 deletions(-) create mode 100644 build-metadata.json rename smoke-tests/benchmark-app/{app/templates/application.gjs => src/app.gjs} (67%) rename smoke-tests/benchmark-app/{app/templates => src/jsfb}/cell.js (100%) rename smoke-tests/benchmark-app/{app/templates => src/jsfb}/jumbotron.gjs (100%) rename smoke-tests/benchmark-app/{app/templates => src/jsfb}/state.js (100%) rename smoke-tests/benchmark-app/{app/templates => src/jsfb}/the-table.gjs (100%) rename smoke-tests/benchmark-app/{app/templates => src/jsfb}/utils.js (100%) rename smoke-tests/benchmark-app/{app => src}/run-benchmark.js (100%) diff --git a/build-metadata.json b/build-metadata.json new file mode 100644 index 00000000000..15f0ab48219 --- /dev/null +++ b/build-metadata.json @@ -0,0 +1,6 @@ +{ + "version": "7.1.0-alpha.1.nvp-make-benchmark-focus-on-rendering-rather-than-load-whole-app+11f19594", + "buildType": "nvp-make-benchmark-focus-on-rendering-rather-than-load-whole-app", + "SHA": "11f19594a67d7dddd78faa4c607951faaa101f8f", + "assetPath": "/nvp-make-benchmark-focus-on-rendering-rather-than-load-whole-app/shas/11f19594a67d7dddd78faa4c607951faaa101f8f.tgz" +} \ No newline at end of file diff --git a/package.json b/package.json index 008724da9c5..fd1c4d1c9c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-source", - "version": "7.1.0-alpha.1", + "version": "7.1.0-alpha.1.nvp-make-benchmark-focus-on-rendering-rather-than-load-whole-app+11f19594", "description": "A JavaScript framework for creating ambitious web applications", "keywords": [ "ember-addon" @@ -360,5 +360,10 @@ ] } }, - "packageManager": "pnpm@10.30.3" + "packageManager": "pnpm@10.30.3", + "_originalVersion": "7.1.0-alpha.1", + "_versionPreviouslyCalculated": true, + "publishConfig": { + "tag": "old" + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cb109a206f1..af1b9c903a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2939,9 +2939,6 @@ importers: ember-source: specifier: workspace:* version: link:../.. - ember-strict-application-resolver: - specifier: ^0.1.1 - version: 0.1.1(@babel/core@7.29.0) vite: specifier: ^7.3.0 version: 7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1) @@ -7770,9 +7767,6 @@ packages: resolution: {integrity: sha512-89oVHVJwmLDvGvAUWgS87KpBoRhy3aZ6U0Ql6HOmU4TrPkyaa8pM0W81wj9cIwjYprcQtN9EwzZMHnq46+oUyw==} engines: {node: 8.* || 10.* || >= 12} - ember-strict-application-resolver@0.1.1: - resolution: {integrity: sha512-/49JZ2Yk2ggicAGIoFNWcz05llhe2i+/2dpH5Pv1KlwZOBKkqMMJpTKEB4IMg+FjKBiE0r2yxuZzo9Oly9vc1A==} - ember-template-imports@3.4.2: resolution: {integrity: sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==} engines: {node: 12.* || >= 14} @@ -18257,14 +18251,6 @@ snapshots: transitivePeerDependencies: - supports-color - ember-strict-application-resolver@0.1.1(@babel/core@7.29.0): - dependencies: - '@embroider/addon-shim': 1.10.2 - decorator-transforms: 2.3.1(@babel/core@7.29.0) - transitivePeerDependencies: - - '@babel/core' - - supports-color - ember-template-imports@3.4.2: dependencies: babel-import-util: 0.2.0 diff --git a/smoke-tests/benchmark-app/index.html b/smoke-tests/benchmark-app/index.html index 4f08e3408e8..c0ee6cc822a 100644 --- a/smoke-tests/benchmark-app/index.html +++ b/smoke-tests/benchmark-app/index.html @@ -11,10 +11,10 @@