Bläddra i källkod

Сделан npm update, поправлены ошибки

Book Pauk 5 år sedan
förälder
incheckning
f762d2a271
5 ändrade filer med 385 tillägg och 330 borttagningar
  1. 2 2
      build/linux.js
  2. 2 2
      build/win.js
  3. 2 2
      client/components/Reader/Reader.vue
  4. 349 294
      package-lock.json
  5. 30 30
      package.json

+ 2 - 2
build/linux.js

@@ -24,8 +24,8 @@ async function main() {
     await fs.ensureDir(tempDownloadDir);
 
     //sqlite3
-    const sqliteRemoteUrl = 'https://mapbox-node-binary.s3.amazonaws.com/sqlite3/v4.0.4/node-v64-linux-x64.tar.gz';
-    const sqliteDecompressedFilename = `${tempDownloadDir}/node-v64-linux-x64/node_sqlite3.node`;
+    const sqliteRemoteUrl = 'https://mapbox-node-binary.s3.amazonaws.com/sqlite3/v4.1.0/node-v72-linux-x64.tar.gz';
+    const sqliteDecompressedFilename = `${tempDownloadDir}/node-v72-linux-x64/node_sqlite3.node`;
 
     if (!await fs.pathExists(sqliteDecompressedFilename)) {
         // Скачиваем node_sqlite3.node для винды, т.к. pkg не включает его в сборку

+ 2 - 2
build/win.js

@@ -24,8 +24,8 @@ async function main() {
     await fs.ensureDir(tempDownloadDir);
 
     //sqlite3
-    const sqliteRemoteUrl = 'https://mapbox-node-binary.s3.amazonaws.com/sqlite3/v4.0.4/node-v64-win32-x64.tar.gz';
-    const sqliteDecompressedFilename = `${tempDownloadDir}/node-v64-win32-x64/node_sqlite3.node`;
+    const sqliteRemoteUrl = 'https://mapbox-node-binary.s3.amazonaws.com/sqlite3/v4.1.0/node-v72-win32-x64.tar.gz';
+    const sqliteDecompressedFilename = `${tempDownloadDir}/node-v72-win32-x64/node_sqlite3.node`;
 
     if (!await fs.pathExists(sqliteDecompressedFilename)) {
         // Скачиваем node_sqlite3.node для винды, т.к. pkg не включает его в сборку

+ 2 - 2
client/components/Reader/Reader.vue

@@ -482,9 +482,9 @@ class Reader extends Vue {
         const pos = (recent && recent.bookPos && this.allowUrlParamBookPos ? `__p=${recent.bookPos}&` : '');
         const url = (recent ? `url=${recent.url}` : '');
         if (isNewRoute)
-            this.$router.push(`/reader?${pos}${url}`);
+            this.$router.push(`/reader?${pos}${url}`).catch(() => {});
         else
-            this.$router.replace(`/reader?${pos}${url}`);
+            this.$router.replace(`/reader?${pos}${url}`).catch(() => {});
 
     }
 

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 349 - 294
package-lock.json


+ 30 - 30
package.json

@@ -19,70 +19,70 @@
   },
   "devDependencies": {
     "babel-core": "^6.22.1",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "^10.0.3",
     "babel-loader": "^7.1.1",
     "babel-plugin-component": "^1.1.1",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.5",
     "babel-preset-env": "^1.3.2",
-    "clean-webpack-plugin": "^1.0.0",
+    "clean-webpack-plugin": "^1.0.1",
     "copy-webpack-plugin": "^4.6.0",
     "css-loader": "^1.0.0",
     "disable-output-webpack-plugin": "^1.0.1",
-    "element-theme-chalk": "^2.4.11",
-    "eslint": "^5.11.1",
-    "eslint-plugin-html": "^5.0.0",
+    "element-theme-chalk": "^2.12.0",
+    "eslint": "^5.16.0",
+    "eslint-plugin-html": "^5.0.5",
     "eslint-plugin-node": "^8.0.0",
-    "eslint-plugin-vue": "^5.0.0",
-    "event-hooks-webpack-plugin": "^2.1.1",
+    "eslint-plugin-vue": "^5.2.3",
+    "event-hooks-webpack-plugin": "^2.1.4",
     "file-loader": "^3.0.1",
     "html-webpack-plugin": "^3.2.0",
     "mini-css-extract-plugin": "^0.5.0",
     "null-loader": "^0.1.1",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "pkg": "^4.3.7",
-    "terser-webpack-plugin": "^1.2.1",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "pkg": "^4.4.0",
+    "terser-webpack-plugin": "^1.4.1",
     "url-loader": "^1.1.2",
     "vue-class-component": "^6.3.2",
-    "vue-loader": "^15.4.2",
+    "vue-loader": "^15.7.1",
     "vue-style-loader": "^4.1.2",
-    "vue-template-compiler": "^2.5.21",
-    "webpack": "^4.28.2",
-    "webpack-cli": "^3.1.2",
-    "webpack-dev-middleware": "^3.4.0",
-    "webpack-hot-middleware": "^2.24.3",
-    "webpack-merge": "^4.1.5"
+    "vue-template-compiler": "^2.6.10",
+    "webpack": "^4.39.3",
+    "webpack-cli": "^3.3.7",
+    "webpack-dev-middleware": "^3.7.1",
+    "webpack-hot-middleware": "^2.25.0",
+    "webpack-merge": "^4.2.2"
   },
   "dependencies": {
     "appcache-webpack-plugin": "^1.4.0",
-    "axios": "^0.18.0",
-    "base-x": "^3.0.5",
+    "axios": "^0.18.1",
+    "base-x": "^3.0.6",
     "chardet": "^0.7.0",
-    "compression": "^1.7.3",
+    "compression": "^1.7.4",
     "decompress-zip": "^0.2.2",
-    "element-ui": "^2.11.1",
-    "express": "^4.16.4",
+    "element-ui": "^2.12.0",
+    "express": "^4.17.1",
     "fg-loadcss": "^2.1.0",
     "fs-extra": "^7.0.1",
-    "got": "^9.5.1",
+    "got": "^9.6.0",
     "he": "^1.2.0",
     "iconv-lite": "^0.4.24",
     "localforage": "^1.7.3",
-    "lodash": "^4.17.11",
+    "lodash": "^4.17.15",
     "minimist": "^1.2.0",
-    "multer": "^1.4.1",
+    "multer": "^1.4.2",
     "pako": "^1.0.10",
     "path-browserify": "^1.0.0",
-    "safe-buffer": "^5.1.2",
+    "safe-buffer": "^5.2.0",
     "sjcl": "^1.0.8",
     "sql-template-strings": "^2.2.2",
-    "sqlite": "^3.0.0",
+    "sqlite": "^3.0.3",
     "tar-fs": "^2.0.0",
     "unbzip2-stream": "^1.3.3",
-    "vue": "^2.5.21",
-    "vue-router": "^3.0.2",
-    "vuex": "^3.0.1",
+    "vue": "^2.6.10",
+    "vue-router": "^3.1.3",
+    "vuex": "^3.1.1",
     "vuex-persistedstate": "^2.5.4"
   }
 }

Vissa filer visades inte eftersom för många filer har ändrats