Merge branch 'master' into feat/improved-local-session-storage

Author: pikax

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
  runs-on: [ubuntu-latest]
  strategy:
  matrix:
- node-version: [10.x, 12.x, 14.x]
+ node-version: [12.x, 14.x, 16.x]
  steps:
  - name: Checkout
  uses: actions/checkout@v2
@@ -54,7 +54,7 @@ jobs:
  runs-on: [ubuntu-latest]
  strategy:
  matrix:
- node-version: [10.x, 12.x, 14.x]
+ node-version: [12.x, 14.x, 16.x]
  steps:
  - name: Checkout
  uses: actions/checkout@v2

package.json

@@ -96,8 +96,14 @@
  "tsd": "^0.16.0",
  "typescript": "^4.2.4",
  "vue": "^2.6.14",
+ "vue-server-renderer": "^2.6.14",
+ "vue-template-compiler": "^2.6.14",
  "vuepress": "^1.8.2",
  "yorkie": "^2.0.0",
  "zlib": "^1.0.5"
+ },
+ "resolutions": {
+ "vue-server-renderer": "^2.6.14",
+ "vue-template-compiler": "^2.6.14"
  }
 }

packages/axios/package.json

@@ -65,4 +65,4 @@
  "@vue/composition-api": "^1.0.0-beta.14",
  "axios": "^0.22.0"
  }
-}
+}

packages/cookie/package.json

@@ -68,4 +68,4 @@
  "@types/js-cookie": "^2.2.6",
  "js-cookie": "^2.2.1"
  }
-}
+}

packages/vue-composable/package.json

@@ -57,4 +57,4 @@
  "@vue/composition-api": "^1.0.0-beta.14",
  "vue": "^2.6.10"
  }
-}
+}

yarn.lock

@@ -11070,10 +11070,10 @@ vue-router@^3.4.5:
  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9"
  integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==
 
-vue-server-renderer@^2.6.10:
- version "2.6.12"
- resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.12.tgz#a8cb9c49439ef205293cb41c35d0d2b0541653a5"
- integrity sha512-3LODaOsnQx7iMFTBLjki8xSyOxhCtbZ+nQie0wWY4iOVeEtTg1a3YQAjd82WvKxrWHHTshjvLb7OXMc2/dYuxw==
+vue-server-renderer@^2.6.10, vue-server-renderer@^2.6.14:
+ version "2.6.14"
+ resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.14.tgz#c8bffff152df6b47b858818ef8d524d2fc351654"
+ integrity sha512-HifYRa/LW7cKywg9gd4ZtvtRuBlstQBao5ZCWlg40fyB4OPoGfEXAzxb0emSLv4pBDOHYx0UjpqvxpiQFEuoLA==
  dependencies:
  chalk "^1.1.3"
  hash-sum "^1.0.2"
@@ -11100,6 +11100,14 @@ vue-template-compiler@^2.6.10:
  de-indent "^1.0.2"
  he "^1.1.0"
 
+vue-template-compiler@^2.6.14:
+ version "2.6.14"
+ resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763"
+ integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==
+ dependencies:
+ de-indent "^1.0.2"
+ he "^1.1.0"
+
 vue-template-es2015-compiler@^1.9.0:
  version "1.9.1"
  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"