🌐 AI搜索 & 代理 主页
Skip to content

Commit 492c154

Browse files
tmorehousetmorehouse
authored
Merge branch 'dev' into feat-overlay-click-event
2 parents 22ea00c + 0c57ffe commit 492c154

File tree

9 files changed

+50
-42
lines changed

9 files changed

+50
-42
lines changed

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
.now/
12
.nuxt/
3+
.vercel/
24
coverage/
35
dist/
46
docs-dist/

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
.idea/
2+
.now/
23
.nuxt/
4+
.vercel/
35
.vscode/
46
coverage/
57
dist/

‎.prettierignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
.now/
12
.nuxt/
3+
.vercel/
24
coverage/
35
dist/
46
docs-dist/

‎docs/components/footer.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444

4545
<hr>
4646

47-
<template v-if="isZeitNow && false">
47+
<template v-if="isVercel && false">
4848
<p class="mb-4 text-center">
4949
<strong class="d-block mx-auto mb-2">Hosting provided by</strong>
50-
<a href="https://zeit.co/?utm_campaign=bootstrap-vue" target="_blank" rel="noopener">
50+
<a href="https://vercel.com/?utm_campaign=bootstrap-vue" target="_blank" rel="noopener">
5151
<svg
5252
xmlns="http://www.w3.org/2000/svg"
5353
role="img"
@@ -98,12 +98,12 @@
9898
Currently v{{ version }}. Code licensed
9999
<a href="https://github.com/bootstrap-vue/bootstrap-vue/blob/master/LICENSE" target="_blank">MIT</a>.
100100
Docs generated with
101-
<a href="https://nuxtjs.org/" target="_blank">Nuxt.js</a><template v-if="!isNetlify && !isZeitNow">.</template>
101+
<a href="https://nuxtjs.org/" target="_blank">Nuxt.js</a><template v-if="!isNetlify && !isVercel">.</template>
102102
<template v-if="isNetlify">
103103
and proudly hosted on <a href="https://www.netlify.com" target="_blank">Netlify</a>.
104104
</template>
105-
<template v-else-if="isZeitNow">
106-
and proudly hosted on <a href="https://zeit.co/?utm_campaign=bootstrap-vue" target="_blank">Zeit</a>.
105+
<template v-else-if="isVercel">
106+
and proudly hosted on <a href="https://vercel.com/?utm_campaign=bootstrap-vue" target="_blank">Vercel</a>.
107107
</template>
108108
</p>
109109
</b-container>
@@ -146,8 +146,8 @@ export default {
146146
isNetlify() {
147147
return Boolean(process.env.NETLIFY)
148148
},
149-
isZeitNow() {
150-
return Boolean(process.env.ZEIT_NOW)
149+
isVercel() {
150+
return Boolean(process.env.VERCEL_NOW)
151151
}
152152
}
153153
}

‎docs/components/header.vue‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,30 +199,35 @@ export default {
199199
isNetlify() {
200200
return Boolean(process.env.NETLIFY)
201201
},
202-
isZeitNow() {
203-
return Boolean(process.env.ZEIT_NOW)
202+
isVercel() {
203+
return Boolean(process.env.VERCEL_NOW)
204204
},
205205
branchName() {
206-
return this.isZeitNow ? process.env.ZEIT_BRANCH || '' : ''
206+
// Netlify doesn't support providing the branch name
207+
return this.isVercel ? process.env.VERCEL_BRANCH || '' : ''
207208
},
208209
isDev() {
209210
// In our case, `production` is the dev branch preview (Netlify)
210211
return (
211212
(this.isNetlify && process.env.NETLIFY_CONTEXT === 'production') ||
212-
(this.isZeitNow && this.branchName === 'dev')
213+
(this.isVercel && this.branchName === 'dev')
213214
)
214215
},
215216
isPR() {
216217
return (
217218
(this.isNetlify && process.env.PULL_REQUEST && process.env.REVIEW_ID) ||
218-
(this.isZeitNow && !this.isDev && this.branchName !== 'master')
219+
(this.isVercel && !this.isDev && this.branchName !== 'master')
219220
)
220221
},
221222
prId() {
223+
// Vercel doesn't currently support returning the PR number
224+
// `REVIEW_ID` is provided by Netlify
222225
return this.isPR ? process.env.REVIEW_ID : ''
223226
},
224227
dropdownText() {
228+
// Dropdown button text
225229
if (this.isPR) {
230+
// Vercel doesn't currently support returning the PR number
226231
return this.prId ? `Pull #${this.prId}` : 'Pull Request'
227232
} else if (this.isLocal) {
228233
return 'Local Copy'

‎docs/nuxt.config.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,20 @@ module.exports = {
151151
PULL_REQUEST: process.env.NETLIFY ? process.env.PULL_REQUEST : null,
152152
// - If the previous is `true`, this will be the PR number
153153
REVIEW_ID: process.env.NETLIFY && process.env.PULL_REQUEST ? process.env.REVIEW_ID : null,
154-
// ENV vars provided by Zeit Now build
154+
// ENV vars provided by Vercel/Zeit Now build
155155
// https://zeit.co/docs/v2/build-step#system-environment-variables
156156
// - `true` if on Zeit Now (dev or PR)
157-
ZEIT_NOW: process.env.NOW_GITHUB_DEPLOYMENT,
157+
VERCEL_NOW: process.env.VERCEL_GITHUB_DEPLOYMENT || process.env.NOW_GITHUB_DEPLOYMENT,
158158
// - The branch name used for the deploy (i.e. `dev`, `master`, `patch-1`, etc)
159-
ZEIT_BRANCH: process.env.NOW_GITHUB_COMMIT_REF,
159+
VERCEL_BRANCH: process.env.VERCEL_GITHUB_COMMIT_REF || process.env.NOW_GITHUB_COMMIT_REF,
160160
// - The Commit SHA hash
161-
ZEIT_COMMIT_SHA: process.env.NOW_GITHUB_COMMIT_SHA,
161+
VERCEL_COMMIT_SHA: process.env.VERCEL_GITHUB_COMMIT_SHA || process.env.NOW_GITHUB_COMMIT_SHA,
162162
// - The deployment URL
163-
ZEIT_URL: process.env.NOW_URL,
163+
VERCEL_URL: process.env.VERCEL_URL || process.env.NOW_URL,
164164
// - The Github Organization (ie. bootstrap-vue)
165-
ZEIT_GITHUB_ORG: process.env.NOW_GITHUB_ORG,
165+
VERCEL_GITHUB_ORG: process.env.VERCEL_GITHUB_ORG || process.env.NOW_GITHUB_ORG,
166166
// - The repo is the organization (i.e. bootstrap-vue)
167-
ZEIT_GITHUB_REPO: process.env.NOW_GITHUB_REPO
167+
VERCEL_GITHUB_REPO: process.env.VERCEL_GITHUB_REPO || process.env.NOW_GITHUB_REPO
168168
},
169169

170170
build: {

‎now.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
"headers": [
33
{
44
"source": "/(.*)",
5-
"headers" : [
6-
{
7-
"key" : "X-Robots-Tag",
8-
"value" : ""
9-
}
10-
]
5+
"headers": [{ "key": "X-Robots-Tag", "value": "" }]
116
}
127
]
138
}

‎src/components/form-select/helpers/mixin-options.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import get from '../../../utils/get'
2-
import { isArray, isPlainObject, isUndefined } from '../../../utils/inspect'
2+
import { isNull, isPlainObject, isUndefined } from '../../../utils/inspect'
33
import formOptionsMixin from '../../../mixins/form-options'
44

55
// @vue/component
@@ -21,12 +21,12 @@ export default {
2121
if (isPlainObject(option)) {
2222
const value = get(option, this.valueField)
2323
const text = get(option, this.textField)
24-
const options = get(option, this.optionsField)
24+
const options = get(option, this.optionsField, null)
2525
// When it has options, create an `<optgroup>` object
26-
if (isArray(options)) {
26+
if (!isNull(options)) {
2727
return {
2828
label: String(get(option, this.labelField) || text),
29-
options
29+
options: this.normalizeOptions(options)
3030
}
3131
}
3232
// Otherwise create an `<option>` object

‎src/mixins/form-options.js‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,7 @@ export default {
3333
},
3434
computed: {
3535
formOptions() {
36-
const options = this.options
37-
// Normalize the given options array
38-
if (isArray(options)) {
39-
return options.map(option => this.normalizeOption(option))
40-
} else if (isPlainObject(options)) {
41-
// Deprecate the object options format
42-
warn(OPTIONS_OBJECT_DEPRECATED_MSG, this.$options.name)
43-
// Normalize a `options` object to an array of options
44-
return keys(options).map(key => this.normalizeOption(options[key] || {}, key))
45-
}
46-
// If not an array or object, return an empty array
47-
/* istanbul ignore next */
48-
return []
36+
return this.normalizeOptions(this.options)
4937
}
5038
},
5139
methods: {
@@ -67,6 +55,20 @@ export default {
6755
text: stripTags(String(option)),
6856
disabled: false
6957
}
58+
},
59+
normalizeOptions(options) {
60+
// Normalize the given options array
61+
if (isArray(options)) {
62+
return options.map(option => this.normalizeOption(option))
63+
} else if (isPlainObject(options)) {
64+
// Deprecate the object options format
65+
warn(OPTIONS_OBJECT_DEPRECATED_MSG, this.$options.name)
66+
// Normalize a `options` object to an array of options
67+
return keys(options).map(key => this.normalizeOption(options[key] || {}, key))
68+
}
69+
// If not an array or object, return an empty array
70+
/* istanbul ignore next */
71+
return []
7072
}
7173
}
7274
}

0 commit comments

Comments
 (0)