Skip to content

Commit dc76b3a

Browse files
authored
Merge pull request #765 from embermap/fastboot-peer-dep
Make fastboot peerDependency
2 parents c3f9c79 + 36e50cc commit dc76b3a

4 files changed

Lines changed: 28 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ jobs:
8686
- ember-lts-4.8
8787
- fastboot-1.2
8888
- fastboot-2.0
89+
- fastboot-3.0
8990
- ember-release
9091
- ember-beta
9192
- ember-canary

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"body-parser": "^1.20.0",
3232
"ember-auto-import": "^2.6.1",
3333
"ember-cli-babel": "^7.26.11",
34-
"fastboot": "^3.0.3",
3534
"json-fn": "^1.1.1",
3635
"minimist": "^1.2.6",
3736
"nock": "^13.2.4",
@@ -51,6 +50,7 @@
5150
"broccoli-plugin": "^4.0.7",
5251
"broccoli-stew": "^3.0.0",
5352
"concurrently": "^7.6.0",
53+
"fastboot": "^4.1.0",
5454
"ember-cli": "~4.11.0",
5555
"ember-cli-addon-docs": "github:ember-learn/ember-cli-addon-docs#eb825bcc1e721dbebc73e5dbd98db2ebb3026dd3",
5656
"ember-cli-addon-docs-yuidoc": "^1.0.0",
@@ -92,7 +92,8 @@
9292
"webpack": "^5.75.0"
9393
},
9494
"peerDependencies": {
95-
"ember-source": "^3.28.0 || ^4.0.0 || ^5.0.0"
95+
"ember-source": "^3.28.0 || ^4.0.0 || ^5.0.0",
96+
"fastboot": "*"
9697
},
9798
"engines": {
9899
"node": "12.* || 14.* || 16.* || >= 18"

tests/dummy/config/ember-try.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,30 @@ module.exports = async function () {
3434
{
3535
name: 'fastboot-1.2',
3636
npm: {
37-
dependencies: {
38-
fastboot: '~1.2.1',
39-
},
4037
devDependencies: {
4138
'ember-source': '~3.20.7',
4239
'ember-data': '~3.20.5',
4340
'ember-qunit': '^5.1.5',
41+
fastboot: '~1.2.1',
4442
},
4543
},
4644
},
4745
{
4846
name: 'fastboot-2.0',
4947
npm: {
50-
dependencies: {
51-
fastboot: '~2.0.3',
52-
},
5348
devDependencies: {
5449
'ember-source': '~3.20.7',
5550
'ember-data': '~3.20.5',
5651
'ember-qunit': '^5.1.5',
52+
fastboot: '~2.0.3',
53+
},
54+
},
55+
},
56+
{
57+
name: 'fastboot-3.0',
58+
npm: {
59+
devDependencies: {
60+
fastboot: '^3.0.0',
5761
},
5862
},
5963
},

yarn.lock

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7653,7 +7653,7 @@ fastboot-transform@^0.1.3:
76537653
broccoli-stew "^1.5.0"
76547654
convert-source-map "^1.5.1"
76557655

7656-
fastboot@3.3.2, fastboot@^3.0.3:
7656+
fastboot@3.3.2:
76577657
version "3.3.2"
76587658
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-3.3.2.tgz#bf1ac7b01937846b63423a88138e13eb50406d2e"
76597659
integrity sha512-2NKTW32GvEsDyBrdw1trW1JsbS+9/7sAQuKwkht12mNitimRrSKVLP2AxsM/HSXQE+aiET4XCfKdyeIy0kQbKQ==
@@ -7666,6 +7666,19 @@ fastboot@3.3.2, fastboot@^3.0.3:
76667666
simple-dom "^1.4.0"
76677667
source-map-support "^0.5.21"
76687668

7669+
fastboot@^4.1.0:
7670+
version "4.1.0"
7671+
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-4.1.0.tgz#4c2f62841d80b0a246e38adb3c35b626e2f42087"
7672+
integrity sha512-NoUUiWhLS4JfrYiHmbRjqqWmzttO+6hVyt+CawsZCg79ljTGAIhPThy8cxg11yiDNiaM9EY3kocWZrCMUM7o4g==
7673+
dependencies:
7674+
chalk "^4.1.2"
7675+
cookie "^0.4.1"
7676+
debug "^4.3.3"
7677+
jsdom "^19.0.0"
7678+
resolve "^1.22.0"
7679+
simple-dom "^1.4.0"
7680+
source-map-support "^0.5.21"
7681+
76697682
fastq@^1.6.0:
76707683
version "1.15.0"
76717684
resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"

0 commit comments

Comments
 (0)