Skip to content

Commit 555b71f

Browse files
Merge pull request #222 from ember-cli/nvp/v2-addon
Convert to v2 Addon - classic apps (using ember-cli for build) will want to remain on v3
2 parents ce6ff00 + 481909b commit 555b71f

64 files changed

Lines changed: 8410 additions & 9726 deletions

Some content is hidden

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

.ember-cli

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

.env.development

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file is committed to git and should not contain any secrets.
2+
#
3+
# Vite recommends using .env.local or .env.[mode].local if you need to manage secrets
4+
# SEE: https://vite.dev/guide/env-and-mode.html#env-files for more information.
5+
6+
7+
# Default NODE_ENV with vite build --mode=test is production
8+
NODE_ENV=development

.eslintignore

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

.eslintrc.js

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

.github/workflows/ci.yml

Lines changed: 54 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -12,89 +12,87 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15+
lint:
16+
name: "Lints"
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 10
19+
20+
steps:
21+
- uses: actions/checkout@v6
22+
- uses: pnpm/action-setup@v4
23+
- uses: actions/setup-node@v6
24+
with:
25+
node-version: 22
26+
cache: pnpm
27+
- name: Install Dependencies
28+
run: pnpm install --frozen-lockfile
29+
- name: Lint
30+
run: pnpm lint
31+
1532
test:
1633
name: "Tests"
1734
runs-on: ubuntu-latest
18-
timeout-minutes: 8
35+
timeout-minutes: 10
36+
outputs:
37+
matrix: ${{ steps.set-matrix.outputs.matrix }}
1938

2039
steps:
21-
- name: Checkout
22-
uses: actions/checkout@v4
23-
- uses: pnpm/action-setup@v3
24-
with:
25-
version: 8
26-
- name: Install Node
27-
uses: actions/setup-node@v4
40+
- uses: actions/checkout@v6
41+
- uses: pnpm/action-setup@v4
42+
- uses: actions/setup-node@v6
2843
with:
29-
node-version: 16
44+
node-version: 22
3045
cache: pnpm
3146
- name: Install Dependencies
32-
run: pnpm i --frozen-lockfile
33-
- name: Lint
34-
run: npm run lint
47+
run: pnpm install --frozen-lockfile
3548
- name: Run Tests
36-
run: pnpm ember test
49+
run: pnpm test
50+
# For the Try Scenarios
51+
- id: set-matrix
52+
run: |
53+
echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT
3754
3855
floating:
3956
name: "Floating Dependencies"
4057
runs-on: ubuntu-latest
41-
timeout-minutes: 8
58+
timeout-minutes: 10
4259

4360
steps:
44-
- uses: actions/checkout@v4
45-
- uses: pnpm/action-setup@v3
46-
with:
47-
version: 8
48-
- name: Install Node
49-
uses: actions/setup-node@v4
61+
- uses: actions/checkout@v6
62+
- uses: pnpm/action-setup@v4
63+
- uses: actions/setup-node@v6
5064
with:
51-
node-version: 16
65+
node-version: 22
5266
cache: pnpm
5367
- name: Install Dependencies
5468
run: pnpm install --no-lockfile
5569
- name: Run Tests
56-
run: CI=true pnpm ember test
70+
run: pnpm test
5771

5872
try-scenarios:
59-
name: ${{ matrix.try-scenario }}
73+
name: ${{ matrix.name }}
6074
runs-on: ubuntu-latest
61-
timeout-minutes: 8
62-
75+
needs: "test"
76+
timeout-minutes: 10
6377
strategy:
6478
fail-fast: false
65-
matrix:
66-
try-scenario:
67-
[
68-
ember-lts-3.28,
69-
ember-lts-4.4,
70-
ember-lts-4.8,
71-
ember-lts-4.12,
72-
ember-lts-5.4,
73-
ember-lts-5.8,
74-
ember-lts-5.12,
75-
ember-lts-6.4,
76-
ember-release,
77-
ember-beta,
78-
ember-canary,
79-
ember-3.28-with-jquery,
80-
ember-3.28-classic,
81-
]
82-
include:
83-
- ember-try-scenario: ember-canary
84-
allow-failure: true
79+
matrix: ${{fromJson(needs.test.outputs.matrix)}}
8580

8681
steps:
87-
- name: Checkout
88-
uses: actions/checkout@v4
89-
- uses: pnpm/action-setup@v3
90-
with:
91-
version: 8
92-
- name: Install Node
93-
uses: actions/setup-node@v4
82+
- uses: actions/checkout@v6
83+
- uses: pnpm/action-setup@v4
84+
- uses: actions/setup-node@v6
9485
with:
95-
node-version: 16
86+
node-version: 22
9687
cache: pnpm
88+
- name: Apply Scenario
89+
run: |
90+
pnpm dlx @embroider/try apply ${{ matrix.name }}
91+
9792
- name: Install Dependencies
98-
run: pnpm i --frozen-lockfile
99-
- name: Ember-Try Setup
100-
run: pnpm ember try:one ${{ matrix.try-scenario }}
93+
run: pnpm install --no-lockfile
94+
- name: Run Tests
95+
run: |
96+
pnpm test
97+
98+
env: ${{ matrix.env }}

.gitignore

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
# compiled output
2-
/dist/
3-
/declarations/
2+
dist/
3+
dist-tests/
4+
declarations/
45

5-
# dependencies
6-
/node_modules/
6+
# from scenarios
7+
tmp/
8+
config/optional-features.json
9+
ember-cli-build.cjs
710

8-
# misc
9-
/.env*
10-
/.pnp*
11-
/.eslintcache
12-
/coverage/
13-
/npm-debug.log*
14-
/testem.log
15-
/yarn-error.log
11+
# npm/pnpm/yarn pack output
12+
*.tgz
1613

17-
# ember-try
18-
/.node_modules.ember-try/
19-
/npm-shrinkwrap.json.ember-try
20-
/package.json.ember-try
21-
/package-lock.json.ember-try
22-
/yarn.lock.ember-try
23-
24-
# broccoli-debug
25-
/DEBUG/
14+
# deps & caches
15+
node_modules/
16+
.eslintcache
17+
.prettiercache

.npmignore

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

.prettierignore

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33

44
# compiled output
55
/dist/
6+
/dist-*/
7+
/declarations/
68

79
# misc
810
/coverage/
9-
!.*
10-
.*/
11-
12-
# ember-try
13-
/.node_modules.ember-try/
11+
pnpm-lock.yaml
12+
config/ember-cli-update.json
13+
*.yaml
14+
*.yml
15+
*.md
16+
*.html

.prettierrc.js

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

.prettierrc.mjs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
export default {
2+
plugins: ['prettier-plugin-ember-template-tag'],
3+
overrides: [
4+
{
5+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
6+
options: {
7+
singleQuote: true,
8+
templateSingleQuote: false,
9+
},
10+
},
11+
],
12+
};

0 commit comments

Comments
 (0)