Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(generator): add ignoreEnv generate option during ensureBuild(cmd) #8955

Merged
merged 5 commits into from May 26, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/cli/src/utils/generate.js
Expand Up @@ -89,7 +89,14 @@ export async function ensureBuild (cmd) {

// Quick diff
let needBuild = false
for (const field of ['nuxtVersion', 'ssr', 'target', 'env', 'process.env']) {

const fields = ['nuxtVersion', 'ssr', 'target']

if (nuxt.options.generate.ignoreEnv !== true) {
fields.push('env', 'process.env')
}

for (const field of fields) {
if (JSON.stringify(previousBuild[field]) !== JSON.stringify(currentBuild[field])) {
needBuild = true
consola.info(`Doing webpack rebuild because ${field} changed`)
Expand Down
@@ -0,0 +1,3 @@
import { buildFixture } from '../../utils/build'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might be missing something, but is this used to test the feature?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be fully honest I wasn't quite sure if this was the right way to test the feature using the suggested ignoreEnv option in nuxt.config.js.


buildFixture('full-static-with-ignore-env')
40 changes: 40 additions & 0 deletions test/fixtures/full-static-with-ignore-env/layouts/default.vue
@@ -0,0 +1,40 @@
<template>
<main>
<nav>
<NLink to="/">
Home
</NLink>
<NLink to="/store">
Store
</NLink>
<NLink to="/encoding/中文">
Encoding
</NLink>
<NLink to="/pagination/1">
Pagination
</NLink>
<NLink to="/dynamic/foo bar/#hash">
Dynamic route 1
</NLink>
<NLink to="/dynamic/foo%20bar">
Dynamic route 2
</NLink>
</nav>
<br>
<Nuxt />
</main>
</template>

<style scoped>
main {
margin: 1em 1em;
}

nav {
margin-bottom: 1em;
}

a {
margin-right: 1em;
}
</style>
30 changes: 30 additions & 0 deletions test/fixtures/full-static-with-ignore-env/nuxt.config.js
@@ -0,0 +1,30 @@
export default {
target: 'static',
export: {
payload: {
config: true
}
},
router: {
// base: '/test',
},
generate: {
ignoreEnv: true
},
foo: {
shell: process.env.SHELL
},
env: {
x: 123
},
hooks: {
export: {
before ({ setPayload }) {
setPayload({ shared: true })
},
route ({ route, setPayload }) {
setPayload({ myRoute: route })
}
}
}
}
10 changes: 10 additions & 0 deletions test/fixtures/full-static-with-ignore-env/pages/dynamic/_name.vue
@@ -0,0 +1,10 @@
<template>
<div>
Welcome {{ $route.params.name || 'nuxter' }}!
</div>
</template>

<script>
export default {
}
</script>
@@ -0,0 +1,5 @@
<template>
<div>
<h1>Encoded path</h1>
</div>
</template>
5 changes: 5 additions & 0 deletions test/fixtures/full-static-with-ignore-env/pages/index.vue
@@ -0,0 +1,5 @@
<template>
<div>
<h1>Full Static Playground!</h1>
</div>
</template>
21 changes: 21 additions & 0 deletions test/fixtures/full-static-with-ignore-env/pages/pagination/_i.vue
@@ -0,0 +1,21 @@
<template>
<div>
<NLink v-if="i>0" :to="`./${i-1}`">
Previous
</NLink>
Page {{ i }}
<NLink v-if="i<5" :to="`./${i+1}`">
Next
</NLink>
</div>
</template>

<script>
export default {
computed: {
i () {
return parseInt(this.$route.params.i) || 0
}
}
}
</script>
13 changes: 13 additions & 0 deletions test/fixtures/full-static-with-ignore-env/pages/payload.vue
@@ -0,0 +1,13 @@
<template>
<div v-text="JSON.stringify(payload)" />
</template>

<script>
export default {
asyncData ({ payload }) {
return {
payload
}
}
}
</script>
18 changes: 18 additions & 0 deletions test/fixtures/full-static-with-ignore-env/pages/store.vue
@@ -0,0 +1,18 @@
<template>
<div>
<h3>Welcome {{ $store.state.auth.user.name }}!</h3>
<br>
You visited this page <strong>{{ $store.state.counter }}</strong> times.
</div>
</template>

<script>
export default {
async asyncData ({ store }) {
await store.dispatch('auth/FETCH_USER')
},
fetch () {
this.$store.commit('COUNT')
}
}
</script>
17 changes: 17 additions & 0 deletions test/fixtures/full-static-with-ignore-env/store/auth.js
@@ -0,0 +1,17 @@
export const state = () => ({
user: null
})

export const mutations = {
SET_USER (state, user) {
state.user = user
}
}

export const actions = {
FETCH_USER ({ commit }) {
commit('SET_USER', {
name: (process.client ? 'C' : 'S') + ' Æ A-' + (10 + Math.round(Math.random() * 10))
})
}
}
9 changes: 9 additions & 0 deletions test/fixtures/full-static-with-ignore-env/store/index.js
@@ -0,0 +1,9 @@
export const state = () => ({
counter: 0
})

export const mutations = {
COUNT (state) {
state.counter += 1
}
}