Skip to content

Commit e40ae77

Browse files
Go full minimal (#1), resolve install warnings
1 parent 3b760c0 commit e40ae77

File tree

14 files changed

+4777
-13544
lines changed

14 files changed

+4777
-13544
lines changed

frameworks/keyed/ember/.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*.yaml
66
*.yml
77
*.md
8+
package-lock.json
89

910
# unconventional js
1011
/blueprints/*/files/

frameworks/keyed/ember/babel.config.cjs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
const { babelCompatSupport } = require('@embroider/compat/babel');
1+
'use strict';
2+
3+
const { buildMacros } = require('@embroider/macros/babel');
4+
const macros = buildMacros({});
25

36
module.exports = {
47
plugins: [
58
[
69
'babel-plugin-ember-template-compilation',
710
{
811
compilerPath: 'ember-source/dist/ember-template-compiler.js',
9-
enableLegacyModules: [
10-
'ember-cli-htmlbars',
11-
'ember-cli-htmlbars-inline-precompile',
12-
'htmlbars-inline-precompile',
13-
],
14-
transforms: [],
12+
transforms: [...macros.templateMacros],
1513
},
1614
],
1715
[
@@ -22,10 +20,7 @@ module.exports = {
2220
regenerator: false,
2321
},
2422
],
25-
// This can leave once
26-
// https://github.com/embroider-build/embroider/pull/2249
27-
// is merged
28-
...babelCompatSupport(),
23+
...macros.babelMacros,
2924
],
3025

3126
generatorOpts: {

frameworks/keyed/ember/checks.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
# NOTE: the tooling will not detect us as a benchable implementation
44
# unless there is a package-lock.json
55
#
6-
# We're using pnpm to interact with js-framework-benchmark
7-
# instead of npm because pnpm (at least on my machine)
8-
# tends to work better.
9-
# (and is stricter)
10-
#
116
# At the very least this script documents
127
# how to interact with the jsfb packages...
138
# at least in one point in time.
@@ -38,11 +33,13 @@ case "$1" in
3833
start)
3934
# https://github.com/krausest/js-framework-benchmark/tree/chrome110?tab=readme-ov-file#22-start-installing
4035
cd ../../../
41-
pnpm install
36+
npm install
37+
# pnpm install
4238
# They are missing a dependency
43-
pnpm add @esbuild/[email protected]
44-
pnpm rebuild
45-
pnpm start
39+
# pnpm add @esbuild/[email protected]
40+
# pnpm rebuild
41+
# pnpm start
42+
npm start
4643
;;
4744

4845
# 3. Verify
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
import { ember } from 'ember-eslint';
22

3-
export default [...ember.recommended(import.meta.dirname)];
3+
const defaults = ember.recommended(import.meta.dirname);
4+
5+
export default [...defaults];

0 commit comments

Comments
 (0)