feat(builder): followSymlinks option to allow for symlinks (#6368)

nuxt · Sep 29, 2019 · 92c7f4e · 92c7f4e
1 parent d1df5c8
commit 92c7f4e
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 2 deletions.
diff --git a/packages/builder/src/builder.js b/packages/builder/src/builder.js
@@ -310,7 +310,8 @@ export default class Builder {
   async resolveFiles (dir, cwd = this.options.srcDir) {
     return this.ignore.filter(await glob(this.globPathWithExtensions(dir), {
       cwd,
-      ignore: this.options.ignore
+      ignore: this.options.ignore,
+      follow: this.options.build.followSymlinks
     }))
   }
 

diff --git a/packages/config/src/config/build.js b/packages/config/src/config/build.js
@@ -118,5 +118,6 @@ export default () => ({
   },
   friendlyErrors: true,
   additionalExtensions: [],
-  warningIgnoreFilters: []
+  warningIgnoreFilters: [],
+  followSymlinks: false
 })
diff --git a/packages/config/test/__snapshots__/options.test.js.snap b/packages/config/test/__snapshots__/options.test.js.snap
@@ -39,6 +39,7 @@ Object {
       "img": [Function],
       "video": [Function],
     },
+    "followSymlinks": false,
     "friendlyErrors": true,
     "hardSource": false,
     "hotMiddleware": Object {},

diff --git a/packages/config/test/config/__snapshots__/index.test.js.snap b/packages/config/test/config/__snapshots__/index.test.js.snap
@@ -26,6 +26,7 @@ Object {
       "img": [Function],
       "video": [Function],
     },
+    "followSymlinks": false,
     "friendlyErrors": true,
     "hardSource": false,
     "hotMiddleware": Object {},
@@ -376,6 +377,7 @@ Object {
       "img": [Function],
       "video": [Function],
     },
+    "followSymlinks": false,
     "friendlyErrors": true,
     "hardSource": false,
     "hotMiddleware": Object {},

diff --git a/test/fixtures/basic/nuxt.config.js b/test/fixtures/basic/nuxt.config.js
@@ -77,6 +77,7 @@ export default {
   build: {
     scopeHoisting: true,
     publicPath: '',
+    followSymlinks: true,
     postcss: {
       preset: {
         features: {

diff --git a/test/fixtures/basic/pages/symlink/deep/nested-symlinked.vue b/test/fixtures/basic/pages/symlink/deep/nested-symlinked.vue
@@ -0,0 +1,3 @@
+<template>
+  <h1>Nested symlink page</h1>
+</template>
diff --git a/test/fixtures/basic/pages/symlink/symlinked.vue b/test/fixtures/basic/pages/symlink/symlinked.vue
@@ -0,0 +1,3 @@
+<template>
+  <h1>Symlinked page</h1>
+</template>
diff --git a/test/fixtures/basic/pages2/deep/nested-symlinked.vue b/test/fixtures/basic/pages2/deep/nested-symlinked.vue
@@ -0,0 +1,3 @@
+<template>
+  <h1>Nested symlink page</h1>
+</template>
diff --git a/test/fixtures/basic/pages2/symlinked.vue b/test/fixtures/basic/pages2/symlinked.vue
@@ -0,0 +1,3 @@
+<template>
+  <h1>Symlinked page</h1>
+</template>
diff --git a/test/unit/basic.ssr.test.js b/test/unit/basic.ssr.test.js
@@ -358,6 +358,16 @@ describe('basic ssr', () => {
     expect(html).toMatch('<h1>JS Layout</h1>')
     expect(html).toMatch('<h2>custom page</h2>')
   })
+  /* Testing symlinks functionality */
+  test('/symlink/symlinked', async () => {
+    const { html } = await nuxt.server.renderRoute('/symlink/symlinked')
+    expect(html).toContain('<h1>Symlinked page</h1>')
+  })
+
+  test('/symlink/deep/nested-symlinked', async () => {
+    const { html } = await nuxt.server.renderRoute('/symlink/deep/nested-symlinked')
+    expect(html).toContain('<h1>Nested symlink page</h1>')
+  })
 
   // Close server and ask nuxt to stop listening to file changes
   afterAll(async () => {