Merge pull request #35 from project-yuki/b0.10.1

B0.10.1

Author: tinyAdapter

.electron-vue/dev-runner.js

@@ -218,12 +218,8 @@ function startElectron() {
     args = args.concat(process.argv.slice(2));
   }
 
-  let electronEnv = process.env;
-  electronEnv.DEBUG = "yuki:*";
-  electronEnv.DEBUG_COLORS = true;
   electronProcess = spawn(electron, args, {
-    stdio: "inherit",
-    env: electronEnv
+    stdio: "inherit"
   });
 
   electronProcess.on("close", () => {

.electron-vue/webpack.main.config.js

@@ -5,6 +5,7 @@ process.env.BABEL_ENV = "main";
 const path = require("path");
 const { dependencies, devDependencies } = require("../package.json");
 const webpack = require("webpack");
+const InjectPlugin = require("webpack-inject-plugin");
 const HardSourceWebpackPlugin = require("hard-source-webpack-plugin");
 
 let mainConfig = {
@@ -60,7 +61,12 @@ let mainConfig = {
     path: path.join(__dirname, "../dist/electron")
   },
   plugins: [
-    new HardSourceWebpackPlugin(),
+    new InjectPlugin.default(
+      function() {
+        return "process.env.DEBUG = 'yuki:*';process.env.DEBUG_COLORS = '1';";
+      },
+      { entryOrder: InjectPlugin.ENTRY_ORDER.First }
+    ),
     new webpack.NoEmitOnErrorsPlugin()
   ],
   resolve: {

package.json

@@ -147,6 +147,7 @@
     "webpack-cli": "^3.0.8",
     "webpack-dev-server": "^3.1.11",
     "webpack-hot-middleware": "^2.22.2",
+    "webpack-inject-plugin": "^1.5.3",
     "webpack-merge": "^4.1.3"
   },
   "resolutions": {

src/renderer/components/GamesPageGameCard.vue

@@ -43,7 +43,7 @@
         <v-divider></v-divider>
 
         <v-container>
-          <v-radio-group v-model="selectedLocaleChanger" @change="updateLocaleChanger" :label="$t('localeChanger')">
+          <v-radio-group v-model="selectedLocaleChanger" :label="$t('localeChanger')">
             <v-radio v-for="(value, key) in defaultConfig.localeChangers" :key="game.name+'-changer-'+key" :value="value.name" :label="value.name"></v-radio>
           </v-radio-group>
 

yarn.lock

@@ -105,6 +105,11 @@
   resolved "https://registry.npm.taobao.org/@mdi/font/download/@mdi/font-4.5.95.tgz#43c0d2e7b08d4221a778f58d899455d0c45916ed"
   integrity sha1-Q8DS57CNQiGnePWNiZRV0MRZFu0=
 
+"@types/anymatch@*":
+  version "1.3.1"
+  resolved "https://registry.npm.taobao.org/@types/anymatch/download/@types/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
+  integrity sha1-M2utwb7sudrMOL6izzKt9ieoQho=
+
 "@types/caseless@*":
   version "0.12.1"
   resolved "http://registry.npm.taobao.org/@types/caseless/download/@types/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
@@ -138,6 +143,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/loader-utils@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.npm.taobao.org/@types/loader-utils/download/@types/loader-utils-1.1.3.tgz#82b9163f2ead596c68a8c03e450fbd6e089df401"
+  integrity sha1-grkWPy6tWWxoqMA+RQ+9bgid9AE=
+  dependencies:
+    "@types/node" "*"
+    "@types/webpack" "*"
+
 "@types/lodash@^4.14.121":
   version "4.14.121"
   resolved "http://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.121.tgz#9327e20d49b95fc2bf983fc2f045b2c6effc80b9"
@@ -189,18 +202,56 @@
     "@types/node" "*"
     "@types/tough-cookie" "*"
 
+"@types/source-list-map@*":
+  version "0.1.2"
+  resolved "https://registry.npm.taobao.org/@types/source-list-map/download/@types/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha1-AHiDYGP/rxdBI0m7o2QIfgrALsk=
+
+"@types/tapable@*":
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/@types/tapable/download/@types/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
+  integrity sha1-tP/H3Je0mMlps2CkHu4kf4JhY3A=
+
 "@types/tough-cookie@*":
   version "2.3.4"
   resolved "http://registry.npm.taobao.org/@types/tough-cookie/download/@types/tough-cookie-2.3.4.tgz#821878b81bfab971b93a265a561d54ea61f9059f"
   integrity sha1-ghh4uBv6uXG5OiZaVh1U6mH5BZ8=
 
+"@types/uglify-js@*":
+  version "3.0.4"
+  resolved "https://registry.npm.taobao.org/@types/uglify-js/download/@types/uglify-js-3.0.4.tgz#96beae23df6f561862a830b4288a49e86baac082"
+  integrity sha1-lr6uI99vVhhiqDC0KIpJ6GuqwII=
+  dependencies:
+    source-map "^0.6.1"
+
 "@types/vue-color@^2.4.1":
   version "2.4.1"
   resolved "http://registry.npm.taobao.org/@types/vue-color/download/@types/vue-color-2.4.1.tgz#36892314b278ed3d348e035ea96df5df449fa86b"
   integrity sha1-NokjFLJ47T00jgNeqW3130SfqGs=
   dependencies:
     vue ">=2.0.0"
 
+"@types/webpack-sources@*":
+  version "0.1.5"
+  resolved "https://registry.npm.taobao.org/@types/webpack-sources/download/@types/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
+  integrity sha1-vkfBD3g9PW7+FHH/fwQmEb1GSpI=
+  dependencies:
+    "@types/node" "*"
+    "@types/source-list-map" "*"
+    source-map "^0.6.1"
+
+"@types/webpack@*", "@types/webpack@^4.4.17":
+  version "4.41.0"
+  resolved "https://registry.npm.taobao.org/@types/webpack/download/@types/webpack-4.41.0.tgz#b813a044d8b0dec7dfcd7622fdbe327bde06eb9a"
+  integrity sha1-uBOgRNiw3sffzXYi/b4ye94G65o=
+  dependencies:
+    "@types/anymatch" "*"
+    "@types/node" "*"
+    "@types/tapable" "*"
+    "@types/uglify-js" "*"
+    "@types/webpack-sources" "*"
+    source-map "^0.6.0"
+
 "@vue/component-compiler-utils@^2.0.0":
   version "2.3.0"
   resolved "http://registry.npm.taobao.org/@vue/component-compiler-utils/download/@vue/component-compiler-utils-2.3.0.tgz#4f580f1b28fc7685859d87ea0e92a1c0271c93da"
@@ -5976,7 +6027,7 @@ loader-utils@^1.0.2, loader-utils@^1.1.0:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-loader-utils@^1.2.0, loader-utils@^1.2.3:
+loader-utils@^1.2.0, loader-utils@^1.2.3, loader-utils@~1.2.3:
   version "1.2.3"
   resolved "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha1-H/XcaRHJ8KBiUxpMBLYJQGEIwsc=
@@ -10229,6 +10280,15 @@ webpack-hot-middleware@^2.22.2:
     querystring "^0.2.0"
     strip-ansi "^3.0.0"
 
+webpack-inject-plugin@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.npm.taobao.org/webpack-inject-plugin/download/webpack-inject-plugin-1.5.3.tgz#4d6894eb7d1bfbc1e30c75f2708699910d6ae6b2"
+  integrity sha1-TWiU630b+8HjDHXycIaZkQ1q5rI=
+  dependencies:
+    "@types/loader-utils" "^1.1.3"
+    "@types/webpack" "^4.4.17"
+    loader-utils "~1.2.3"
+
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npm.taobao.org/webpack-log/download/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"