Merge pull request #934 from chiflix/revert-897-pipClone

Revert "refactor(browsingview): replace webView to browserView"

.electron-vue/dev-runner.js

@@ -173,7 +173,8 @@ function greeting() {
   const cols = process.stdout.columns;
   let text = '';
 
-  if (cols > 76) text = 'SPlayer';
+  if (cols > 104) text = 'electron-vue';
+  else if (cols > 76) text = 'electron-|vue';
   else text = false;
 
   if (text) {
@@ -182,7 +183,7 @@ function greeting() {
       font: 'simple3d',
       space: false,
     });
-  } else console.log(chalk.yellow.bold('\n  SPlayer'));
+  } else console.log(chalk.yellow.bold('\n  electron-vue'));
   console.log(chalk.blue('  getting ready...') + '\n');
 }
 

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

@@ -62,7 +62,6 @@ let rendererConfig = {
     about: path.join(__dirname, '../src/renderer/about.js'),
     labor: path.join(__dirname, '../src/renderer/labor.ts'),
     index: path.join(__dirname, '../src/renderer/main.ts'),
-    browsing: path.join(__dirname, '../src/renderer/browsing.ts'),
   },
   externals: [
     ...Object.keys(Object.assign({}, dependencies, optionalDependencies)).filter(
@@ -111,6 +110,17 @@ let rendererConfig = {
         use: 'babel-loader',
         exclude: /node_modules/,
       },
+      {
+        // 匹配 *.worker.js
+        test: /\.worker\.js$/,
+        use: {
+          loader: 'workerize-loader',
+        },
+      },
+      {
+        test: /\.node$/,
+        use: 'node-loader',
+      },
       {
         test: /\.vue$/,
         use: {
@@ -201,7 +211,6 @@ let rendererConfig = {
     new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('labor')),
     new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('about')),
     new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('preference')),
-    new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('browsing')),
     new webpack.HotModuleReplacementPlugin(),
   ],
   output: {

appveyor-appx.yml

@@ -18,6 +18,12 @@ platform:
 
 configuration: Release
 
+cache:
+  - node_modules
+  - '%APPDATA%\npm-cache'
+  - '%USERPROFILE%\.electron'
+  - '%USERPROFILE%\AppData\Local\Yarn\cache'
+
 init:
   - git config --global core.autocrlf input
   # Provide a short commit SHA1 too

appveyor.yml

@@ -18,6 +18,12 @@ platform:
 
 configuration: Release
 
+cache:
+  - node_modules
+  - '%APPDATA%\npm-cache'
+  - '%USERPROFILE%\.electron'
+  - '%USERPROFILE%\AppData\Local\Yarn\cache'
+
 init:
   - git config --global core.autocrlf input
 

package.json

@@ -2,13 +2,13 @@
   "name": "splayer",
   "productName": "splayer",
   "homepage": "https://splayer.org",
-  "version": "4.4.0-beta.0",
+  "version": "4.3.1",
   "author": "tomasen <[email protected]>",
   "description": "a media player",
   "license": "GPL-3.0-or-later",
   "main": "./dist/electron/main.js",
   "engines": {
-    "node": ">=11.0.0"
+    "node": "^11"
   },
   "scripts": {
     "build": "node .electron-vue/build.js && electron-builder --p never",
@@ -19,13 +19,15 @@
     "start": "npm run stage",
     "dev": "cross-env SAGI_API=sagi-api:8443 node .electron-vue/dev-runner.js",
     "stage": "node .electron-vue/dev-runner.js",
+    "e2e": "npm run pack && electron-mocha test/e2e",
     "install-app-deps": "electron-builder install-app-deps",
     "lint": "eslint --ext .ts,.js,.vue -f ./node_modules/eslint-friendly-formatter src test",
     "lint:fix": "eslint --ext .ts,.js,.vue -f ./node_modules/eslint-friendly-formatter --fix src test",
     "pack": "npm run pack:main && npm run pack:renderer",
     "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
     "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
-    "test": "npm run unit",
+    "rebuild:win-mouse": "electron-rebuild -f -e node_modules/@chiflix/electron -w win-mouse",
+    "test": "npm run unit && npm run e2e",
     "unit": "karma start test/unit/karma.conf.js",
     "postinstall": "node ./scripts/post-install.js"
   },
@@ -43,7 +45,7 @@
     "@types/fs-extra": "^7.0.0",
     "@types/lodash": "^4.14.134",
     "@types/lolex": "^3.1.1",
-    "ass-compiler": "github:YvonTre/ass-compiler",
+    "ass-compiler": "0.0.10",
     "axios": "^0.19.0",
     "chardet": "^0.7.0",
     "configcat-js": "^1.1.19",
@@ -54,6 +56,7 @@
     "fs-extra": "^7.0.1",
     "get-video-id": "^3.1.4",
     "google-protobuf": "^3.6.0",
+    "highlight.js": "~9.3.0",
     "iconv-lite": "^0.4.24",
     "idb": "^4.0.3",
     "lethargy": "^1.0.4",
@@ -65,14 +68,15 @@
     "os-locale": "^3.0.1",
     "p-queue": "^6.0.0",
     "rimraf": "^2.6.3",
+    "rollup": "^1.17.0",
     "romanize": "^1.1.1",
     "sagi-api": "^0.0.19",
     "source-map-support": "^0.5.9",
     "subtitle": "github:YvonTre/subtitle.js",
     "traditional-or-simplified": "^1.0.3",
     "url-parse-lax": "^3.0.0",
     "uuid": "^3.2.1",
-    "vue": "^2.6.10",
+    "vue": "^2.5.18",
     "vue-analytics": "^5.16.1",
     "vue-async-computed": "^3.5.1",
     "vue-axios": "^2.1.4",
@@ -86,7 +90,6 @@
     "winston-daily-rotate-file": "^3.9.0"
   },
   "optionalDependencies": {
-    "osx-mouse-cocoa": "github:Pat1enceLos/osx-mouse-cocoa",
     "win-mouse": "1.3.0"
   },
   "devDependencies": {
@@ -109,12 +112,11 @@
     "@babel/plugin-syntax-import-meta": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/register": "^7.0.0",
-    "@chiflix/electron": "5.0.10-dev.5",
+    "@chiflix/electron": "5.0.10",
     "@sentry/webpack-plugin": "^1.6.2",
     "@types/chai": "^4.1.7",
     "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^5.2.7",
-    "@types/node": "^12.7.4",
     "@types/os-locale": "^2.1.0",
     "@types/rimraf": "^2.0.2",
     "@types/sinon": "^7.0.12",
@@ -133,9 +135,10 @@
     "css-loader": "^2.1.1",
     "del": "^3.0.0",
     "devtron": "^1.4.0",
-    "electron-builder": "21.2.0",
-    "electron-debug": "^3.0.1",
-    "electron-mocha": "^8.1.2",
+    "electron-builder": "20.38.2",
+    "electron-debug": "^1.4.0",
+    "electron-mocha": "^6.0.4",
+    "electron-rebuild": "^1.8.5",
     "eslint": "^5.16.0",
     "eslint-config-airbnb-base": "^13.1.0",
     "eslint-friendly-formatter": "^4.0.1",
@@ -146,7 +149,7 @@
     "eslint-plugin-vue": "^5.2.2",
     "exports-loader": "^0.7.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "file-loader": "^4.2.0",
+    "file-loader": "^2.0.0",
     "fork-ts-checker-webpack-plugin": "^1.4.3",
     "html-webpack-plugin": "^3.2.0",
     "istanbul": "github:Xesenix/istanbul",
@@ -161,30 +164,35 @@
     "karma-webpack": "^3.0.5",
     "mocha": "^5.2.0",
     "mocha-webpack": "^1.1.0",
+    "mock-fs": "^4.8.0",
     "module-alias": "^2.0.6",
     "multispinner": "^0.2.1",
+    "node-loader": "^0.6.0",
     "node-sass": "^4.12.0",
     "raw-loader": "^2.0.0",
+    "require-dir": "^1.2.0",
     "sass-loader": "^7.1.0",
     "sass-resources-loader": "^2.0.0",
     "sinon": "^7.2.3",
     "sinon-chai": "^3.3.0",
+    "spectron": "^3.8.0",
     "style-loader": "^0.23.1",
     "svg-sprite-loader": "^4.1.3",
     "terser-webpack-plugin": "^1.4.1",
     "ts-loader": "^6.0.0",
-    "typescript": "~3.5.3",
+    "typescript": "^3.5.2",
     "url-loader": "^1.1.2",
     "vue-eslint-parser": "^6.0.4",
     "vue-html-loader": "^1.2.4",
     "vue-i18n-loader": "^1.0.0",
-    "vue-loader": "^15.7.1",
+    "vue-loader": "^15.4.2",
     "vue-style-loader": "^4.1.2",
-    "vue-template-compiler": "^2.6.10",
-    "webpack": "^4.39.3",
-    "webpack-cli": "^3.3.7",
+    "vue-template-compiler": "^2.5.18",
+    "webpack": "^4.39.2",
+    "webpack-cli": "^3.3.6",
     "webpack-dev-server": "^3.8.0",
     "webpack-hot-middleware": "^2.25.0",
-    "webpack-merge": "^4.2.2"
+    "webpack-merge": "^4.2.1",
+    "workerize-loader": "^1.0.4"
   }
 }