Skip to content

Commit e53566e

Browse files
committed
Apply v2 addon blueprint
Ran `pnpx ember-cli@latest addon @ember/render-modifiers -b @embroider/addon-blueprint --pnpm --skip-install --skip-git --typescript --addon-location=ember-render-modifiers` and created everything from scratch then copied in modifiers, tests, and the PNPM version setting from ci.yml
1 parent 546efdb commit e53566e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+3921
-2803
lines changed

.eslintrc.js

Lines changed: 0 additions & 56 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@ concurrency:
1616

1717
jobs:
1818
test:
19-
name: "Tests"
19+
name: 'Tests'
2020
runs-on: ubuntu-latest
2121
timeout-minutes: 10
2222

2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- uses: pnpm/action-setup@v4
26-
with:
27-
version: 9
28-
- name: Install Node
29-
uses: actions/setup-node@v3
26+
- uses: actions/setup-node@v4
3027
with:
3128
node-version: 18
3229
cache: pnpm
@@ -35,31 +32,29 @@ jobs:
3532
- name: Lint
3633
run: pnpm lint
3734
- name: Run Tests
38-
run: pnpm test:ember
35+
run: pnpm test
3936

4037
floating:
41-
name: "Floating Dependencies"
38+
name: 'Floating Dependencies'
4239
runs-on: ubuntu-latest
4340
timeout-minutes: 10
4441

4542
steps:
46-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v4
4744
- uses: pnpm/action-setup@v4
48-
with:
49-
version: 9
50-
- uses: actions/setup-node@v3
45+
- uses: actions/setup-node@v4
5146
with:
5247
node-version: 18
5348
cache: pnpm
5449
- name: Install Dependencies
5550
run: pnpm install --no-lockfile
5651
- name: Run Tests
57-
run: pnpm test:ember
52+
run: pnpm test
5853

5954
try-scenarios:
6055
name: ${{ matrix.try-scenario }}
6156
runs-on: ubuntu-latest
62-
needs: "test"
57+
needs: 'test'
6358
timeout-minutes: 10
6459

6560
strategy:
@@ -75,16 +70,14 @@ jobs:
7570
- embroider-optimized
7671

7772
steps:
78-
- uses: actions/checkout@v3
73+
- uses: actions/checkout@v4
7974
- uses: pnpm/action-setup@v4
80-
with:
81-
version: 9
82-
- name: Install Node
83-
uses: actions/setup-node@v3
75+
- uses: actions/setup-node@v4
8476
with:
8577
node-version: 18
8678
cache: pnpm
8779
- name: Install Dependencies
8880
run: pnpm install --frozen-lockfile
8981
- name: Run Tests
90-
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
82+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup
83+
working-directory: test-app

.github/workflows/push-dist.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Because this library needs to be built,
2+
# we can't easily point package.json files at the git repo for easy cross-repo testing.
3+
#
4+
# This workflow brings back that capability by placing the compiled assets on a "dist" branch
5+
# (configurable via the "branch" option below)
6+
name: Push dist
7+
8+
on:
9+
push:
10+
branches:
11+
- main
12+
- master
13+
14+
jobs:
15+
push-dist:
16+
name: Push dist
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 10
19+
20+
steps:
21+
- uses: actions/checkout@v4
22+
- uses: pnpm/action-setup@v4
23+
- uses: actions/setup-node@v4
24+
with:
25+
node-version: 18
26+
cache: pnpm
27+
- name: Install Dependencies
28+
run: pnpm install --frozen-lockfile
29+
- uses: kategengler/[email protected]
30+
with:
31+
branch: dist
32+
token: ${{ secrets.GITHUB_TOKEN }}
33+
working-directory: '@ember/render-modifiers'

.gitignore

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
# compiled output
2-
/dist/
3-
/declarations/
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
42

53
# dependencies
6-
/node_modules/
4+
node_modules/
75

86
# misc
9-
/.env*
10-
/.pnp*
11-
/.eslintcache
12-
/coverage/
13-
/npm-debug.log*
14-
/testem.log
15-
/yarn-error.log
7+
.env*
8+
.pnp*
9+
.pnpm-debug.log
10+
.sass-cache
11+
.eslintcache
12+
coverage/
13+
npm-debug.log*
14+
yarn-error.log
1615

1716
# ember-try
1817
/.node_modules.ember-try/
19-
/npm-shrinkwrap.json.ember-try
2018
/package.json.ember-try
2119
/package-lock.json.ember-try
2220
/yarn.lock.ember-try
21+
/pnpm-lock.ember-try.yaml
2322

24-
# broccoli-debug
25-
/DEBUG/

.npmignore

Lines changed: 0 additions & 37 deletions
This file was deleted.

.prettierignore

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
# unconventional js
2-
/blueprints/*/files/
3-
4-
# compiled output
5-
/dist/
1+
# Prettier is also run from each package, so the ignores here
2+
# protect against files that may not be within a package
63

74
# misc
8-
/coverage/
95
!.*
10-
.*/
6+
.lint-todo/
117

128
# ember-try
139
/.node_modules.ember-try/
10+
/pnpm-lock.ember-try.yaml

.prettierrc.cjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
'use strict';
2+
3+
module.exports = {
4+
plugins: ['prettier-plugin-ember-template-tag'],
5+
singleQuote: true,
6+
};

.prettierrc.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

app/modifiers/did-insert.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/modifiers/did-update.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/modifiers/will-destroy.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

config/ember-cli-update.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"schemaVersion": "1.0.0",
3+
"projectName": "@ember/render-modifiers",
4+
"packages": [
5+
{
6+
"name": "@embroider/addon-blueprint",
7+
"version": "4.1.1",
8+
"blueprints": [
9+
{
10+
"name": "@embroider/addon-blueprint",
11+
"isBaseBlueprint": true,
12+
"options": [
13+
"--addon-location=ember-render-modifiers",
14+
"--ci-provider=github",
15+
"--pnpm",
16+
"--typescript"
17+
]
18+
}
19+
]
20+
}
21+
]
22+
}

ember-cli-build.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

ember-render-modifiers/.gitignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# The authoritative copies of these live in the monorepo root (because they're
2+
# more useful on github that way), but the build copies them into here so they
3+
# will also appear in published NPM packages.
4+
/README.md
5+
/LICENSE.md
6+
7+
# compiled output
8+
dist/
9+
declarations/
10+
11+
# npm/pnpm/yarn pack output
12+
*.tgz
13+
14+
# deps & caches
15+
node_modules/
16+
.eslintcache
17+
.prettiercache
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
/declarations/
7+
8+
# misc
9+
/coverage/
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
module.exports = {
4+
plugins: ['prettier-plugin-ember-template-tag'],
5+
overrides: [
6+
{
7+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
8+
options: {
9+
singleQuote: true,
10+
templateSingleQuote: false,
11+
},
12+
},
13+
],
14+
};
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
name: require('./package').name,
4+
extends: 'recommended',
55
};

ember-render-modifiers/addon-main.cjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
'use strict';
2+
3+
const { addonV1Shim } = require('@embroider/addon-shim');
4+
module.exports = addonV1Shim(__dirname);

0 commit comments

Comments
 (0)