diff --git a/server/build/webpack.prod.conf.js b/server/build/webpack.prod.conf.js index bd5d98b..d479d45 100644 --- a/server/build/webpack.prod.conf.js +++ b/server/build/webpack.prod.conf.js @@ -7,32 +7,11 @@ const fs = require('fs'); var base = require('./webpack.base.conf'); const TARGET_NODE_VERSION = process.versions.node; -const PLATFORM = `${process.platform}-${process.arch}-node-${TARGET_NODE_VERSION.split('.')[0]}`; -const DEASYNC_NODE_MODULES_PATH = path.resolve('node_modules', 'deasync', 'bin', PLATFORM); -const DEASYNC_DIST_PATH = path.resolve('dist', 'bin', PLATFORM); - -console.log(`Target node version: ${TARGET_NODE_VERSION}`); -console.log(`Platform: ${PLATFORM}`); - -if(!fs.existsSync(DEASYNC_NODE_MODULES_PATH)) { - throw new Error(`deasync doesn't support this platform: ${PLATFORM}`); -} base.mode = 'production'; base.output.filename = "server.js"; base.optimization.minimize = true; -base.externals = base.externals ? base.externals : []; -base.externals.push( - function (context, request, callback) { - if(request.indexOf('bindings') === 0) { - callback(null, `() => require('./deasync.node')`) - } else { - callback(); - } - } -); - const prodRules = [ { test: /\.js$/, @@ -57,18 +36,6 @@ const prodRules = [ } ]; -let contextPathMapping = {}; -contextPathMapping[path.resolve(DEASYNC_DIST_PATH, 'deasync')] = './deasync.node'; - -const prodPlugins = [ - new webpack.ContextReplacementPlugin( - /deasync/, - DEASYNC_NODE_MODULES_PATH, - contextPathMapping - ) -]; - base.module.rules = [...base.module.rules, ...prodRules]; -base.plugins = [...base.plugins, ...prodPlugins]; module.exports = base; diff --git a/server/package.json b/server/package.json index 532af79..b39f613 100644 --- a/server/package.json +++ b/server/package.json @@ -53,7 +53,7 @@ "nodemon": "^1.17.5", "ts-jest": "^23.1.1", "ts-loader": "^4.4.1", - "typescript": "^2.8.3", + "typescript": "^3.9.5", "url": "^0.11.0", "webpack": "^4.12.0", "webpack-cli": "^3.0.8", diff --git a/server/spec/setup_tests.ts b/server/spec/setup_tests.ts index f3f4eaa..504c7d7 100644 --- a/server/spec/setup_tests.ts +++ b/server/spec/setup_tests.ts @@ -13,7 +13,5 @@ jest.mock('../src/config.ts', () => ({ AlertTypes: jest.requireActual('../src/config').AlertTypes, })); -jest.mock('deasync', () => ({ loopWhile: jest.fn() })); - clearSegmentsDB(); createTestDB();