Skip to content

Commit

Permalink
Fix CI (#549)
Browse files Browse the repository at this point in the history 
* ember-try 3.0

* bump prember, fastboot, other things

* revert source
  • Loading branch information
@machty
machty authored Feb 2, 2024
1 parent 652a905 commit a4efc40
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 43 deletions.
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"ember-cli": "~4.11.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-fastboot": "^3.3.0",
"ember-cli-fastboot": "^4.1.2",
"ember-cli-github-pages": "^0.2.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^10.0.1",
Expand All @@ -71,7 +71,7 @@
"ember-source": "~4.11.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.6.0",
"ember-try": "^2.0.0",
"ember-try": "^3.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-ember": "^11.4.7",
Expand All @@ -82,7 +82,7 @@
"jsdoc": "^3.6.6",
"jsdom": "^16.7.0",
"loader.js": "^4.7.0",
"prember": "https://github.com/ef4/prember.git#b87f23575c97f6f8f8fae70a7e54827366bd9ba7",
"prember": "~2.0.0",
"prettier": "^2.8.4",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
Expand Down Expand Up @@ -134,4 +134,4 @@
"node": "16.19.0",
"yarn": "1.22.19"
}
}
}
88 changes: 49 additions & 39 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3625,7 +3625,7 @@ chalk@^1.0.0, chalk@^1.1.0:
strip-ansi "^3.0.0"
supports-color "^2.0.0"

chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
Expand Down Expand Up @@ -4394,11 +4394,6 @@ delegates@^1.0.0:
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==

denodeify@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
integrity sha512-KNTihKNmQENUZeKu5fzfpzRqR5S2VMp4gl9RFHiWzj9DfvYQPMJ6XHKNaQxaGCXwPk6y9yme3aUoaiAe+KX+vg==

depd@2.0.0, depd@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
Expand Down Expand Up @@ -4713,10 +4708,10 @@ ember-cli-dependency-checker@^3.3.1:
resolve "^1.22.0"
semver "^5.7.1"

ember-cli-fastboot@^3.3.0:
version "3.3.2"
resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-3.3.2.tgz#979bb051114a3362e400efb65c29516e749b3231"
integrity sha512-3nPyXapAv9SwCV6KVdSg9CdjMtONkb5V8VZJiWTNMowu1HiODO5HUykaAd0niH94qnJivdpbH544S3g0TZ+Jfw==
ember-cli-fastboot@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-4.1.2.tgz#8ab783f07f71b2c963e8069a1379e58e3df36150"
integrity sha512-cC2ET8AbRTssA4sg9qF9KLX9N/Xnwa7kS0PKZADMMOUXtuBF4jmgnXsjzlvIE+lgWcwK4tc6udgwpMeNMkOg7w==
dependencies:
broccoli-concat "^4.2.5"
broccoli-file-creator "^2.1.1"
Expand All @@ -4728,8 +4723,8 @@ ember-cli-fastboot@^3.3.0:
ember-cli-lodash-subset "^2.0.1"
ember-cli-preprocess-registry "^3.3.0"
ember-cli-version-checker "^5.1.2"
fastboot "3.3.2"
fastboot-express-middleware "3.3.2"
fastboot "4.1.2"
fastboot-express-middleware "4.1.2"
fastboot-transform "^0.1.3"
fs-extra "^10.0.0"
json-stable-stringify "^1.0.1"
Expand Down Expand Up @@ -5325,20 +5320,21 @@ ember-try-config@^4.0.0:
remote-git-tags "^3.0.0"
semver "^7.3.2"

ember-try@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-2.0.0.tgz#2671c221f5a0335fa2c189d00db7146e2e72a1dd"
integrity sha512-2N7Vic45sbAegA5fhdfDjVbEVS4r+ze+tTQs2/wkY+8fC5yAGHfCM5ocyoTfBN5m7EhznC3AyMsOy4hLPzHFSQ==
ember-try@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-3.0.0.tgz#3b4e8511b64925aff14224b408fb5b5adab69391"
integrity sha512-ZYVKYWMnrHSD3vywo7rV76kPCOC9ATIEnGGG/PEKfCcFE0lB26jltRDnOrhORfLKq0JFp62fFxC/4940U+MwRQ==
dependencies:
chalk "^4.1.2"
cli-table3 "^0.6.0"
core-object "^3.1.5"
debug "^4.3.2"
ember-try-config "^4.0.0"
execa "^4.1.0"
fs-extra "^9.0.1"
fs-extra "^6.0.1"
resolve "^1.20.0"
rimraf "^3.0.2"
semver "^7.5.4"
walk-sync "^2.2.0"

emoji-regex@^8.0.0:
Expand Down Expand Up @@ -5918,7 +5914,7 @@ expect-type@^0.15.0:
resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.15.0.tgz#89f75e22c88554844ea2b2faf4ef5fc2e579d3b5"
integrity sha512-yWnriYB4e8G54M5/fAFj7rCIBiKs1HAACaY13kCz6Ku0dezjS9aMcfcdVK2X8Tv2tEV1BPz/wKfQ7WA4S/d8aA==

express@^4.10.7, express@^4.16.2, express@^4.18.1:
express@^4.10.7, express@^4.18.1, express@^4.18.2:
version "4.18.2"
resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
Expand Down Expand Up @@ -6074,13 +6070,13 @@ fast-sourcemap-concat@^2.1.0:
source-map "^0.4.2"
source-map-url "^0.3.0"

fastboot-express-middleware@3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-3.3.2.tgz#6d78de06f1db51f47b4f66658c651a61fcf5ca96"
integrity sha512-/Fgr29Q1bMDiv65BeCYmFR88otTg9QJYvmVIWrgkwWSkfya5h1XzCQYEz+VqyhWT1v+BQWq98SuyKfpNrL2cRA==
fastboot-express-middleware@4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-4.1.2.tgz#6a383c282fdc07ee3f90039701bb0dab11129179"
integrity sha512-vnzEBV7gZ3lSoGiqG/7+006nHNA3z+ZnU/5u9jPHtKpjH28yEbvZq6PnAeTu24UR98jZVR0pnFbfX0co+O9PeA==
dependencies:
chalk "^4.1.2"
fastboot "3.3.2"
fastboot "4.1.2"

fastboot-transform@^0.1.3:
version "0.1.3"
Expand All @@ -6090,10 +6086,10 @@ fastboot-transform@^0.1.3:
broccoli-stew "^1.5.0"
convert-source-map "^1.5.1"

fastboot@3.3.2, fastboot@^3.1.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-3.3.2.tgz#bf1ac7b01937846b63423a88138e13eb50406d2e"
integrity sha512-2NKTW32GvEsDyBrdw1trW1JsbS+9/7sAQuKwkht12mNitimRrSKVLP2AxsM/HSXQE+aiET4XCfKdyeIy0kQbKQ==
fastboot@4.1.2, fastboot@^4.1.1:
version "4.1.2"
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-4.1.2.tgz#65627882d03962818f0f5331ca052d2da209ba98"
integrity sha512-VJLmF0xdCNwIIuA7DQtN1KTAKfEGsbZGJ0cfKh64h6DeMh3Fhr2FCCxkPh8zYqGoqzjXFdFbtk60WS3f6HKqBg==
dependencies:
chalk "^4.1.2"
cookie "^0.4.1"
Expand Down Expand Up @@ -6469,6 +6465,15 @@ fs-extra@^5.0.0:
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
dependencies:
graceful-fs "^4.1.2"
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^7.0.0, fs-extra@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
Expand Down Expand Up @@ -9043,6 +9048,11 @@ mkdirp@^1.0.4:
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==

mkdirp@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==

mktemp@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
Expand Down Expand Up @@ -9921,19 +9931,19 @@ prelude-ls@~1.1.2:
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==

"prember@https://github.com/ef4/prember.git#b87f23575c97f6f8f8fae70a7e54827366bd9ba7":
version "1.0.5"
resolved "https://github.com/ef4/prember.git#b87f23575c97f6f8f8fae70a7e54827366bd9ba7"
prember@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/prember/-/prember-2.0.0.tgz#0df6f2d1c6aef056f91627ca1d7c283984bdaf28"
integrity sha512-mNlTBBTC6ToJAqTG98pPAw9Kbg/yrRql21PoHMn0/MMQvFszR5e6w1NuOP76mfKQLFkHvxsKZcgibwjnRAKeMg==
dependencies:
broccoli-debug "^0.6.3"
broccoli-merge-trees "^2.0.0"
broccoli-plugin "^1.3.0"
chalk "^2.3.0"
denodeify "^1.2.1"
ember-cli-babel "^7.22.1"
express "^4.16.2"
fastboot "^3.1.2"
mkdirp "^0.5.1"
broccoli-merge-trees "^4.2.0"
broccoli-plugin "^4.0.7"
chalk "^4.0.0"
ember-cli-babel "^7.26.11"
express "^4.18.2"
fastboot "^4.1.1"
mkdirp "^3.0.1"

prepend-http@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -10832,7 +10842,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
Expand Down

0 comments on commit a4efc40

Please sign in to comment.