Skip to content

Commit bf2ff74

Browse files
jacobmllr95jacobmllr95
committed
fix: remove Netlify references
1 parent 711e4c6 commit bf2ff74

File tree

5 files changed

+8
-52
lines changed

5 files changed

+8
-52
lines changed

‎docs/components/footer.vue

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@
5353
Currently v{{ version }}. Code licensed
5454
<a href="https://github.com/bootstrap-vue/bootstrap-vue/blob/master/LICENSE" target="_blank">MIT</a>.
5555
Docs generated with
56-
<a href="https://nuxtjs.org/" target="_blank">Nuxt.js</a><template v-if="!isNetlify && !isVercel">.</template>
57-
<template v-if="isNetlify">
58-
and proudly hosted on <a href="https://www.netlify.com" target="_blank">Netlify</a>.
59-
</template>
56+
<a href="https://nuxtjs.org/" target="_blank">Nuxt.js</a><template v-if="!isVercel">.</template>
6057
<template v-else-if="isVercel">
6158
and proudly hosted on <a href="https://vercel.com/?utm_source=bootstrapvue" target="_blank">Vercel</a>.
6259
</template>
@@ -90,9 +87,6 @@ export default {
9087
return { version }
9188
},
9289
computed: {
93-
isNetlify() {
94-
return Boolean(process.env.NETLIFY)
95-
},
9690
isVercel() {
9791
return Boolean(process.env.VERCEL_NOW)
9892
}

‎docs/components/header.vue

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
>
5050
<template v-if="isPR || isDev || isLocal">
5151
<b-dropdown-item v-if="isPR" active href="/">
52-
Pull Request {{ prId ? '#' + prId : '- ' + branchName }}
52+
Pull Request - {{ branchName }}
5353
</b-dropdown-item>
5454
<b-dropdown-item v-else-if="isLocal" active href="/">
5555
Local copy
@@ -165,7 +165,7 @@
165165
</template>
166166

167167
<script>
168-
import { BASE_URL, BASE_URL_DEV, NETLIFY_URL } from '~/constants'
168+
import { BASE_URL, BASE_URL_DEV } from '~/constants'
169169
import { version } from '~/content'
170170
171171
export default {
@@ -181,44 +181,26 @@ export default {
181181
return BASE_URL
182182
},
183183
devURL() {
184-
if (this.isNetlify) {
185-
return NETLIFY_URL
186-
}
187184
return BASE_URL_DEV
188185
},
189-
isNetlify() {
190-
return Boolean(process.env.NETLIFY)
191-
},
192186
isVercel() {
193187
return Boolean(process.env.VERCEL_NOW)
194188
},
195189
branchName() {
196-
// Netlify doesn't support providing the branch name
197190
return this.isVercel ? process.env.VERCEL_BRANCH || '' : ''
198191
},
199192
isDev() {
200-
// In our case, `production` is the dev branch preview (Netlify)
201-
return (
202-
(this.isNetlify && process.env.NETLIFY_CONTEXT === 'production') ||
203-
(this.isVercel && this.branchName === 'dev')
204-
)
193+
// In our case, `production` is the dev branch preview (Vercel)
194+
return this.isVercel && this.branchName === 'dev'
205195
},
206196
isPR() {
207-
return (
208-
(this.isNetlify && process.env.PULL_REQUEST && process.env.REVIEW_ID) ||
209-
(this.isVercel && !this.isDev && this.branchName !== 'master')
210-
)
211-
},
212-
prId() {
213-
// Vercel doesn't currently support returning the PR number
214-
// `REVIEW_ID` is provided by Netlify
215-
return this.isPR ? process.env.REVIEW_ID : ''
197+
return this.isVercel && !this.isDev && this.branchName !== 'master'
216198
},
217199
dropdownText() {
218200
// Dropdown button text
219201
if (this.isPR) {
220202
// Vercel doesn't currently support returning the PR number
221-
return this.prId ? `Pull #${this.prId}` : 'Pull Request'
203+
return 'Pull Request'
222204
} else if (this.isLocal) {
223205
return 'Local Copy'
224206
} else if (this.isDev) {

‎docs/constants.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export const BASE_URL = 'https://bootstrap-vue.org'
22
export const BASE_URL_DEV = 'https://dev.bootstrap-vue.org'
3-
export const NETLIFY_URL = 'https://bootstrap-vue.netlify.app'
43

54
export const GA_TRACKING_ID = 'UA-89526435-1'
65

@@ -13,6 +12,3 @@ export const GWT_JS_ORG = 'H9Mn7ie5Z5KJSjRfsn9nilLn5kFgn7BMEqL_sUhVpzg'
1312
// *.bootstrap-vue.org
1413
// <meta name="google-site-verification" content="5E0vyG9CXTfY7McIt2aQppkNA6FQ3b0JJRZzhQ16HW4" />
1514
export const GWT_BV_ORG = '5E0vyG9CXTfY7McIt2aQppkNA6FQ3b0JJRZzhQ16HW4'
16-
// bootstrap-vue.netlify.app (legacy dev site)
17-
// <meta name="google-site-verification" content="Ba1MOy9bRa-r-8eLhSTEkayGbGrT3HhbNuqNiY60uzo" />
18-
export const GWT_BV_NETLIFY = 'Ba1MOy9bRa-r-8eLhSTEkayGbGrT3HhbNuqNiY60uzo'

‎docs/layouts/default.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BASE_URL, GWT_BV_ORG, GWT_JS_ORG, GWT_BV_NETLIFY } from '~/constants'
1+
import { BASE_URL, GWT_BV_ORG, GWT_JS_ORG } from '~/constants'
22
import Footer from '~/components/footer'
33
import Header from '~/components/header'
44

@@ -30,12 +30,6 @@ export default {
3030
hid: 'google-site-verification-js-org',
3131
name: 'google-site-verification',
3232
content: GWT_JS_ORG
33-
},
34-
// Add GWT site verification for bootstrap-vue.netlify.app (legacy)
35-
{
36-
hid: 'google-site-verification-netlify',
37-
name: 'google-site-verification',
38-
content: GWT_BV_NETLIFY
3933
}
4034
]
4135
}

‎docs/nuxt.config.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,6 @@ module.exports = {
149149
modern: 'client',
150150

151151
env: {
152-
// ENV vars provided by Netlify build:
153-
// - `true` if on Netlify (dev or PR)
154-
NETLIFY: process.env.NETLIFY,
155-
// Determines the context from netlify (`production`, `deploy-preview` or `branch-deploy`)
156-
// In our case, `production` means the dev branch (bootstrap-vue.netlify.com)
157-
NETLIFY_CONTEXT: process.env.NETLIFY ? process.env.CONTEXT : null,
158-
// - `true` if triggered by a Pull request commit
159-
PULL_REQUEST: process.env.NETLIFY ? process.env.PULL_REQUEST : null,
160-
// - If the previous is `true`, this will be the PR number
161-
REVIEW_ID: process.env.NETLIFY && process.env.PULL_REQUEST ? process.env.REVIEW_ID : null,
162152
// ENV vars provided by Vercel/Zeit Now build
163153
// https://zeit.co/docs/v2/build-step#system-environment-variables
164154
// - `true` if on Zeit Now (dev or PR)

0 commit comments

Comments
 (0)