v2.0.0

build-config/main/webpack.config.base.js

@@ -5,9 +5,17 @@ module.exports = {
   target: 'electron-main',
   output: {
     filename: '[name].js',
-    libraryTarget: 'commonjs2',
+    library: {
+      type: 'commonjs2',
+    },
     path: path.join(__dirname, '../../dist'),
   },
+  externals: [
+    'font-list',
+    'better-sqlite3',
+    'bufferutil',
+    'utf-8-validate',
+  ],
   resolve: {
     alias: {
       '@main': path.join(__dirname, '../../src/main'),
@@ -15,7 +23,7 @@ module.exports = {
       '@lyric': path.join(__dirname, '../../src/renderer-lyric'),
       '@common': path.join(__dirname, '../../src/common'),
     },
-    extensions: ['*', '.js', '.json', '.node'],
+    extensions: ['.tsx', '.ts', '.js', '.mjs', '.json', '.node'],
   },
   module: {
     rules: [
@@ -23,6 +31,11 @@ module.exports = {
         test: /\.node$/,
         use: 'node-loader',
       },
+      {
+        test: /\.tsx?$/,
+        use: 'ts-loader',
+        exclude: /node_modules/,
+      },
     ],
   },
   plugins: [

build-config/main/webpack.config.dev.js

@@ -8,15 +8,17 @@ const baseConfig = require('./webpack.config.base')
 module.exports = merge(baseConfig, {
   mode: 'development',
   entry: {
-    main: path.join(__dirname, '../../src/main/index.dev.js'),
+    main: path.join(__dirname, '../../src/main/index-dev.ts'),
+    // 'dbService.worker': path.join(__dirname, '../../src/main/worker/dbService/index.ts'),
   },
+  devtool: 'eval-source-map',
   plugins: [
     new webpack.DefinePlugin({
       'process.env': {
         NODE_ENV: '"development"',
       },
-      __static: `"${path.join(__dirname, '../../src/static').replace(/\\/g, '\\\\')}"`,
-      __userApi: `"${path.join(__dirname, '../../src/main/modules/userApi').replace(/\\/g, '\\\\')}"`,
+      webpackStaticPath: `"${path.join(__dirname, '../../src/static').replace(/\\/g, '\\\\')}"`,
+      webpackUserApiPath: `"${path.join(__dirname, '../../src/main/modules/userApi').replace(/\\/g, '\\\\')}"`,
     }),
   ],
   performance: {

build-config/main/webpack.config.prod.js

@@ -5,18 +5,17 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
 
 const baseConfig = require('./webpack.config.base')
 
-const { dependencies } = require('../../package.json')
+// const { dependencies } = require('../../package.json')
+
+const buildConfig = require('../webpack-build-config')
 
 
 module.exports = merge(baseConfig, {
   mode: 'production',
   entry: {
-    main: path.join(__dirname, '../../src/main/index.js'),
+    main: path.join(__dirname, '../../src/main/index.ts'),
+    // 'dbService.worker': path.join(__dirname, '../../src/main/worker/dbService/index.ts'),
   },
-  externals: [
-    ...Object.keys(dependencies || {}),
-    // 'font-list',
-  ],
   node: {
     __dirname: false,
     __filename: false,
@@ -25,12 +24,12 @@ module.exports = merge(baseConfig, {
     new CopyWebpackPlugin({
       patterns: [
         {
-          from: path.join(__dirname, '../../src/main/modules/userApi/renderer'),
-          to: path.join(__dirname, '../../dist/userApi/renderer'),
+          from: path.join(__dirname, '../../src/main/modules/userApi/renderer/user-api.html'),
+          to: path.join(__dirname, '../../dist/userApi/renderer/user-api.html'),
         },
         {
-          from: path.join(__dirname, '../../src/main/modules/userApi/rendererEvent/name.js'),
-          to: path.join(__dirname, '../../dist/userApi/rendererEvent/name.js'),
+          from: path.join(__dirname, '../../src/common/theme/images/*').replace(/\\/g, '/'),
+          to: path.join(__dirname, '../../dist/theme_images/[name][ext]'),
         },
       ],
     }),
@@ -45,6 +44,6 @@ module.exports = merge(baseConfig, {
     maxAssetSize: 1024 * 1024 * 20,
   },
   optimization: {
-    minimize: false,
+    minimize: buildConfig.minimize,
   },
 })