Directly require() PrairieLib files instead of using it as a package (#…

…4411)

* Uninstall @prairielearn/prairielib from package.json

* Add script tools/replace_prairielib_paths.py

* Run script to replace prairielib paths

api/v1/endpoints/courseInstanceAssessmentInstances/index.js

@@ -5,8 +5,8 @@ const router = express.Router({
     mergeParams: true,
 });
 
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../../../../prairielib/lib/sql-db');
+const sqlLoader = require('../../../../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.load(path.join(__dirname, '..', 'queries.sql'));
 

api/v1/endpoints/courseInstanceAssessments/index.js

@@ -5,8 +5,8 @@ const router = express.Router({
     mergeParams: true,
 });
 
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../../../../prairielib/lib/sql-db');
+const sqlLoader = require('../../../../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.load(path.join(__dirname, '..', 'queries.sql'));
 

api/v1/endpoints/courseInstanceGradebook/index.js

@@ -4,8 +4,8 @@ const router = express.Router({
     mergeParams: true,
 });
 
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../../../../prairielib/lib/sql-db');
+const sqlLoader = require('../../../../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

api/v1/endpoints/courseInstanceSubmissions/index.js

@@ -5,8 +5,8 @@ const router = express.Router({
     mergeParams: true,
 });
 
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../../../../prairielib/lib/sql-db');
+const sqlLoader = require('../../../../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.load(path.join(__dirname, '..', 'queries.sql'));
 

cron/autoFinishExams.js

@@ -4,7 +4,7 @@ var async = require('async');
 var config = require('../lib/config');
 var logger = require('../lib/logger');
 var assessment = require('../lib/assessment');
-var sqldb = require('@prairielearn/prairielib/sql-db');
+var sqldb = require('../prairielib/lib/sql-db');
 
 module.exports = {};
 

cron/calculateAssessmentMode.js

@@ -1,7 +1,7 @@
 var ERR = require('async-stacktrace');
 
-var sqldb = require('@prairielearn/prairielib/sql-db');
-var sqlLoader = require('@prairielearn/prairielib/sql-loader');
+var sqldb = require('../prairielib/lib/sql-db');
+var sqlLoader = require('../prairielib/lib/sql-loader');
 
 var sql = sqlLoader.loadSqlEquiv(__filename);
 

cron/calculateAssessmentQuestionStats.js

@@ -1,8 +1,8 @@
 const util = require('util');
 
 const logger = require('../lib/logger');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

cron/externalGraderLoad.js

@@ -4,7 +4,7 @@ const AWS = require('aws-sdk');
 
 const config = require('../lib/config');
 const logger = require('../lib/logger');
-const sqldb = require('@prairielearn/prairielib/sql-db');
+const sqldb = require('../prairielib/lib/sql-db');
 
 module.exports = {};
 

cron/index.js

@@ -8,8 +8,8 @@ const logger = require('../lib/logger');
 const config = require('../lib/config');
 
 const namedLocks = require('../lib/named-locks');
-var sqldb = require('@prairielearn/prairielib/sql-db');
-var sqlLoader = require('@prairielearn/prairielib/sql-loader');
+var sqldb = require('../prairielib/lib/sql-db');
+var sqlLoader = require('../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

cron/sendExternalGraderStats.js

@@ -3,7 +3,7 @@ const ERR = require('async-stacktrace');
 const config = require('../lib/config');
 const logger = require('../lib/logger');
 const opsbot = require('../lib/opsbot');
-const sqldb = require('@prairielearn/prairielib/sql-db');
+const sqldb = require('../prairielib/lib/sql-db');
 
 module.exports = {};
 

cron/sendUnfinishedCronWarnings.js

@@ -2,8 +2,8 @@ const { callbackify } = require('util');
 
 const logger = require('../lib/logger');
 const opsbot = require('../lib/opsbot');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

cron/serverLoad.js

@@ -3,7 +3,7 @@ const async = require('async');
 const AWS = require('aws-sdk');
 
 const config = require('../lib/config');
-const sqldb = require('@prairielearn/prairielib/sql-db');
+const sqldb = require('../prairielib/lib/sql-db');
 
 module.exports = {};
 

cron/serverUsage.js

@@ -2,7 +2,7 @@ const ERR = require('async-stacktrace');
 const AWS = require('aws-sdk');
 
 const config = require('../lib/config');
-const sqldb = require('@prairielearn/prairielib/sql-db');
+const sqldb = require('../prairielib/lib/sql-db');
 
 module.exports = {};
 

cron/workspaceHostLoads.js

@@ -2,8 +2,8 @@ const AWS = require('aws-sdk');
 const { callbackify } = require('util');
 
 const config = require('../lib/config');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 const sql = sqlLoader.loadSqlEquiv(__filename);
 
 module.exports = {};

cron/workspaceHostTransitions.js

@@ -6,8 +6,8 @@ const config = require('../lib/config');
 const request = require('request-promise-native');
 const async = require('async');
 
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 const sql = sqlLoader.loadSqlEquiv(__filename);
 
 module.exports = {};

cron/workspaceTimeoutStop.js

@@ -3,8 +3,8 @@ const util = require('util');
 const config = require('../lib/config');
 const logger = require('../lib/logger');
 const workspaceHelper = require('../lib/workspace');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

cron/workspaceTimeoutWarn.js

@@ -3,8 +3,8 @@ const util = require('util');
 const config = require('../lib/config');
 const logger = require('../lib/logger');
 const workspaceHelper = require('../lib/workspace');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

grader_host/index.js

@@ -8,8 +8,8 @@ const AWS = require('aws-sdk');
 const { exec } = require('child_process');
 const path = require('path');
 const byline = require('byline');
-const { sqldb } = require('@prairielearn/prairielib');
-const sanitizeObject = require('@prairielearn/prairielib').util.sanitizeObject;
+const sqldb = require('../prairielib/lib/sql-db');
+const sanitizeObject = require('../prairielib/lib/util').sanitizeObject;
 
 const globalLogger = require('./lib/logger');
 const jobLogger = require('./lib/jobLogger');

grader_host/lib/config.js

@@ -5,7 +5,7 @@ const path = require('path');
 const AWS = require('aws-sdk');
 const os = require('os');
 const _ = require('lodash');
-const { config: configLib } = require('@prairielearn/prairielib');
+const configLib = require('../../prairielib/lib/config');
 
 const logger = require('./logger');
 

grader_host/lib/load.js

@@ -1,4 +1,5 @@
-const { sqldb, sqlLoader } = require('@prairielearn/prairielib');
+const sqldb = require('../../prairielib/lib/sql-db');
+const sqlLoader = require('../../prairielib/lib/sql-loader');
 const logger = require('./logger');
 const config = require('./config').config;
 const lifecycle = require('./lifecycle');

grader_host/lib/pullImages.js

@@ -1,7 +1,8 @@
 const ERR = require('async-stacktrace');
 const async = require('async');
 const Docker = require('dockerode');
-const { sqldb, sqlLoader } = require('@prairielearn/prairielib');
+const sqldb = require('../../prairielib/lib/sql-db');
+const sqlLoader = require('../../prairielib/lib/sql-loader');
 
 const logger = require('./logger');
 const dockerUtil = require('./dockerUtil');

grader_host/lib/receiveFromQueue.js

@@ -3,7 +3,8 @@ const async = require('async');
 const fs = require('fs-extra');
 const path = require('path');
 const Ajv = require('ajv').default;
-const { sqldb, sqlLoader } = require('@prairielearn/prairielib');
+const sqldb = require('../../prairielib/lib/sql-db');
+const sqlLoader = require('../../prairielib/lib/sql-loader');
 
 const globalLogger = require('./logger');
 const config = require('./config').config;

grader_host/lib/timeReporter.js

@@ -1,5 +1,6 @@
 const ERR = require('async-stacktrace');
-const { sqldb, sqlLoader } = require('@prairielearn/prairielib');
+const sqldb = require('../../prairielib/lib/sql-db');
+const sqlLoader = require('../../prairielib/lib/sql-loader');
 
 const config = require('./config').config;
 const sql = sqlLoader.loadSqlEquiv(__filename);

grader_host/tools/syncECR.js

@@ -14,7 +14,7 @@ const dockerUtil = require('../lib/dockerUtil');
 const configManager = require('../lib/config');
 const config = require('../lib/config').config;
 const logger = require('../lib/logger');
-const { sqldb } = require('@prairielearn/prairielib');
+const sqldb = require('../../prairielib/lib/sql-db');
 
 var imagesText = `alawini/cs411-mongo:latest
 alawini/cs411-neo4j

lib/assessment.js

@@ -5,14 +5,14 @@ const ejs = require('ejs');
 const path = require('path');
 const debug = require('debug')('prairielearn:' + path.basename(__filename, '.js'));
 
-const error = require('@prairielearn/prairielib/error');
+const error = require('../prairielib/lib/error');
 const logger = require('../lib/logger');
 const question = require('../lib/question');
 const externalGrader = require('./externalGrader');
 const externalGradingSocket = require('../lib/externalGradingSocket');
 const serverJobs = require('../lib/server-jobs');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 const ltiOutcomes = require('../lib/ltiOutcomes');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);

lib/chunks.js

@@ -14,7 +14,8 @@ const logger = require('../lib/logger');
 const serverJobs = require('../lib/server-jobs');
 const namedLocks = require('../lib/named-locks');
 const courseDB = require('../sync/course-db');
-const { sqlDb, sqlLoader } = require('@prairielearn/prairielib');
+const sqlDb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 
 const globalConfig = require('./config');
 

lib/config.js

@@ -5,8 +5,8 @@ const jsonLoad = require('./json-load');
 const schemas = require('../schemas');
 const { callbackify } = require('util');
 
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 const sql = sqlLoader.loadSqlEquiv(__filename);
 
 const config = module.exports;

lib/courseUtil.js

@@ -1,5 +1,6 @@
 const ERR = require('async-stacktrace');
-const { sqlDb, sqlLoader } = require('@prairielearn/prairielib');
+const sqlDb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 const { exec } = require('child_process');
 const { promisify } = require('util');
 

lib/databaseDescribe.js

@@ -4,8 +4,8 @@ const pgArray = require('pg').types.arrayParser;
 const colors = require('colors');
 const _ = require('lodash');
 
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 const sql = sqlLoader.loadSqlEquiv(__filename);
 
 module.exports = {};

lib/editorUtil.js

@@ -1,8 +1,8 @@
 // @ts-check
-// const sqldb = require('@prairielearn/prairielib/sql-db');
+// const sqldb = require('../prairielib/lib/sql-db');
 const path = require('path');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

lib/editors.js

@@ -16,8 +16,8 @@ const sha256 = require('crypto-js/sha256');
 const util = require('util');
 const chunks = require('./chunks');
 const {escapeRegExp} = require('../prairielib/util');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 const sql = sqlLoader.loadSqlEquiv(__filename);
 
 function contains(parentPath, childPath) {

lib/externalGrader.js

@@ -2,8 +2,8 @@ const ERR = require('async-stacktrace');
 const async = require('async');
 const config = require('./config');
 const logger = require('./logger');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 const externalGradingSocket = require('./externalGradingSocket');
 const ExternalGraderSqs = require('./externalGraderSqs');
 const ExternalGraderLocal = require('./externalGraderLocal');

lib/externalGraderLocal.js

@@ -11,8 +11,8 @@ const byline = require('byline');
 const logger = require('./logger');
 const externalGraderCommon = require('./externalGraderCommon');
 const config = require('./config');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

lib/externalGraderResults.js

@@ -1,7 +1,8 @@
 const ERR = require('async-stacktrace');
 const async = require('async');
-const { sqldb, sqlLoader } = require('@prairielearn/prairielib');
-const error = require('@prairielearn/prairielib/error');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
+const error = require('../prairielib/lib/error');
 const AWS = require('aws-sdk');
 
 const config = require('./config');

lib/externalGraderSqs.js

@@ -11,8 +11,8 @@ const csrf = require('./csrf');
 const globalConfig = require('./config');
 const externalGraderCommon = require('./externalGraderCommon');
 const logger = require('./logger');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

lib/externalGradingSocket.js

@@ -6,8 +6,8 @@ const csrf = require('./csrf');
 const question = require('./question');
 const logger = require('./logger');
 const socketServer = require('./socket-server');
-const sqldb = require('@prairielearn/prairielib/sql-db');
-const sqlLoader = require('@prairielearn/prairielib/sql-loader');
+const sqldb = require('../prairielib/lib/sql-db');
+const sqlLoader = require('../prairielib/lib/sql-loader');
 
 const sql = sqlLoader.loadSqlEquiv(__filename);
 

lib/file-paths.js

@@ -2,10 +2,10 @@ var ERR = require('async-stacktrace');
 var fs = require('fs');
 var path = require('path');
 
-var error = require('@prairielearn/prairielib/error');
+var error = require('../prairielib/lib/error');
 var config = require('./config');
-var sqldb = require('@prairielearn/prairielib/sql-db');
-var sqlLoader = require('@prairielearn/prairielib/sql-loader');
+var sqldb = require('../prairielib/lib/sql-db');
+var sqlLoader = require('../prairielib/lib/sql-loader');
 
 var sql = sqlLoader.loadSqlEquiv(__filename);