diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000..1ad899dbcd Binary files /dev/null and b/.DS_Store differ diff --git a/test/fixtures/module/modules/basic/index.js b/test/fixtures/module/modules/basic/index.js index 864007865b..2604ae1327 100755 --- a/test/fixtures/module/modules/basic/index.js +++ b/test/fixtures/module/modules/basic/index.js @@ -23,8 +23,8 @@ module.exports = function basicModule (options, resolve) { }) // Require same module twice - this.requireModule('~/modules/empty/index.js') - this.requireModule('~/modules/empty/index.js') + this.requireModule('@/modules/empty/index.js') + this.requireModule('@/modules/empty/index.js') resolve() } diff --git a/test/fixtures/module/modules/middleware/index.js b/test/fixtures/module/modules/middleware/index.js index d8e21640ab..d97c71cbef 100755 --- a/test/fixtures/module/modules/middleware/index.js +++ b/test/fixtures/module/modules/middleware/index.js @@ -9,14 +9,14 @@ module.exports = function middlewareModule (options) { } }) // Add local middleware js - this.addServerMiddleware('~/modules/middleware/log.js') + this.addServerMiddleware('@modules/middleware/log.js') // Add plain middleware this.addServerMiddleware((req, res, next) => { res.setHeader('x-nuxt', 'hello') next() }) // Add file middleware - this.addServerMiddleware('~/modules/middleware/midd1') + this.addServerMiddleware('@modules/middleware/midd1') resolve() }) } diff --git a/test/fixtures/module/modules/template/index.js b/test/fixtures/module/modules/template/index.js index 4a2d917897..d68d9546a8 100644 --- a/test/fixtures/module/modules/template/index.js +++ b/test/fixtures/module/modules/template/index.js @@ -1,11 +1,11 @@ const path = require('path') module.exports = function () { - // Disable parsing pages/ - this.nuxt.options.build.createRoutes = () => {} - // Add /api endpoint - this.addTemplate({ - fileName: 'router.js', - src: path.resolve(this.options.srcDir, 'router.js') - }) + // Disable parsing pages/ + this.nuxt.options.build.createRoutes = () => {} + // Add /api endpoint + this.addTemplate({ + fileName: 'router.js', + src: path.resolve(this.options.srcDir, 'router.js') + }) } diff --git a/test/fixtures/module/nuxt.config.js b/test/fixtures/module/nuxt.config.js index 19e591d11d..78090df4ee 100755 --- a/test/fixtures/module/nuxt.config.js +++ b/test/fixtures/module/nuxt.config.js @@ -1,9 +1,9 @@ module.exports = { loading: true, modules: [ - '~modules/basic', + '~modules/basic', // Use ~ for deprication warning coverage { - src: '~/modules/middleware', + src: '@/modules/middleware', options: { foo: 'bar' } diff --git a/test/fixtures/module/router.js b/test/fixtures/module/router.js index 629c9d4ffc..810cb67757 100644 --- a/test/fixtures/module/router.js +++ b/test/fixtures/module/router.js @@ -7,16 +7,16 @@ export function createRouter () { return new Router({ mode: 'history', routes: [ - { - path: "/", - component: require('~/views/index.vue'), - name: "index" - }, - { - path: "/about", - component: require('~/views/about.vue'), - name: "about" - } + { + path: '/', + component: require('~/views/index.vue'), + name: 'index' + }, + { + path: '/about', + component: require('~/views/about.vue'), + name: 'about' + } ] }) } diff --git a/test/fixtures/with-config/nuxt.config.js b/test/fixtures/with-config/nuxt.config.js index 14a13a92b8..cfff7aaa2e 100644 --- a/test/fixtures/with-config/nuxt.config.js +++ b/test/fixtures/with-config/nuxt.config.js @@ -7,18 +7,17 @@ module.exports = { routes.push({ name: 'about-bis', path: '/about-bis', - component: '~pages/about.vue' + component: '@pages/about.vue' }) } }, transition: 'test', offline: true, plugins: [ - '~plugins/test.js', - { src: '~plugins/offline.js', ssr: false }, - { src: '~plugins/only-client.js', ssr: false } + '~plugins/test.js', // Use ~ for deprication warning coverage + { src: '@plugins/only-client.js', ssr: false } ], - loading: '~components/loading', + loading: '@components/loading', env: { bool: true, num: 23, @@ -36,7 +35,7 @@ module.exports = { } }, css: [ - { src: '~/assets/app.css' } + { src: '@assets/app.css' } ], render: { http2: { diff --git a/test/fixtures/with-config/plugins/offline.js b/test/fixtures/with-config/plugins/offline.js deleted file mode 100644 index bfccf62930..0000000000 --- a/test/fixtures/with-config/plugins/offline.js +++ /dev/null @@ -1,4 +0,0 @@ -if (process.env.NODE_ENV === 'production') { - var OfflinePlugin = require('offline-plugin/runtime') - OfflinePlugin.install() -}