v2.0.0

build-config/renderer-lyric/webpack.config.base.js

@@ -12,11 +12,13 @@ const isDev = process.env.NODE_ENV === 'development'
 module.exports = {
   target: 'electron-renderer',
   entry: {
-    'renderer-lyric': path.join(__dirname, '../../src/renderer-lyric/main.js'),
+    'renderer-lyric': path.join(__dirname, '../../src/renderer-lyric/main.ts'),
   },
   output: {
     filename: '[name].js',
-    libraryTarget: 'commonjs2',
+    library: {
+      type: 'commonjs2',
+    },
     path: path.join(__dirname, '../../dist'),
     publicPath: 'auto',
   },
@@ -29,10 +31,25 @@ module.exports = {
       '@static': path.join(__dirname, '../../src/static'),
       '@common': path.join(__dirname, '../../src/common'),
     },
-    extensions: ['*', '.js', '.json', '.vue', '.node'],
+    extensions: ['.tsx', '.ts', '.js', '.json', '.vue', '.node'],
   },
   module: {
     rules: [
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+      },
+      {
+        test: /\.tsx?$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'ts-loader',
+          options: {
+            appendTsSuffixTo: [/\.vue$/],
+          },
+        },
+      },
       {
         test: /\.node$/,
         use: 'node-loader',
@@ -43,9 +60,8 @@ module.exports = {
         options: vueLoaderConfig,
       },
       {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
+        test: /\.pug$/,
+        loader: 'pug-plain-loader',
       },
       {
         test: /\.css$/,
@@ -60,20 +76,6 @@ module.exports = {
           },
         }),
       },
-      {
-        test: /\.pug$/,
-        oneOf: [
-          // Use pug-plain-loader handle .vue file
-          {
-            resourceQuery: /vue/,
-            use: ['pug-plain-loader'],
-          },
-          // Use pug-loader handle .pug file
-          {
-            use: ['pug-loader'],
-          },
-        ],
-      },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         exclude: path.join(__dirname, '../../src/renderer/assets/svgs'),
@@ -130,7 +132,7 @@ module.exports = {
   plugins: [
     new HTMLPlugin({
       filename: 'lyric.html',
-      template: path.join(__dirname, '../../src/renderer-lyric/index.pug'),
+      template: path.join(__dirname, '../../src/renderer-lyric/index.html'),
       isProd: process.env.NODE_ENV == 'production',
       browser: process.browser,
       __dirname,

build-config/renderer-lyric/webpack.config.dev.js

@@ -16,7 +16,7 @@ module.exports = merge(baseConfig, {
       },
       __VUE_OPTIONS_API__: 'true',
       __VUE_PROD_DEVTOOLS__: 'false',
-      __static: `"${path.join(__dirname, '../../src/static').replace(/\\/g, '\\\\')}"`,
+      staticPath: `"${path.join(__dirname, '../../src/static').replace(/\\/g, '\\\\')}"`,
     }),
   ],
   performance: {

build-config/renderer-lyric/webpack.config.prod.js

@@ -5,18 +5,19 @@ const TerserPlugin = require('terser-webpack-plugin')
 const { merge } = require('webpack-merge')
 
 const baseConfig = require('./webpack.config.base')
+const buildConfig = require('../webpack-build-config')
 
-const { dependencies } = require('../../package.json')
+// const { dependencies } = require('../../package.json')
 
 // let whiteListedModules = ['vue']
-let whiteListedModules = ['vue', 'vue-router', 'vuex', 'vue-i18n']
+// let whiteListedModules = ['vue', 'vue-router', 'vuex', 'vue-i18n']
 
 
 module.exports = merge(baseConfig, {
   mode: 'production',
   devtool: false,
   externals: [
-    ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d)),
+    // ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d)),
   ],
   plugins: [
     new webpack.DefinePlugin({
@@ -28,7 +29,7 @@ module.exports = merge(baseConfig, {
     }),
   ],
   optimization: {
-    minimize: false,
+    minimize: buildConfig.minimize,
     minimizer: [
       new TerserPlugin(),
       new CssMinimizerPlugin(),