diff --git a/app/index.html b/app/index.html index 72fb414..cc39e8b 100644 --- a/app/index.html +++ b/app/index.html @@ -8,6 +8,7 @@ {{content-for "head"}} + diff --git a/config/environment.js b/config/environment.js index dc3934a..b1c5f7a 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,6 +1,7 @@ "use strict"; const fs = require("fs"); +const path = require("path"); const naturalSort = require("javascript-natural-sort"); function emberVersions() { @@ -18,12 +19,12 @@ function emberVersions() { } const walkSync = require("walk-sync"); -const path = require("path"); function benchmarks() { - return walkSync("benchmarks", ["**/bench.json"]) + let baseDir = path.join("public", "benchmarks"); + return walkSync(baseDir, ["**/bench.json"]) .map(function (bench) { - const data = JSON.parse(fs.readFileSync("benchmarks" + "/" + bench)); + const data = JSON.parse(fs.readFileSync(path.join(baseDir, bench))); data.path = "/" + path.dirname(bench); return data; }) diff --git a/ember-cli-build.js b/ember-cli-build.js index 68b41fe..61558d5 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -12,7 +12,6 @@ const clientDepsTree = new Funnel("node_modules", { "benchmark/benchmark.js", "rsvp/dist/rsvp.js", "ascii-table/ascii-table.js", - "lodash/lodash.js", ], }); @@ -25,7 +24,6 @@ const testClient = new Concat(clientTree, { "test-client.js", "test-session.js", "headjs/dist/1.0.0/head.js", - "lodash/lodash.js", "benchmark/benchmark.js", "rsvp/dist/rsvp.js", "ascii-table/ascii-table.js", @@ -34,20 +32,6 @@ const testClient = new Concat(clientTree, { outputFile: "/assets/test-client.js", }); -const compileTemplatesTree = new Funnel("compile-templates", { - include: ["index.{html,js}"], - destDir: "compile-templates", -}); - -const benchmarksIndexJs = new Funnel("benchmarks", { - include: ["**/*.js"], - destDir: "benchmarks", -}); - -const benchmarksIndexHtml = new CopyIndex(benchmarksIndexJs, { - annotation: "Copy index.html to benchmark", -}); - const emberTree = new Funnel("ember", { include: ["**/*.js"], destDir: "ember", @@ -79,19 +63,7 @@ module.exports = function (defaults) { }, }); - app.import("vendor/bootstrap.css"); - - return new MergeTrees( - [ - app.toTree(), - testClient, - compileTemplatesTree, - benchmarksIndexJs, - benchmarksIndexHtml, - emberTree, - ], - { - annotation: "final dist merge", - }, - ); + return new MergeTrees([app.toTree(), testClient, emberTree], { + annotation: "final dist merge", + }); }; diff --git a/package-lock.json b/package-lock.json index 18e2e6b..790e4de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ember-performance", - "version": "0.12.0", + "version": "0.13.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ember-performance", - "version": "0.12.0", + "version": "0.13.0", "license": "MIT", "devDependencies": { "@babel/core": "^7.24.7", diff --git a/package.json b/package.json index aedc18c..ca7f365 100644 --- a/package.json +++ b/package.json @@ -87,5 +87,6 @@ }, "ember": { "edition": "octane" - } + }, + "packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e" } diff --git a/benchmarks/baseline-handlebars-list/bench.json b/public/benchmarks/baseline-handlebars-list/bench.json similarity index 100% rename from benchmarks/baseline-handlebars-list/bench.json rename to public/benchmarks/baseline-handlebars-list/bench.json diff --git a/public/benchmarks/baseline-handlebars-list/index.html b/public/benchmarks/baseline-handlebars-list/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/baseline-handlebars-list/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/baseline-handlebars-list/index.js b/public/benchmarks/baseline-handlebars-list/index.js similarity index 100% rename from benchmarks/baseline-handlebars-list/index.js rename to public/benchmarks/baseline-handlebars-list/index.js diff --git a/benchmarks/baseline-render-list/bench.json b/public/benchmarks/baseline-render-list/bench.json similarity index 100% rename from benchmarks/baseline-render-list/bench.json rename to public/benchmarks/baseline-render-list/bench.json diff --git a/public/benchmarks/baseline-render-list/index.html b/public/benchmarks/baseline-render-list/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/baseline-render-list/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/baseline-render-list/index.js b/public/benchmarks/baseline-render-list/index.js similarity index 100% rename from benchmarks/baseline-render-list/index.js rename to public/benchmarks/baseline-render-list/index.js diff --git a/benchmarks/ember-get/bench.json b/public/benchmarks/ember-get/bench.json similarity index 100% rename from benchmarks/ember-get/bench.json rename to public/benchmarks/ember-get/bench.json diff --git a/public/benchmarks/ember-get/index.html b/public/benchmarks/ember-get/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/ember-get/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/ember-get/index.js b/public/benchmarks/ember-get/index.js similarity index 100% rename from benchmarks/ember-get/index.js rename to public/benchmarks/ember-get/index.js diff --git a/benchmarks/ember-get/primed/bench.json b/public/benchmarks/ember-get/primed/bench.json similarity index 100% rename from benchmarks/ember-get/primed/bench.json rename to public/benchmarks/ember-get/primed/bench.json diff --git a/benchmarks/ember-get/primed/index.js b/public/benchmarks/ember-get/primed/index.js similarity index 100% rename from benchmarks/ember-get/primed/index.js rename to public/benchmarks/ember-get/primed/index.js diff --git a/benchmarks/ember-run/bench.json b/public/benchmarks/ember-run/bench.json similarity index 100% rename from benchmarks/ember-run/bench.json rename to public/benchmarks/ember-run/bench.json diff --git a/public/benchmarks/ember-run/index.html b/public/benchmarks/ember-run/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/ember-run/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/ember-run/index.js b/public/benchmarks/ember-run/index.js similarity index 100% rename from benchmarks/ember-run/index.js rename to public/benchmarks/ember-run/index.js diff --git a/benchmarks/ember-set/bench.json b/public/benchmarks/ember-set/bench.json similarity index 100% rename from benchmarks/ember-set/bench.json rename to public/benchmarks/ember-set/bench.json diff --git a/public/benchmarks/ember-set/index.html b/public/benchmarks/ember-set/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/ember-set/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/ember-set/index.js b/public/benchmarks/ember-set/index.js similarity index 100% rename from benchmarks/ember-set/index.js rename to public/benchmarks/ember-set/index.js diff --git a/benchmarks/ember-set/primed/bench.json b/public/benchmarks/ember-set/primed/bench.json similarity index 100% rename from benchmarks/ember-set/primed/bench.json rename to public/benchmarks/ember-set/primed/bench.json diff --git a/benchmarks/ember-set/primed/index.js b/public/benchmarks/ember-set/primed/index.js similarity index 100% rename from benchmarks/ember-set/primed/index.js rename to public/benchmarks/ember-set/primed/index.js diff --git a/benchmarks/render-complex-html-glimmer-to/bench.json b/public/benchmarks/render-complex-html-glimmer-to/bench.json similarity index 100% rename from benchmarks/render-complex-html-glimmer-to/bench.json rename to public/benchmarks/render-complex-html-glimmer-to/bench.json diff --git a/public/benchmarks/render-complex-html-glimmer-to/index.html b/public/benchmarks/render-complex-html-glimmer-to/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-complex-html-glimmer-to/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-complex-html-glimmer-to/index.js b/public/benchmarks/render-complex-html-glimmer-to/index.js similarity index 100% rename from benchmarks/render-complex-html-glimmer-to/index.js rename to public/benchmarks/render-complex-html-glimmer-to/index.js diff --git a/benchmarks/render-complex-html-glimmer/bench.json b/public/benchmarks/render-complex-html-glimmer/bench.json similarity index 100% rename from benchmarks/render-complex-html-glimmer/bench.json rename to public/benchmarks/render-complex-html-glimmer/bench.json diff --git a/public/benchmarks/render-complex-html-glimmer/index.html b/public/benchmarks/render-complex-html-glimmer/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-complex-html-glimmer/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-complex-html-glimmer/index.js b/public/benchmarks/render-complex-html-glimmer/index.js similarity index 100% rename from benchmarks/render-complex-html-glimmer/index.js rename to public/benchmarks/render-complex-html-glimmer/index.js diff --git a/benchmarks/render-complex-html-hbs/bench.json b/public/benchmarks/render-complex-html-hbs/bench.json similarity index 100% rename from benchmarks/render-complex-html-hbs/bench.json rename to public/benchmarks/render-complex-html-hbs/bench.json diff --git a/public/benchmarks/render-complex-html-hbs/index.html b/public/benchmarks/render-complex-html-hbs/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-complex-html-hbs/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-complex-html-hbs/index.js b/public/benchmarks/render-complex-html-hbs/index.js similarity index 100% rename from benchmarks/render-complex-html-hbs/index.js rename to public/benchmarks/render-complex-html-hbs/index.js diff --git a/benchmarks/render-complex-html/bench.json b/public/benchmarks/render-complex-html/bench.json similarity index 100% rename from benchmarks/render-complex-html/bench.json rename to public/benchmarks/render-complex-html/bench.json diff --git a/public/benchmarks/render-complex-html/index.html b/public/benchmarks/render-complex-html/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-complex-html/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-complex-html/index.js b/public/benchmarks/render-complex-html/index.js similarity index 100% rename from benchmarks/render-complex-html/index.js rename to public/benchmarks/render-complex-html/index.js diff --git a/benchmarks/render-link-to/bench.json b/public/benchmarks/render-link-to/bench.json similarity index 100% rename from benchmarks/render-link-to/bench.json rename to public/benchmarks/render-link-to/bench.json diff --git a/public/benchmarks/render-link-to/index.html b/public/benchmarks/render-link-to/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-link-to/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-link-to/index.js b/public/benchmarks/render-link-to/index.js similarity index 100% rename from benchmarks/render-link-to/index.js rename to public/benchmarks/render-link-to/index.js diff --git a/benchmarks/render-list-glimmer/bench.json b/public/benchmarks/render-list-glimmer/bench.json similarity index 100% rename from benchmarks/render-list-glimmer/bench.json rename to public/benchmarks/render-list-glimmer/bench.json diff --git a/public/benchmarks/render-list-glimmer/index.html b/public/benchmarks/render-list-glimmer/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-list-glimmer/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-list-glimmer/index.js b/public/benchmarks/render-list-glimmer/index.js similarity index 100% rename from benchmarks/render-list-glimmer/index.js rename to public/benchmarks/render-list-glimmer/index.js diff --git a/benchmarks/render-list-unbound-glimmer/bench.json b/public/benchmarks/render-list-unbound-glimmer/bench.json similarity index 100% rename from benchmarks/render-list-unbound-glimmer/bench.json rename to public/benchmarks/render-list-unbound-glimmer/bench.json diff --git a/public/benchmarks/render-list-unbound-glimmer/index.html b/public/benchmarks/render-list-unbound-glimmer/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-list-unbound-glimmer/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-list-unbound-glimmer/index.js b/public/benchmarks/render-list-unbound-glimmer/index.js similarity index 100% rename from benchmarks/render-list-unbound-glimmer/index.js rename to public/benchmarks/render-list-unbound-glimmer/index.js diff --git a/benchmarks/render-list-unbound/bench.json b/public/benchmarks/render-list-unbound/bench.json similarity index 100% rename from benchmarks/render-list-unbound/bench.json rename to public/benchmarks/render-list-unbound/bench.json diff --git a/public/benchmarks/render-list-unbound/index.html b/public/benchmarks/render-list-unbound/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-list-unbound/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-list-unbound/index.js b/public/benchmarks/render-list-unbound/index.js similarity index 100% rename from benchmarks/render-list-unbound/index.js rename to public/benchmarks/render-list-unbound/index.js diff --git a/benchmarks/render-list-with-link-to/bench.json b/public/benchmarks/render-list-with-link-to/bench.json similarity index 100% rename from benchmarks/render-list-with-link-to/bench.json rename to public/benchmarks/render-list-with-link-to/bench.json diff --git a/public/benchmarks/render-list-with-link-to/index.html b/public/benchmarks/render-list-with-link-to/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-list-with-link-to/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-list-with-link-to/index.js b/public/benchmarks/render-list-with-link-to/index.js similarity index 100% rename from benchmarks/render-list-with-link-to/index.js rename to public/benchmarks/render-list-with-link-to/index.js diff --git a/benchmarks/render-list/bench.json b/public/benchmarks/render-list/bench.json similarity index 100% rename from benchmarks/render-list/bench.json rename to public/benchmarks/render-list/bench.json diff --git a/public/benchmarks/render-list/index.html b/public/benchmarks/render-list/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-list/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-list/index.js b/public/benchmarks/render-list/index.js similarity index 100% rename from benchmarks/render-list/index.js rename to public/benchmarks/render-list/index.js diff --git a/benchmarks/render-simple-ember-list/bench.json b/public/benchmarks/render-simple-ember-list/bench.json similarity index 100% rename from benchmarks/render-simple-ember-list/bench.json rename to public/benchmarks/render-simple-ember-list/bench.json diff --git a/public/benchmarks/render-simple-ember-list/index.html b/public/benchmarks/render-simple-ember-list/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/render-simple-ember-list/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/render-simple-ember-list/index.js b/public/benchmarks/render-simple-ember-list/index.js similarity index 100% rename from benchmarks/render-simple-ember-list/index.js rename to public/benchmarks/render-simple-ember-list/index.js diff --git a/benchmarks/string-classify/bench.json b/public/benchmarks/string-classify/bench.json similarity index 100% rename from benchmarks/string-classify/bench.json rename to public/benchmarks/string-classify/bench.json diff --git a/public/benchmarks/string-classify/index.html b/public/benchmarks/string-classify/index.html new file mode 100644 index 0000000..671ee8c --- /dev/null +++ b/public/benchmarks/string-classify/index.html @@ -0,0 +1,27 @@ + + + Ember Performance - Testing + + + + + + +
+

+

+ Ember Version: +

+

+ +

+ +

+ +
+
+ + + + + diff --git a/benchmarks/string-classify/index.js b/public/benchmarks/string-classify/index.js similarity index 100% rename from benchmarks/string-classify/index.js rename to public/benchmarks/string-classify/index.js diff --git a/vendor/bootstrap.css b/public/bootstrap.css similarity index 100% rename from vendor/bootstrap.css rename to public/bootstrap.css diff --git a/compile-templates/index.html b/public/compile-templates/index.html similarity index 100% rename from compile-templates/index.html rename to public/compile-templates/index.html diff --git a/compile-templates/index.js b/public/compile-templates/index.js similarity index 100% rename from compile-templates/index.js rename to public/compile-templates/index.js