Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'origin/dev' into modern-semver
  • Loading branch information
clarkdo committed Feb 9, 2020
2 parents b9e5256 + 6ae7718 commit 88fed52
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -66,7 +66,7 @@
"node-sass": "^4.13.1",
"puppeteer-core": "^2.1.1",
"request": "^2.88.0",
"rimraf": "^3.0.1",
"rimraf": "^3.0.2",
"rollup": "^1.31.0",
"rollup-plugin-license": "^0.13.0",
"sass-loader": "^8.0.2",
Expand Down
1 change: 0 additions & 1 deletion packages/utils/src/modern.js
@@ -1,4 +1,3 @@

import UAParser from 'ua-parser-js'

export const ModernBrowsers = {
Expand Down
4 changes: 3 additions & 1 deletion test/fixtures/fetch/pages/fetch-conditional.vue
@@ -1,6 +1,8 @@
<template>
<div>
<nuxt-link to="/fetch-conditional?fetch_client=true">Fetch on client</nuxt-link>
<nuxt-link to="/fetch-conditional?fetch_client=true">
Fetch on client
</nuxt-link>
<p v-if="$fetchState.pending">
Fetching...
</p>
Expand Down
9 changes: 8 additions & 1 deletion yarn.lock
Expand Up @@ -10764,13 +10764,20 @@ rimraf@2.6.3:
dependencies:
glob "^7.1.3"

rimraf@^3.0.0, rimraf@^3.0.1:
rimraf@^3.0.0:
version "3.0.1"
resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.1.tgz#48d3d4cb46c80d388ab26cd61b1b466ae9ae225a"
integrity sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw==
dependencies:
glob "^7.1.3"

rimraf@^3.0.2:
version "3.0.2"
resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
dependencies:
glob "^7.1.3"

ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.2"
resolved "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
Expand Down

0 comments on commit 88fed52

Please sign in to comment.