Skip to content

Reduce broccoli usage/move benchmarks to public folder #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

{{content-for "head"}}

<link integrity="" rel="stylesheet" href="{{rootURL}}bootstrap.css">
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-performance.css">

Expand Down
7 changes: 4 additions & 3 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use strict";

const fs = require("fs");
const path = require("path");
const naturalSort = require("javascript-natural-sort");

function emberVersions() {
Expand All @@ -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;
})
Expand Down
34 changes: 3 additions & 31 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
});

Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
});
};
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,6 @@
},
"ember": {
"edition": "octane"
}
},
"packageManager": "[email protected]+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e"
}
27 changes: 27 additions & 0 deletions public/benchmarks/baseline-handlebars-list/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
27 changes: 27 additions & 0 deletions public/benchmarks/baseline-render-list/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
File renamed without changes.
27 changes: 27 additions & 0 deletions public/benchmarks/ember-get/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
File renamed without changes.
File renamed without changes.
27 changes: 27 additions & 0 deletions public/benchmarks/ember-run/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
File renamed without changes.
File renamed without changes.
27 changes: 27 additions & 0 deletions public/benchmarks/ember-set/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
File renamed without changes.
27 changes: 27 additions & 0 deletions public/benchmarks/render-complex-html-glimmer-to/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
27 changes: 27 additions & 0 deletions public/benchmarks/render-complex-html-glimmer/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
27 changes: 27 additions & 0 deletions public/benchmarks/render-complex-html-hbs/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
27 changes: 27 additions & 0 deletions public/benchmarks/render-complex-html/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
27 changes: 27 additions & 0 deletions public/benchmarks/render-link-to/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html style="overflow: hidden">
<head>
<title>Ember Performance - Testing</title>
<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/ember-performance.css">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>

<body>
<div class="container">
<h3 class="text-muted" id='test-title'></h3>
<h4>
Ember Version: <span id='ember-version'></span>
</h4>
<h4 id='remaining-text'></h4>

<p id='status-text'></p>

<p id='progress'></p>

<div id='scratch'></div>
</div>

<script src="/assets/test-client.js"></script>
<script src="index.js"></script>
</body>
</html>
Loading