diff --git a/packages/main/package.json b/packages/main/package.json index d242b3a85d..de4c1c78c9 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -4,7 +4,7 @@ "description": "Nuclear main process", "scripts": { "start": "shx rm -rf build && webpack --env NODE_ENV=development && electron build/main.js --inspect=9001", - "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 webpack --env NODE_ENV=production", + "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 webpack --progress --env NODE_ENV=production", "lint": "eslint src/**/**.ts", "lint:fix": "eslint src/**/**.ts --fix", "test": "jest --silent" @@ -95,4 +95,4 @@ "mpris-service": "2.1.0", "x11": "^2.3.0" } -} +} \ No newline at end of file diff --git a/packages/main/webpack.config.ts b/packages/main/webpack.config.ts index 05204e6bb8..28bb387932 100644 --- a/packages/main/webpack.config.ts +++ b/packages/main/webpack.config.ts @@ -15,8 +15,7 @@ const osMapper: Record = { }; const MAIN_DIR = path.resolve(__dirname, 'src'); -const CORE_DIR = path.resolve(__dirname, '..', 'core', 'src'); -const CORE_DIR_SYMLINKED = path.resolve(__dirname, 'node_modules', '@nuclear', 'core', 'src'); +const CORE_DIR = path.resolve(__dirname, '..', '..', 'node_modules', '@nuclear', 'core', 'src'); module.exports = (env: BuildEnv): webpack.Configuration => { if (!env.TARGET) { @@ -52,9 +51,12 @@ module.exports = (env: BuildEnv): webpack.Configuration => { module: { rules: [ { - test: /.ts?$/, + test: /\.ts?$/, loader: 'ts-loader', - include: [MAIN_DIR, CORE_DIR, CORE_DIR_SYMLINKED] + include: [MAIN_DIR, CORE_DIR], + options: { + allowTsInNodeModules: true + } }, { test: /\.node$/,