Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades CoffeeScript to 1.12.7 #162

Merged
merged 4 commits into from
Oct 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/api
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const path = require('path')
require('app-module-path').addPath(path.join(__dirname, '..'))
require('coffee-script/register')
require('coffeescript/register')

// Load config first so it has chance to synchronously validate .json config files
// *before* any other code executes
Expand Down
2 changes: 1 addition & 1 deletion bin/game
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const path = require('path')
require('app-module-path').addPath(path.join(__dirname, '..'))
require('coffee-script/register')
require('coffeescript/register')

// Load config first so it has chance to synchronously validate .json config files
// *before* any other code executes
Expand Down
2 changes: 1 addition & 1 deletion bin/single_player
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const path = require('path')
require('app-module-path').addPath(path.join(__dirname, '..'))
require('coffee-script/register')
require('coffeescript/register')

// Load config first so it has chance to synchronously validate .json config files
// *before* any other code executes
Expand Down
2 changes: 1 addition & 1 deletion bin/worker
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const path = require('path')
require('app-module-path').addPath(path.join(__dirname, '..'))
require('coffee-script/register')
require('coffeescript/register')

// Load config first so it has chance to synchronously validate .json config files
// *before* any other code executes
Expand Down
2 changes: 1 addition & 1 deletion bin/workerui
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const path = require('path')
require('app-module-path').addPath(path.join(__dirname, '..'))
require('coffee-script/register')
require('coffeescript/register')

// Load config first so it has chance to synchronously validate .json config files
// *before* any other code executes
Expand Down
2 changes: 1 addition & 1 deletion cli/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 coffee-script@1.7.0
npm i -g coffeescript@1.12.7
npm install
EOF
2 changes: 1 addition & 1 deletion gulpfile.babel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// fix for EMFILE issues on windows, linux, and mac
import 'coffee-script/register';
import 'coffeescript/register';
import 'app-module-path/register';

import gulp from 'gulp';
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"bluebird": "^2.9.13",
"body-parser": "^1.6.5",
"change-case": "2.3.0",
"coffee-script": "1.8.0",
"coffeescript": "1.12.7",
"colors": "*",
"compose-middleware": "^2.0.1",
"convict": "^6.2.2",
Expand Down Expand Up @@ -98,8 +98,7 @@
"chai": "^3.5.0",
"cli-table": "0.3.1",
"clipboard": "^1.7.1",
"coffee-coverage": "^0.6.2",
"coffeeify": "^2.0.1",
"coffeeify": "3.0.1",
"commander": "2.8.1",
"concurrent-transform": "^1.0.0",
"csv-write-stream": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/create_bot_users.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('coffee-script/register');
require('coffeescript/register');
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../'));
const _ = require('underscore');
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
const _ = require('underscore');
const j2j = require('j2j');
const helpers = require('./helpers');
const coffeScript = require('coffee-script/register');
const coffeScript = require('coffeescript/register');
const Cards = require('app/sdk/cards/cardsLookupComplete.coffee');
const FactionsLookup = require('app/sdk/cards/factionsLookup.coffee');
const FactionFactory = require('app/sdk/cards/factionFactory.coffee');
Expand Down
2 changes: 1 addition & 1 deletion scripts/manage_user_wallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const path = require('path');
const _ = require('underscore');
require('app-module-path').addPath(path.join(__dirname, '../'));
require('coffee-script/register');
require('coffeescript/register');

const config = require('../config/config');
const knex = require('../server/lib/data_access/knex.coffee');
Expand Down
2 changes: 1 addition & 1 deletion scripts/provision_vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 coffee-script
sudo npm install -g [email protected]
sudo npm install -g grunt-cli
sudo npm install -g yarn
sudo npm install -g forever
Expand Down
2 changes: 1 addition & 1 deletion scripts/temp/tmp_find_duplicate_users.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# env $(cat .env_for_alpha | xargs) coffee ./scripts/temp/tmp_sync_user_firebase_to_sql.coffee

require('coffee-script/register')
require('coffeescript/register')
knex = require("../../server/lib/data_access/knex")
SyncModule = require("../../server/lib/data_access/sync")
DuelystFirebase= require("../../server/lib/duelyst_firebase_module")
Expand Down
2 changes: 1 addition & 1 deletion scripts/temp/tmp_sync_user_firebase_to_sql.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# env $(cat .env_for_alpha | xargs) coffee ./scripts/temp/tmp_sync_user_firebase_to_sql.coffee

require('coffee-script/register')
require('coffeescript/register')
knex = require("../../server/lib/data_access/knex")
SyncModule = require("../../server/lib/data_access/sync")
DuelystFirebase= require("../../server/lib/duelyst_firebase_module")
Expand Down
2 changes: 1 addition & 1 deletion server/ai/phase_ii_ai.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ process.on('uncaughtException', (err) => {

const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../'));
require('coffee-script/register');
require('coffeescript/register');
const Logger = require('app/common/logger');
const SDK = require('app/sdk');
const CONFIG = require('app/common/config');
Expand Down
2 changes: 1 addition & 1 deletion server/ai/starter_ai.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../'));
require('coffee-script/register');
require('coffeescript/register');
const Logger = require('app/common/logger');

Logger.module('AI').log('Initializing AI...');
Expand Down
2 changes: 1 addition & 1 deletion server/lib/stack_logger.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pe.skipPath('node:internal/modules/cjs/loader')
pe.skipPath('node:internal/modules/run_main')

# Don't print stack frames from CoffeeScript translation.
pe.skipPackage('coffee-script')
pe.skipPackage('coffeescript')

# Don't print stack frames from inside Express.js source code.
pe.skipPackage('express')
Expand Down
2 changes: 1 addition & 1 deletion server/migrations/20151015145008_add_user_ribbons.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('coffee-script/register');
require('coffeescript/register');
const _ = require('underscore');
const moment = require('moment');
const Promise = require('bluebird');
Expand Down
2 changes: 1 addition & 1 deletion server/migrations/20151209051620_add_gift_crates.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('coffee-script/register');
require('coffeescript/register');
const _ = require('underscore');
const moment = require('moment');

Expand Down
2 changes: 1 addition & 1 deletion server/migrations/20160202120011_script_run_records.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('coffee-script/register');
require('coffeescript/register');
const _ = require('underscore');
const moment = require('moment');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('coffee-script/register');
require('coffeescript/register');
const NewPlayerProgressionStageEnum = require('../../app/sdk/progression/newPlayerProgressionStageEnum.coffee');
const NewPlayerProgressionHelper = require('../../app/sdk/progression/newPlayerProgressionHelper.coffee');

Expand Down
2 changes: 1 addition & 1 deletion server/migrations/20160702140711_create_cosmetics.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('coffee-script/register');
require('coffeescript/register');
const _ = require('underscore');
const moment = require('moment');
const ProgressBar = require('progress');
Expand Down
2 changes: 1 addition & 1 deletion test/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '..'));
require('coffee-script/register');
require('coffeescript/register');
const Logger = require('../app/common/logger.coffee');

Logger.enabled = false;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/achievements/collector_supreme.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Test disabled: slow
var path = require('path')
require('app-module-path').addPath(path.join(__dirname, '../../../'))
require('coffee-script/register')
require('coffeescript/register')
var chai = require('chai');
var expect = chai.expect;
var DuelystFirebase = require('../../../server/lib/duelyst_firebase_module.coffee');
Expand Down
2 changes: 1 addition & 1 deletion test/integration/achievements/home_turf.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Test disabled: slow
var path = require('path')
require('app-module-path').addPath(path.join(__dirname, '../../../'))
require('coffee-script/register')
require('coffeescript/register')
var chai = require('chai');
var expect = chai.expect;
var DuelystFirebase = require('../../../server/lib/duelyst_firebase_module.coffee');
Expand Down
2 changes: 1 addition & 1 deletion test/integration/achievements/seven_sisters.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Test disabled: slow
var path = require('path')
require('app-module-path').addPath(path.join(__dirname, '../../../'))
require('coffee-script/register')
require('coffeescript/register')
var chai = require('chai');
var expect = chai.expect;
var DuelystFirebase = require('../../../server/lib/duelyst_firebase_module.coffee');
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/achievements.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Achievements tests are temporarily disabled.
var path = require('path')
require('app-module-path').addPath(path.join(__dirname, '../../../'))
require('coffee-script/register')
require('coffeescript/register')
var chai = require('chai');
var expect = chai.expect;
var DuelystFirebase = require('../../../server/lib/duelyst_firebase_module.coffee');
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/challenges.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

const { expect } = chai;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/cosmetic_chests.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

chai.config.includeStack = true;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/decks.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

const { expect } = chai;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/gauntlet.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

const { expect } = chai;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/gift_codes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

const { expect } = chai;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/gift_crate.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

const { expect } = chai;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/inventory.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');

const chai = require('chai');
const Promise = require('bluebird');
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/migrations.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

const { expect } = chai;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/paypal.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var path = require('path')
require('app-module-path').addPath(path.join(__dirname, '../../../'))
require('coffee-script/register')
require('coffeescript/register')
var chai = require('chai');
var expect = chai.expect;
var DuelystFirebase = require('../../../server/lib/duelyst_firebase_module.coffee');
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/quests.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

chai.config.includeStack = true;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/rank.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

chai.config.includeStack = true;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/referrals.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

const { expect } = chai;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/rift.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

chai.config.includeStack = true;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/shop.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var path = require('path')
require('app-module-path').addPath(path.join(__dirname, '../../../'))
require('coffee-script/register')
require('coffeescript/register')
var chai = require('chai');
chai.config.includeStack = true;
var expect = chai.expect;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/sync.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

const { expect } = chai;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/data_access/users.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const chai = require('chai');

const { expect } = chai;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/firebase/server_client.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const { expect } = require('chai');
const _ = require('underscore');

Expand Down
2 changes: 1 addition & 1 deletion test/integration/misc/game_serialization.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const { expect } = require('chai');
const util = require('util');
const SDK = require('../../../app/sdk.coffee');
Expand Down
2 changes: 1 addition & 1 deletion test/integration/misc/hash_helpers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');
const { expect } = require('chai');
const loginHelpers = require('../../../server/lib/hash_helpers.coffee');

Expand Down
2 changes: 1 addition & 1 deletion test/integration/misc/utils_game_session.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');

const _ = require('underscore');
const prettyjson = require('prettyjson');
Expand Down
2 changes: 1 addition & 1 deletion test/perf/sdk/game.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
require('app-module-path').addPath(path.join(__dirname, '../../../'));
require('coffee-script/register');
require('coffeescript/register');

const Promise = require('bluebird');
const Benchmark = require('benchmark');
Expand Down
Loading