Skip to content

Move to pnpm #11

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.

Sign up for GitHub

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 4 commits into
base: main
Choose a base branch
from
+13,767 −29,547
Open

Move to pnpm #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5004ef8
Move bootstrap from vendor + broccoli to 'just a static file'
NullVoxPopuli Jul 30, 2024
3bb4190
Move files to the public folder (statically do what broccoli was doin…
NullVoxPopuli Jul 30, 2024
3bb13f7
Finish copying the index.html files
NullVoxPopuli Jul 30, 2024
11c732f
Move to pnpm
NullVoxPopuli Jul 30, 2024
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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",
});
};
Loading