From 9b3f9bee6fb217b729f6cdf47c8a48eb97314a23 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Wed, 19 Oct 2022 09:21:43 -0400 Subject: [PATCH 1/2] Downgrades CoffeeScript to 1.8.0 --- cli/install.sh | 2 +- package.json | 4 ++-- scripts/provision_vm.sh | 2 +- yarn.lock | 29 +++++++++++++++++++++-------- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/cli/install.sh b/cli/install.sh index 8ecd7254e..11ae2462d 100755 --- a/cli/install.sh +++ b/cli/install.sh @@ -8,6 +8,6 @@ scp -o IdentitiesOnly=yes -o StrictHostKeyChecking=no ~/.npmrc $USER@$HOST:/$USE ssh -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -T $USER@$HOST << EOF cd $FOLDER -npm i -g coffeescript@1.12.7 +npm i -g coffeescript@1.8.0 npm install EOF diff --git a/package.json b/package.json index 537b59031..de5c9363a 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "bluebird": "^2.9.13", "body-parser": "^1.6.5", "change-case": "2.3.0", - "coffeescript": "1.12.7", + "coffeescript": "1.8.0", "colors": "*", "compose-middleware": "^2.0.1", "convict": "^6.2.2", @@ -98,7 +98,7 @@ "chai": "^3.5.0", "cli-table": "0.3.1", "clipboard": "^1.7.1", - "coffeeify": "3.0.1", + "coffeeify": "^2.0.1", "commander": "2.8.1", "concurrent-transform": "^1.0.0", "csv-write-stream": "^1.0.0", diff --git a/scripts/provision_vm.sh b/scripts/provision_vm.sh index b23eca4e2..926650bed 100755 --- a/scripts/provision_vm.sh +++ b/scripts/provision_vm.sh @@ -63,7 +63,7 @@ echo 'Redis install completed."' # Install npm packages (can lock versions here) echo "Install npm packages (global depends)" -sudo npm install -g coffeescript@1.12.7 +sudo npm install -g coffeescript@1.8.0 sudo npm install -g grunt-cli sudo npm install -g yarn sudo npm install -g forever diff --git a/yarn.lock b/yarn.lock index 1718d9124..6d26a7ade 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3697,18 +3697,26 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -coffeeify@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/coffeeify/-/coffeeify-3.0.1.tgz#5e2753000c50bd24c693115f33864248dd11136c" - integrity sha512-Qjnr7UX6ldK1PHV7wCnv7AuCd4q19KTUtwJnu/6JRJB4rfm12zvcXtKdacUoePOKr1I4ka/ydKiwWpNAdsQb0g== +coffee-script@^1.12.0: + version "1.12.7" + resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53" + integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw== + +coffeeify@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/coffeeify/-/coffeeify-2.1.0.tgz#06de80aa87b6194937734361def4ade254b71a1e" + integrity sha512-E9f2SAcTZ/DwqlBCbwlFU1JbjufbSKlOttS3/OSf9+00aCvdcUTZoFLslbXKH6GGaknhe7NwTmA4N4zpVtp/yQ== dependencies: + coffee-script "^1.12.0" convert-source-map "^1.3.0" through2 "^2.0.0" -coffeescript@1.12.7: - version "1.12.7" - resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27" - integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA== +coffeescript@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.8.0.tgz#4c503e2dbdf268aee33fdd34cb259d53ff963518" + integrity sha512-ka9m4Ew2XeRPxhQ6gJ/ydJN+93SJlRHeLxt8pQQf0nsoz4qt6ipbwuYdPj/ATQZMVzP+jtKMvz9dwsrKU/OVUw== + dependencies: + mkdirp "~0.3.5" coffeescript@2.7.0: version "2.7.0" @@ -10300,6 +10308,11 @@ mkdirp@^1.0.3, mkdirp@~1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +mkdirp@~0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7" + integrity sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg== + mocha@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9" From 6c20d7664a42e417051031d6e679c0cf6afe49dc Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Wed, 19 Oct 2022 10:12:12 -0400 Subject: [PATCH 2/2] Version 1.97.4 --- desktop/package.json | 2 +- package.json | 2 +- version.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index e654cd990..6d45d7076 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -2,7 +2,7 @@ "name": "duelyst-desktop", "productName": "Duelyst", "license": "CC0-1.0", - "version": "1.97.3", + "version": "1.97.4", "main": "desktop.js", "dependencies": { "electron-debug": "^2.0.0", diff --git a/package.json b/package.json index de5c9363a..f15f2a1c7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "open-duelyst", "license": "CC0-1.0", - "version": "1.97.3", + "version": "1.97.4", "engines": { "yarn": ">= 1.0.0" }, diff --git a/version.json b/version.json index 813dbb2de..e2d9c09e6 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "1.97.3" + "version": "1.97.4" }