Skip to content

Commit f2d1d5b

Browse files
authored
Merge pull request #45 from embermap/fastboot-1-2
Drop down to FastBoot ^1.2.1
2 parents 0cee90e + 6d50ba5 commit f2d1d5b

3 files changed

Lines changed: 16 additions & 67 deletions

File tree

config/ember-try.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ module.exports = function() {
7373
npm: {
7474
devDependencies: {
7575
'ember-source': '~3.8.0',
76-
'fastboot': '~1.2.0'
76+
'fastboot': '^1.2.1'
7777
}
7878
}
7979
},

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"body-parser": "^1.18.3",
2525
"ember-auto-import": "^1.2.15",
2626
"ember-cli-babel": "^6.6.0",
27-
"fastboot": "1.2.* || 2.*",
27+
"fastboot": "^1.2.1",
2828
"jquery-param": "^1.0.1",
2929
"resolve": "^1.10.0",
3030
"nock": "^10.0.6",

yarn.lock

Lines changed: 14 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -760,37 +760,6 @@
760760
dependencies:
761761
"@glimmer/util" "^0.36.6"
762762

763-
"@simple-dom/document@^1.4.0":
764-
version "1.4.0"
765-
resolved "https://registry.yarnpkg.com/@simple-dom/document/-/document-1.4.0.tgz#af60855f957f284d436983798ef1006cca1a1678"
766-
integrity sha512-/RUeVH4kuD3rzo5/91+h4Z1meLSLP66eXqpVAw/4aZmYozkeqUkMprq0znL4psX/adEed5cBgiNJcfMz/eKZLg==
767-
dependencies:
768-
"@simple-dom/interface" "^1.4.0"
769-
770-
"@simple-dom/interface@^1.4.0":
771-
version "1.4.0"
772-
resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
773-
integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
774-
775-
"@simple-dom/parser@^1.4.0":
776-
version "1.4.0"
777-
resolved "https://registry.yarnpkg.com/@simple-dom/parser/-/parser-1.4.0.tgz#b1fee1a23f48a37d6bdd98f5242db0cab5b67abc"
778-
integrity sha512-TNjDkOehueRIKr1df416qk9ELj+qWuVVJNIT25y1aZg3pQvxv4UPGrgaDFte7dsWBTbF3V8NYPNQ5FDUZQ8Wlg==
779-
dependencies:
780-
"@simple-dom/interface" "^1.4.0"
781-
782-
"@simple-dom/serializer@^1.4.0":
783-
version "1.4.0"
784-
resolved "https://registry.yarnpkg.com/@simple-dom/serializer/-/serializer-1.4.0.tgz#98470f357f418d72b1a1ec78d68191e60aefe215"
785-
integrity sha512-mI1yRahsVs8atXLiQksineDsFEFqeG7RHwnnBTDOK6inbzl4tZQgjR+Z7edjgIJq5j5RhZvwPI6EuCji9B3eQw==
786-
dependencies:
787-
"@simple-dom/interface" "^1.4.0"
788-
789-
"@simple-dom/void-map@^1.4.0":
790-
version "1.4.0"
791-
resolved "https://registry.yarnpkg.com/@simple-dom/void-map/-/void-map-1.4.0.tgz#f15f07568fe1076740407266aa5e6eac249bc78c"
792-
integrity sha512-VDhLEyVCbuhOBBgHol9ShzIv9O8UCzdXeH4FoXu2DOcu/nnvTjLTck+BgXsCLv5ynDiUdoqsREEVFnoyPpFKVw==
793-
794763
"@sindresorhus/is@^0.7.0":
795764
version "0.7.0"
796765
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
@@ -6250,24 +6219,24 @@ fastboot-transform@^0.1.2:
62506219
broccoli-stew "^1.5.0"
62516220
convert-source-map "^1.5.1"
62526221

6253-
"fastboot@1.2.* || 2.*":
6254-
version "2.0.1"
6255-
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-2.0.1.tgz#f8fc0d14379e69a250045708f58268c98943f115"
6256-
integrity sha512-NH6viW7oo8oDbWXqQ1aJNP5ey3gPYKIVBCX9ByqGxdPISXo5iOEKblyijN+HrPpbidPdQx8PNqHH8mtqo9rY/g==
6222+
fastboot@^1.1.4-beta.1, fastboot@^1.2.0:
6223+
version "1.2.0"
6224+
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.2.0.tgz#35c5747db1943d082f2ba619226d16cd7281e946"
6225+
integrity sha1-NcV0fbGUPQgvK6YZIm0WzXKB6UY=
62576226
dependencies:
62586227
chalk "^2.0.1"
62596228
cookie "^0.3.1"
6260-
debug "^4.1.0"
6261-
najax "^1.0.3"
6262-
resolve "^1.8.1"
6263-
rsvp "^4.8.0"
6264-
simple-dom "^1.4.0"
6229+
debug "^3.0.0"
6230+
exists-sync "0.0.4"
6231+
najax "^1.0.2"
6232+
rsvp "^4.7.0"
6233+
simple-dom "^1.0.0"
62656234
source-map-support "^0.5.0"
62666235

6267-
fastboot@^1.1.4-beta.1, fastboot@^1.2.0:
6268-
version "1.2.0"
6269-
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.2.0.tgz#35c5747db1943d082f2ba619226d16cd7281e946"
6270-
integrity sha1-NcV0fbGUPQgvK6YZIm0WzXKB6UY=
6236+
fastboot@^1.2.1:
6237+
version "1.2.1"
6238+
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.2.1.tgz#71e91151293be814b2f9c41fe7513bf4e9b6ef91"
6239+
integrity sha512-WK5Jy71Q6FPoGkooEnWt7Yc2vb23f6C2RtBUutO459TskFnUhzOF8ZJASNNjURQYq8U/pTha2LI4Ix7UInffgg==
62716240
dependencies:
62726241
chalk "^2.0.1"
62736242
cookie "^0.3.1"
@@ -9168,15 +9137,6 @@ najax@^1.0.2:
91689137
lodash.defaultsdeep "^4.6.0"
91699138
qs "^6.2.0"
91709139

9171-
najax@^1.0.3:
9172-
version "1.0.4"
9173-
resolved "https://registry.yarnpkg.com/najax/-/najax-1.0.4.tgz#63fd8dbf15d18f24dc895b3a16fec66c136b8084"
9174-
integrity sha512-wsSacA+RkgY1wxRxXCT3tdqzmamEv9PLeoV/ub9SlLf2RngbPMSqc3A7H35XJDfURC0twMmZsnPdsYPkuuFSVg==
9175-
dependencies:
9176-
jquery-deferred "^0.3.0"
9177-
lodash.defaultsdeep "^4.6.0"
9178-
qs "^6.2.0"
9179-
91809140
nan@^2.9.2:
91819141
version "2.10.0"
91829142
resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -10897,7 +10857,7 @@ rsvp@^4.6.1, rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2, rsvp@^4.8.3:
1089710857
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.3.tgz#25d4b9fdd0f95e216eb5884d9b3767d3fbfbe2cd"
1089810858
integrity sha512-/OlbK31XtkPnLD2ktmZXj4g/v6q1boTDr6/3lFuDTgxVsrA3h7PH5eYyAxIvDMjRHr/DoOlzNicqDwBEo9xU7g==
1089910859

10900-
rsvp@^4.8.0, rsvp@^4.8.4:
10860+
rsvp@^4.8.4:
1090110861
version "4.8.4"
1090210862
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz#b50e6b34583f3dd89329a2f23a8a2be072845911"
1090310863
integrity sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA==
@@ -11153,17 +11113,6 @@ simple-dom@^1.0.0:
1115311113
resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-1.3.0.tgz#8473e0d34e340544b061410dba3faf4f1b7aa282"
1115411114
integrity sha512-RVjr6e80FFGDqDJZeQd4EMwoDLatn4Jy2SfuXecrP1IgG4ZAqkGSokE8LNV5i0kzWR2IM0e257xGN9JS8lxm0Q==
1115511115

11156-
simple-dom@^1.4.0:
11157-
version "1.4.0"
11158-
resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-1.4.0.tgz#78ad1f41b8b70d16f82b7e0d458441c9262565b7"
11159-
integrity sha512-TnBPkmOyjdaOqyBMb4ick+n8c0Xv9Iwg1PykFV7hz9Se3UCiacTbRb+25cPmvozFNJLBUNvUzX/KsPfXF14ivA==
11160-
dependencies:
11161-
"@simple-dom/document" "^1.4.0"
11162-
"@simple-dom/interface" "^1.4.0"
11163-
"@simple-dom/parser" "^1.4.0"
11164-
"@simple-dom/serializer" "^1.4.0"
11165-
"@simple-dom/void-map" "^1.4.0"
11166-
1116711116
simple-html-tokenizer@^0.5.6:
1116811117
version "0.5.7"
1116911118
resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.7.tgz#8eca336ecfbe2b3c6166cbb31b2682088de79f40"

0 commit comments

Comments
 (0)