diff --git a/desktop/.erb/configs/utils.ts b/desktop/.erb/configs/utils.ts index 8fc52fde..0ed26521 100644 --- a/desktop/.erb/configs/utils.ts +++ b/desktop/.erb/configs/utils.ts @@ -1,5 +1,6 @@ import webWebpackConfig from '../../../web/build/webpack.config'; import type { Configuration } from 'webpack'; +import webpackPaths from './webpack.paths'; export function getWebTailchatWebpackConfig(): Configuration { return { @@ -7,5 +8,11 @@ export function getWebTailchatWebpackConfig(): Configuration { plugins: webWebpackConfig.plugins?.filter( (p) => !['GenerateSW'].includes(p.constructor.name) ), + output: { + path: webpackPaths.distRendererPath, + filename: '[name].[contenthash].js', + publicPath: '/', + }, + target: ['web', 'electron-renderer'], }; } diff --git a/desktop/.erb/configs/webpack.config.renderer.dev.ts b/desktop/.erb/configs/webpack.config.renderer.dev.ts index 7d56b2a3..29089015 100644 --- a/desktop/.erb/configs/webpack.config.renderer.dev.ts +++ b/desktop/.erb/configs/webpack.config.renderer.dev.ts @@ -23,7 +23,6 @@ const configuration: Configuration = { ), }, }, - target: ['web', 'electron-renderer'], devServer: { port, compress: true, diff --git a/desktop/.erb/configs/webpack.config.renderer.prod.ts b/desktop/.erb/configs/webpack.config.renderer.prod.ts index ed826db2..8006c759 100644 --- a/desktop/.erb/configs/webpack.config.renderer.prod.ts +++ b/desktop/.erb/configs/webpack.config.renderer.prod.ts @@ -13,16 +13,7 @@ const configuration: Configuration = { ), }, }, - target: ['web', 'electron-renderer'], mode: 'production', - output: { - path: webpackPaths.distRendererPath, - publicPath: '/', - filename: '[name].[contenthash].js', - library: { - type: 'umd', - }, - }, }; export default configuration; diff --git a/desktop/package.json b/desktop/package.json index 45df20e5..f8e5707a 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -47,7 +47,7 @@ "start:main": "cross-env NODE_ENV=development electronmon -r ts-node/register/transpile-only .", "start:preload": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.preload.dev.ts", "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts", - "http-server": "ts-node src/main/lib/http.ts", + "http-server": "ts-node test/http-server.ts", "test": "jest" }, "lint-staged": { @@ -145,7 +145,7 @@ "core-js": "^3.22.5", "cross-env": "^7.0.3", "crypto-browserify": "^3.12.0", - "css-loader": "^6.7.1", + "css-loader": "^5.2.6", "css-minimizer-webpack-plugin": "^3.4.1", "detect-port": "^1.3.0", "dotenv": "^16.0.1", @@ -175,7 +175,7 @@ "jest": "^28.1.0", "jest-environment-jsdom": "^28.1.0", "less": "^4.1.3", - "less-loader": "^11.0.0", + "less-loader": "^10.0.0", "lint-staged": "^12.4.1", "mini-css-extract-plugin": "^2.6.0", "path-browserify": "^1.0.1", diff --git a/desktop/test/http-server.ts b/desktop/test/http-server.ts new file mode 100644 index 00000000..02d8a3f1 --- /dev/null +++ b/desktop/test/http-server.ts @@ -0,0 +1,11 @@ +import { startLocalServer } from '../src/main/lib/http'; +import path from 'path'; + +const port = 12120; + +startLocalServer( + path.resolve(__dirname, '../release/app/dist/renderer'), + port +).then(() => { + console.log('HTTP Server start in', `http://localhost:${port}`); +}); diff --git a/desktop/yarn.lock b/desktop/yarn.lock index f9aa3105..8e8968a2 100644 --- a/desktop/yarn.lock +++ b/desktop/yarn.lock @@ -3883,18 +3883,20 @@ css-declaration-sorter@^6.2.2: resolved "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz#72ebd995c8f4532ff0036631f7365cce9759df14" integrity sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og== -css-loader@^6.7.1: - version "6.7.1" - resolved "https://registry.npmmirror.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e" - integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw== +css-loader@^5.2.6: + version "5.2.7" + resolved "https://registry.npmmirror.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" + integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg== dependencies: icss-utils "^5.1.0" - postcss "^8.4.7" + loader-utils "^2.0.0" + postcss "^8.2.15" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" postcss-modules-values "^4.0.0" - postcss-value-parser "^4.2.0" + postcss-value-parser "^4.1.0" + schema-utils "^3.0.0" semver "^7.3.5" css-minimizer-webpack-plugin@^3.4.1: @@ -7307,10 +7309,10 @@ lazy-val@^1.0.4, lazy-val@^1.0.5: resolved "https://registry.npmmirror.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== -less-loader@^11.0.0: - version "11.0.0" - resolved "https://registry.npmmirror.com/less-loader/-/less-loader-11.0.0.tgz#a31b2bc5cdfb62f1c7de9b2d01cd944c22b1a024" - integrity sha512-9+LOWWjuoectIEx3zrfN83NAGxSUB5pWEabbbidVQVgZhN+wN68pOvuyirVlH1IK4VT1f3TmlyvAnCXh8O5KEw== +less-loader@^10.0.0: + version "10.2.0" + resolved "https://registry.npmmirror.com/less-loader/-/less-loader-10.2.0.tgz#97286d8797dc3dc05b1d16b0ecec5f968bdd4e32" + integrity sha512-AV5KHWvCezW27GT90WATaDnfXBv99llDbtaj4bshq6DvAihMdNjaPDcUMa6EXKLRF+P2opFenJp89BXg91XLYg== dependencies: klona "^2.0.4" @@ -8714,7 +8716,7 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: resolved "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.1.6, postcss@^8.3.5, postcss@^8.4.7: +postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.5: version "8.4.14" resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==