Skip to content

Commit 0c07b0c

Browse files
Update to latest blueprints (#191)
* Bump pnpm version * Update to latest blueprints * Fix lint * Super secret npmrc * Tweak some deps * Sync ember-source versions * Update README.md
1 parent 31408ae commit 0c07b0c

36 files changed

Lines changed: 1828 additions & 3757 deletions

.github/workflows/ci.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v4
22-
- uses: pnpm/action-setup@v3
23-
with:
24-
version: 9
22+
- uses: pnpm/action-setup@v4
2523
- uses: actions/setup-node@v4
2624
with:
2725
node-version: 18
@@ -40,9 +38,7 @@ jobs:
4038

4139
steps:
4240
- uses: actions/checkout@v4
43-
- uses: pnpm/action-setup@v3
44-
with:
45-
version: 9
41+
- uses: pnpm/action-setup@v4
4642
- uses: actions/setup-node@v4
4743
with:
4844
node-version: 18
@@ -64,7 +60,6 @@ jobs:
6460
try-scenario:
6561
- ember-lts-4.12
6662
- ember-lts-5.4
67-
- ember-lts-5.8
6863
- ember-resolver-10
6964
- ember-resolver-11
7065
- ember-resolver-12
@@ -76,9 +71,7 @@ jobs:
7671

7772
steps:
7873
- uses: actions/checkout@v4
79-
- uses: pnpm/action-setup@v3
80-
with:
81-
version: 9
74+
- uses: pnpm/action-setup@v4
8275
- uses: actions/setup-node@v4
8376
with:
8477
node-version: 18

.github/workflows/push-dist.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v4
22-
- uses: pnpm/action-setup@v3
23-
with:
24-
version: 9
22+
- uses: pnpm/action-setup@v4
2523
- uses: actions/setup-node@v4
2624
with:
2725
node-version: 18

.npmrc

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
1-
# Docs: https://pnpm.io/npmrc
2-
# https://github.com/emberjs/rfcs/pull/907
3-
4-
# we don't want addons to be bad citizens of the ecosystem
1+
####################
2+
# super strict mode
3+
####################
54
auto-install-peers=false
5+
strict-peer-dependents=true
6+
resolve-peers-from-workspace-root=false
7+
8+
################
9+
# Optimizations
10+
################
11+
# Less strict, but required for tooling to not barf on duplicate peer trees.
12+
# (many libraries declare the same peers, which resolve to the same
13+
# versions)
14+
peers-suffix-max-length=40
15+
dedupe-injected-deps=true
16+
dedupe-peer-dependents=true
17+
public-hoist-pattern[]=ember-source
18+
sync-injected-deps-after-scripts[]=build
19+
sync-injected-deps-after-scripts[]=sync
20+
inject-workspace-packages=true
621

7-
# we want true isolation,
8-
# if a dependency is not declared, we want an error
9-
resolve-peers-from-workspace-root=false
22+
################
23+
# Compatibility
24+
################
25+
# highest is what everyone is used to, but
26+
# not ensuring folks are actually compatible with declared ranges.
27+
resolution-mode=highest

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
nodejs 18.20.4
2-
pnpm 9.11.0
1+
nodejs 20.19.0
2+
pnpm 10.7.1

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2024
3+
Copyright (c) 2025
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ loadInitializers(App, config.modulePrefix);
6464

6565
## Compatibility
6666

67-
* Ember.js v3.28 or above
67+
* Ember.js v4.12 or above
6868
* Embroider or ember-auto-import v2
6969

7070
## Quick Example

config/ember-cli-update.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
{
1+
{
22
"schemaVersion": "1.0.0",
33
"projectName": "ember-can",
44
"packages": [
55
{
66
"name": "@embroider/addon-blueprint",
7-
"version": "2.16.0",
7+
"version": "4.1.1",
88
"blueprints": [
99
{
1010
"name": "@embroider/addon-blueprint",
1111
"isBaseBlueprint": true,
1212
"options": [
13+
"--ci-provider=github",
1314
"--pnpm",
1415
"--typescript"
1516
]

ember-can/.eslintignore

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

ember-can/.eslintrc.cjs

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

ember-can/.prettierrc.cjs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,13 @@
22

33
module.exports = {
44
plugins: ['prettier-plugin-ember-template-tag'],
5-
singleQuote: true,
5+
overrides: [
6+
{
7+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
8+
options: {
9+
singleQuote: true,
10+
templateSingleQuote: false,
11+
},
12+
},
13+
],
614
};

0 commit comments

Comments
 (0)