Skip to content

Commit 1d7384d

Browse files
authored
Update addon blueprint + ember cli (#949)
* Update addon blueprint * Fix dependencies in ember-try * Update test-app v6.1.0...v6.4.0 * Update docs ember-cli v6.1.0...v6.4.0 * Run format in docs * Remove dependenciesMeta * Readd dependenciesMeta * Try using node 18 with pnpm 9.x * Add packageManager * Try using old @ember/test-helpers * Try using @ember/test-helpers 5.2.1 for 4.4 * Try using @ember/test-helpers 5.2.1 for 4.4 * Try using @ember/test-helpers 5.2.0 for 4.4 * Try using @ember/test-helpers 5.1.0 for 4.4 * Try using @ember/test-helpers 5.0.0 for 4.4 * Use @ember/test-helpers 5.1.0 with @ember/test-waiters 4.0.0 * Use @ember/test-helpers 5.1.0 with @ember/test-waiters 3.1.0 * Use latest @ember/test-helpers for 4.4 * Use @ember/test-helpers 5.1.0 with @ember/test-waiters 3.1.0 * Use node 20 with pnpm 10 * Update last packages to latest * Downgrade @embroider/addon-dev * Add ember 6.4 to ember-try
1 parent a73b0db commit 1d7384d

File tree

97 files changed

+3637
-3149
lines changed

Some content is hidden

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

97 files changed

+3637
-3149
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v4
2222
- uses: pnpm/action-setup@v4
23-
2423
- uses: actions/setup-node@v4
2524
with:
26-
node-version: 18.x
25+
node-version: 20.x
2726
cache: pnpm
2827

2928
- name: 'Install dependencies'
@@ -46,7 +45,7 @@ jobs:
4645
- name: Install Node
4746
uses: actions/setup-node@v4
4847
with:
49-
node-version: 18.x
48+
node-version: 20.x
5049
cache: pnpm
5150

5251
- name: Install Dependencies
@@ -57,7 +56,7 @@ jobs:
5756

5857
- name: Run Tests
5958
run: pnpm --filter test-app test:ember
60-
59+
6160
test-shadow-dom:
6261
name: "Tests Shadow dom"
6362
runs-on: ubuntu-latest
@@ -66,19 +65,19 @@ jobs:
6665
steps:
6766
- uses: actions/checkout@v4
6867
- uses: pnpm/action-setup@v4
69-
68+
7069
- name: Install Node
7170
uses: actions/setup-node@v4
7271
with:
73-
node-version: 18.x
72+
node-version: 20.x
7473
cache: 'pnpm'
75-
74+
7675
- name: Install Dependencies
7776
run: pnpm install --frozen-lockfile
7877

7978
- run: pnpm build
8079
- run: pnpm i -f # re-sync injected deps
81-
80+
8281
- name: Run Tests
8382
run: pnpm --filter test-app test:ember-shadow-dom
8483

@@ -90,10 +89,9 @@ jobs:
9089
steps:
9190
- uses: actions/checkout@v4
9291
- uses: pnpm/action-setup@v4
93-
9492
- uses: actions/setup-node@v4
9593
with:
96-
node-version: 18.x
94+
node-version: 20.x
9795
cache: pnpm
9896

9997
- name: Install Dependencies
@@ -122,6 +120,7 @@ jobs:
122120
- ember-lts-5.4
123121
- ember-lts-5.8
124122
- ember-lts-5.12
123+
- ember-lts-6.4
125124
- glimmer-component-v1
126125
- ember-release
127126
- ember-beta
@@ -136,7 +135,7 @@ jobs:
136135
- name: Install Node
137136
uses: actions/setup-node@v4
138137
with:
139-
node-version: 18.x
138+
node-version: 20.x
140139
cache: pnpm
141140

142141
- name: Install Dependencies

.github/workflows/push-dist.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ on:
1414
jobs:
1515
push-dist:
1616
name: Push dist
17+
permissions:
18+
contents: write
1719
runs-on: ubuntu-latest
1820
timeout-minutes: 10
1921

2022
steps:
2123
- uses: actions/checkout@v4
2224
- uses: pnpm/action-setup@v4
23-
25+
2426
- uses: actions/setup-node@v4
2527
with:
2628
node-version: 18
@@ -31,4 +33,4 @@ jobs:
3133
with:
3234
branch: dist
3335
token: ${{ secrets.GITHUB_TOKEN }}
34-
working-directory: 'ember-basic-dropdown'
36+
working-directory: 'ember-basic-dropdown'

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"packages": [
55
{
66
"name": "@embroider/addon-blueprint",
7-
"version": "4.0.0",
7+
"version": "4.1.2",
88
"blueprints": [
99
{
1010
"name": "@embroider/addon-blueprint",

docs/.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,5 @@
1414
/testem.log
1515
/yarn-error.log
1616

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-
2417
# broccoli-debug
2518
/DEBUG/

docs/.prettierignore

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

44
# misc
55
!.*
6-
.lint-todo/
7-
8-
# ember-try
9-
/.node_modules.ember-try/
10-
/pnpm-lock.ember-try.yaml
6+
.*/
7+
/pnpm-lock.yaml
8+
ember-cli-update.json
9+
*.html

docs/.prettierrc.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ module.exports = {
55
overrides: [
66
{
77
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
8-
options: {
9-
singleQuote: true,
10-
},
11-
},
12-
{
13-
files: '*.{gjs,gts}',
148
options: {
159
singleQuote: true,
1610
templateSingleQuote: false,

docs/.stylelintignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@
33

44
# compiled output
55
/dist/
6-
7-
# addons
8-
/.node_modules.ember-try/

docs/.stylelintrc.js

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-
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
4+
extends: ['stylelint-config-standard'],
55
};

docs/app/app.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from 'docs/config/environment';
55
import Prism from 'prismjs';
6+
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
67
import 'prismjs/plugins/normalize-whitespace/prism-normalize-whitespace';
78
import 'prismjs/components/prism-css';
89
import 'prismjs/components/prism-scss';
@@ -14,6 +15,10 @@ import { setup } from 'prismjs-glimmer';
1415

1516
import 'prismjs/themes/prism.css';
1617

18+
if (macroCondition(isDevelopingApp())) {
19+
importSync('./deprecation-workflow');
20+
}
21+
1722
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
1823
setup(Prism);
1924

docs/app/components/code-block.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<pre
2-
class="{{this.languageClass}} {{if @showLineNumbers "line-numbers"}}"
2+
class="{{this.languageClass}} {{if @showLineNumbers 'line-numbers'}}"
33
data-start={{@start}}
44
>
55
{{~! ~}}

0 commit comments

Comments
 (0)