From ff7c083dda3158ff8b1e0bc4868e64dede9f0313 Mon Sep 17 00:00:00 2001 From: Clark Du Date: Thu, 22 Nov 2018 15:48:26 +0000 Subject: [PATCH 01/22] fix: modern=true or false not work as expected (#4378) --- packages/cli/src/commands/generate.js | 3 ++- packages/cli/src/options/common.js | 4 ++- packages/cli/src/utils/index.js | 18 +++++++++++++ packages/cli/test/unit/build.test.js | 35 +++++++++++++++++++++++++ packages/cli/test/unit/generate.test.js | 32 ++++++++++++++++++++++ packages/cli/test/unit/utils.test.js | 10 +++++++ 6 files changed, 100 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/commands/generate.js b/packages/cli/src/commands/generate.js index d727174e74..2632b59434 100644 --- a/packages/cli/src/commands/generate.js +++ b/packages/cli/src/commands/generate.js @@ -1,5 +1,6 @@ import consola from 'consola' import { common } from '../options' +import { normalizeArg } from '../utils' export default { name: 'generate', @@ -16,7 +17,7 @@ export default { ...common.modern, description: 'Generate app in modern build (modern mode can be only client)', prepare(cmd, options, argv) { - if (argv.modern !== undefined) { + if (normalizeArg(argv.modern)) { options.modern = 'client' } } diff --git a/packages/cli/src/options/common.js b/packages/cli/src/options/common.js index 28f66061b1..bab7c20c24 100644 --- a/packages/cli/src/options/common.js +++ b/packages/cli/src/options/common.js @@ -1,3 +1,5 @@ +import { normalizeArg } from '../utils' + export default { spa: { alias: 's', @@ -21,7 +23,7 @@ export default { description: 'Build/Start app for modern browsers, e.g. server, client and false', prepare(cmd, options, argv) { if (argv.modern !== undefined) { - options.modern = argv.modern || true + options.modern = normalizeArg(argv.modern) } } }, diff --git a/packages/cli/src/utils/index.js b/packages/cli/src/utils/index.js index b3786a6f14..5a1eca0f5e 100644 --- a/packages/cli/src/utils/index.js +++ b/packages/cli/src/utils/index.js @@ -110,3 +110,21 @@ export function showBanner(nuxt) { process.stdout.write(box + '\n') } + +/** + * Normalize string argument in command + * + * @export + * @param {String} argument + * @param {*} defaultValue + * @returns formatted argument + */ +export function normalizeArg(arg, defaultValue) { + switch (arg) { + case 'true': arg = true; break + case '': arg = true; break + case 'false': arg = false; break + case undefined: arg = defaultValue; break + } + return arg +} diff --git a/packages/cli/test/unit/build.test.js b/packages/cli/test/unit/build.test.js index 1ebc3ea7b4..924fb32016 100644 --- a/packages/cli/test/unit/build.test.js +++ b/packages/cli/test/unit/build.test.js @@ -44,6 +44,41 @@ describe('build', () => { expect(process.exit).toHaveBeenCalled() }) + test('build with devtools', async () => { + mockGetNuxt({ + mode: 'universal' + }) + const builder = mockGetBuilder(Promise.resolve()) + + const cmd = NuxtCommand.from(build) + const args = ['build', '.', '--devtools'] + const argv = cmd.getArgv(args) + argv._ = ['.'] + + const options = await cmd.getNuxtConfig(argv) + + await cmd.run() + + expect(options.vue.config.devtools).toBe(true) + expect(builder).toHaveBeenCalled() + }) + + test('build with modern mode', async () => { + mockGetNuxt({ + mode: 'universal' + }) + mockGetBuilder(Promise.resolve()) + + const cmd = NuxtCommand.from(build) + const args = ['build', '.', '--m'] + + const options = await cmd.getNuxtConfig(cmd.getArgv(args)) + + await cmd.run() + + expect(options.modern).toBe(true) + }) + test('catches error', async () => { mockGetNuxt({ mode: 'universal' }) mockGetBuilder(Promise.reject(new Error('Builder Error'))) diff --git a/packages/cli/test/unit/generate.test.js b/packages/cli/test/unit/generate.test.js index 4e4cd9bfee..9c17b35c78 100644 --- a/packages/cli/test/unit/generate.test.js +++ b/packages/cli/test/unit/generate.test.js @@ -46,6 +46,38 @@ describe('generate', () => { Command.prototype.getArgv = getArgv }) + test('build with devtools', async () => { + mockGetNuxt() + const generator = mockGetGenerator(Promise.resolve()) + + const cmd = NuxtCommand.from(generate) + const args = ['generate', '.', '--devtools'] + const argv = cmd.getArgv(args) + argv._ = ['.'] + + const options = await cmd.getNuxtConfig(argv) + + await cmd.run() + + expect(options.vue.config.devtools).toBe(true) + expect(generator).toHaveBeenCalled() + expect(generator.mock.calls[0][0].build).toBe(true) + }) + + test('generate with modern mode', async () => { + mockGetNuxt() + mockGetGenerator(Promise.resolve()) + + const cmd = NuxtCommand.from(generate) + const args = ['generate', '.', '--m'] + + const options = await cmd.getNuxtConfig(cmd.getArgv(args)) + + await cmd.run() + + expect(options.modern).toBe('client') + }) + test('catches error', async () => { mockGetNuxt() mockGetGenerator(Promise.reject(new Error('Generator Error'))) diff --git a/packages/cli/test/unit/utils.test.js b/packages/cli/test/unit/utils.test.js index 630add5bad..2e5476727d 100644 --- a/packages/cli/test/unit/utils.test.js +++ b/packages/cli/test/unit/utils.test.js @@ -81,6 +81,16 @@ describe('cli/utils', () => { expect(consola.fatal).toHaveBeenCalledWith('Error while fetching async configuration') }) + test('normalizeArg: normalize string argument in command', () => { + expect(utils.normalizeArg('true')).toBe(true) + expect(utils.normalizeArg('false')).toBe(false) + expect(utils.normalizeArg(true)).toBe(true) + expect(utils.normalizeArg(false)).toBe(false) + expect(utils.normalizeArg('')).toBe(true) + expect(utils.normalizeArg(undefined, 'default')).toBe('default') + expect(utils.normalizeArg('text')).toBe('text') + }) + test('nuxtServerConfig: server env', () => { const options = getDefaultNuxtConfig({ env: { From 47f02ae5ca15a486635b15488af70412e7ebda0c Mon Sep 17 00:00:00 2001 From: Clark Du Date: Fri, 23 Nov 2018 22:34:05 +0000 Subject: [PATCH 02/22] fix: empty error message in dev mode --- packages/webpack/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 1bf66f25a5..4f672544bc 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -12,7 +12,7 @@ "@babel/polyfill": "^7.0.0", "@nuxt/babel-preset-app": "2.3.2", "@nuxt/common": "2.3.2", - "@nuxt/friendly-errors-webpack-plugin": "^2.3.0", + "@nuxt/friendly-errors-webpack-plugin": "^2.3.2", "babel-loader": "^8.0.4", "cache-loader": "^1.2.5", "caniuse-lite": "^1.0.30000909", diff --git a/yarn.lock b/yarn.lock index f58bdbf4fd..e61724d1f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1248,10 +1248,10 @@ resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@nuxt/friendly-errors-webpack-plugin@^2.3.0": - version "2.3.0" - resolved "https://registry.npmjs.org/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.3.0.tgz#c013eb46282c8d87975a8f67bcba7e8ad5d2d571" - integrity sha512-/mQlJkyu90nsu1BbdHQYk7d9CEFbKphHP3HiKn+u45MMyjvfmasO9FS0TbwEBJSbBBr5DsdaowihOSfGzMPBKQ== +"@nuxt/friendly-errors-webpack-plugin@^2.3.2": + version "2.3.2" + resolved "https://registry.npmjs.org/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.3.2.tgz#eb2c49b99d4f09ebdd635410b669b0700c2746f3" + integrity sha512-88sAXalIhbnUkeKekA9pebrvk37/daN2qFMmv/234yHa1f033mSb/D2gDfOFzJFZokNRY8CG/yS9KHqAjj2IfA== dependencies: chalk "^2.3.2" consola "^2.0.0-1" From 54d273720c9454991d16a73311c5b03303a6a4a2 Mon Sep 17 00:00:00 2001 From: Clark Du Date: Sat, 24 Nov 2018 00:02:13 +0000 Subject: [PATCH 03/22] fix: router Expected "0" to be defined (#4394) --- packages/vue-app/template/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-app/template/utils.js b/packages/vue-app/template/utils.js index 93b9783ae5..91afe358cc 100644 --- a/packages/vue-app/template/utils.js +++ b/packages/vue-app/template/utils.js @@ -434,7 +434,7 @@ function tokensToFunction(tokens) { continue } - const value = data[token.name] + const value = data[token.name || 'pathMatch'] let segment if (value == null) { From 8030ca1a3d01f401e77338ad5173acad76773c14 Mon Sep 17 00:00:00 2001 From: Alexander Lichter Date: Sat, 24 Nov 2018 18:30:28 +0000 Subject: [PATCH 04/22] fix(progress-bar): allow 0 for values and remove duplicate defaults (#4397) --- packages/vue-app/template/components/nuxt-loading.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/vue-app/template/components/nuxt-loading.vue b/packages/vue-app/template/components/nuxt-loading.vue index a6d69a4e1f..72e8d29850 100644 --- a/packages/vue-app/template/components/nuxt-loading.vue +++ b/packages/vue-app/template/components/nuxt-loading.vue @@ -8,10 +8,10 @@ export default { canSucceed: true, reversed: false, skipTimerCount: 0, - rtl: <%= loading.rtl || false %>, - throttle: <%= loading.throttle || 200 %>, - duration: <%= loading.duration || 3000 %>, - continuous: <%= loading.continuous || false %> + rtl: <%= Boolean(loading.rtl) %>, + throttle: <%= Number(loading.throttle) ? loading.throttle : 200 %>, + duration: <%= Number(loading.duration) ? loading.duration : 3000 %>, + continuous: <%= Boolean(loading.continuous) %> } }, computed: { From 0c6c69b011abb3ae7d7b0ecbae722d12566db7c2 Mon Sep 17 00:00:00 2001 From: Alexander Lichter Date: Sat, 24 Nov 2018 21:35:43 +0000 Subject: [PATCH 05/22] fix(scrollBehavior): emit triggerScroll event after changing layer (#4399) resolves: #4080 --- packages/vue-app/template/App.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/vue-app/template/App.js b/packages/vue-app/template/App.js index f67601cfe4..b79fac1772 100644 --- a/packages/vue-app/template/App.js +++ b/packages/vue-app/template/App.js @@ -34,6 +34,14 @@ export default { props: { name: '<%= layoutTransition.name %>', mode: '<%= layoutTransition.mode %>' + }, + on: { + beforeEnter(el) { + // Ensure to trigger scroll event after calling scrollBehavior + window.<%= globals.nuxt %>.$nextTick(() => { + window.<%= globals.nuxt %>.$emit('triggerScroll') + }) + } } }, [ templateEl ]) From e1c1240b8d0c3211b2b3927920c42693037814e9 Mon Sep 17 00:00:00 2001 From: Alexander Lichter Date: Sun, 25 Nov 2018 14:51:32 +0000 Subject: [PATCH 06/22] fix(server, jsdom): fix timeout error message (#4412) [skip release] --- packages/server/src/jsdom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/jsdom.js b/packages/server/src/jsdom.js index 41410325eb..c632cbbdfa 100644 --- a/packages/server/src/jsdom.js +++ b/packages/server/src/jsdom.js @@ -63,7 +63,7 @@ export default async function renderAndGetWindow( // Used by Nuxt.js to say when the components are loaded and the app ready await timeout(new Promise((resolve) => { window[loadedCallback] = () => resolve(window) - }), loadingTimeout, `Components loading in renderAndGetWindow was not completed in ${timeout / 1000}s`) + }), loadingTimeout, `Components loading in renderAndGetWindow was not completed in ${loadingTimeout / 1000}s`) if (options.virtualConsole) { // After window initialized successfully From d1877935a3ebd8324f782ab3db240a12d1e9ad36 Mon Sep 17 00:00:00 2001 From: Dmitry Molotkov Date: Sun, 25 Nov 2018 17:52:37 +0300 Subject: [PATCH 07/22] fix(server, vue-app): allow unicode page names (#4402) --- packages/server/src/middleware/nuxt.js | 11 ++++++----- packages/vue-app/package.json | 1 + packages/vue-app/template/utils.js | 2 +- test/fixtures/basic/nuxt.config.js | 1 + test/fixtures/basic/pages/тест雨.vue | 3 +++ test/fixtures/spa/pages/тест雨.vue | 11 +++++++++++ test/unit/basic.generate.test.js | 6 ++++++ test/unit/basic.ssr.test.js | 5 +++++ test/unit/spa.test.js | 7 +++++++ 9 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 test/fixtures/basic/pages/тест雨.vue create mode 100644 test/fixtures/spa/pages/тест雨.vue diff --git a/packages/server/src/middleware/nuxt.js b/packages/server/src/middleware/nuxt.js index 5d1b42333f..8908301d37 100644 --- a/packages/server/src/middleware/nuxt.js +++ b/packages/server/src/middleware/nuxt.js @@ -7,11 +7,12 @@ import { getContext } from '@nuxt/common' export default ({ options, nuxt, renderRoute, resources }) => async function nuxtMiddleware(req, res, next) { // Get context const context = getContext(req, res) + const url = req.url res.statusCode = 200 try { - const result = await renderRoute(req.url, context) - await nuxt.callHook('render:route', req.url, result, context) + const result = await renderRoute(url, context) + await nuxt.callHook('render:route', url, result, context) const { html, cspScriptSrcHashSet, @@ -21,7 +22,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux } = result if (redirected) { - nuxt.callHook('render:routeDone', req.url, result, context) + nuxt.callHook('render:routeDone', url, result, context) return html } if (error) { @@ -34,7 +35,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux if (fresh(req.headers, { etag })) { res.statusCode = 304 res.end() - nuxt.callHook('render:routeDone', req.url, result, context) + nuxt.callHook('render:routeDone', url, result, context) return } res.setHeader('ETag', etag) @@ -73,7 +74,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux res.setHeader('Accept-Ranges', 'none') // #3870 res.setHeader('Content-Length', Buffer.byteLength(html)) res.end(html, 'utf8') - nuxt.callHook('render:routeDone', req.url, result, context) + nuxt.callHook('render:routeDone', url, result, context) return html } catch (err) { /* istanbul ignore if */ diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json index 84e1762ce4..3b807b28de 100644 --- a/packages/vue-app/package.json +++ b/packages/vue-app/package.json @@ -8,6 +8,7 @@ "template" ], "main": "dist/vue-app.js", + "typings": "types/index.d.ts", "publishConfig": { "access": "public" }, diff --git a/packages/vue-app/template/utils.js b/packages/vue-app/template/utils.js index 91afe358cc..066400915c 100644 --- a/packages/vue-app/template/utils.js +++ b/packages/vue-app/template/utils.js @@ -242,7 +242,7 @@ export function getLocation(base, mode) { if (base && path.indexOf(base) === 0) { path = path.slice(base.length) } - return (path || '/') + window.location.search + window.location.hash + return decodeURI(path || '/') + window.location.search + window.location.hash } export function urlJoin() { diff --git a/test/fixtures/basic/nuxt.config.js b/test/fixtures/basic/nuxt.config.js index cc38d9f604..0e6f38f8a7 100644 --- a/test/fixtures/basic/nuxt.config.js +++ b/test/fixtures/basic/nuxt.config.js @@ -31,6 +31,7 @@ export default { '/store-module', '/users/1', '/users/2', + '/тест雨', { route: '/users/3', payload: { id: 3000 } } ], interval: 200, diff --git a/test/fixtures/basic/pages/тест雨.vue b/test/fixtures/basic/pages/тест雨.vue new file mode 100644 index 0000000000..b7953cf6c7 --- /dev/null +++ b/test/fixtures/basic/pages/тест雨.vue @@ -0,0 +1,3 @@ + diff --git a/test/fixtures/spa/pages/тест雨.vue b/test/fixtures/spa/pages/тест雨.vue new file mode 100644 index 0000000000..59fd89fa42 --- /dev/null +++ b/test/fixtures/spa/pages/тест雨.vue @@ -0,0 +1,11 @@ + + diff --git a/test/unit/basic.generate.test.js b/test/unit/basic.generate.test.js index 36d77ff537..89ed0ec7f6 100644 --- a/test/unit/basic.generate.test.js +++ b/test/unit/basic.generate.test.js @@ -129,6 +129,12 @@ describe('basic generate', () => { expect(html).toContain('

Nuxt.js

') }) + test('/тест雨 (test non ascii route)', async () => { + const window = await generator.nuxt.server.renderAndGetWindow(url('/тест雨')) + const html = window.document.body.innerHTML + expect(html).toContain('Hello unicode') + }) + test('/users/1/index.html', async () => { const html = await rp(url('/users/1/index.html')) expect(html).toContain('

User: 1

') diff --git a/test/unit/basic.ssr.test.js b/test/unit/basic.ssr.test.js index 665ef19fbc..3e21a1fa2f 100644 --- a/test/unit/basic.ssr.test.js +++ b/test/unit/basic.ssr.test.js @@ -314,6 +314,11 @@ describe('basic ssr', () => { expect(html).toContain('

vue file is first-class

') }) + test('/тест雨 (test non ascii route)', async () => { + const { html } = await nuxt.server.renderRoute('/тест雨') + expect(html).toMatch('Hello unicode') + }) + // Close server and ask nuxt to stop listening to file changes afterAll(async () => { await nuxt.close() diff --git a/test/unit/spa.test.js b/test/unit/spa.test.js index 41dfa70b41..e021f61986 100644 --- a/test/unit/spa.test.js +++ b/test/unit/spa.test.js @@ -60,6 +60,13 @@ describe('spa', () => { expect(html).toMatch('error handler triggered: asyncData error!') }) + test('/тест雨 (test non ascii route)', async () => { + const { html } = await renderRoute('/тест雨') + expect(html).toMatch('Hello unicode SPA!') + expect(consola.log).not.toHaveBeenCalledWith('created') + expect(consola.log).toHaveBeenCalledWith('mounted') + consola.log.mockClear() + }) // Close server and ask nuxt to stop listening to file changes afterAll(async () => { await nuxt.close() From 4a85c0311f9b3e2cccc6e9096e33f6bc01fb6604 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Sun, 25 Nov 2018 22:46:19 +0330 Subject: [PATCH 08/22] fix(pkg): move opencollective dependency nuxt and nuxt-legacy (#4415) --- distributions/nuxt-legacy/package.json | 3 ++- distributions/nuxt/package.json | 3 ++- packages/core/package.json | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/distributions/nuxt-legacy/package.json b/distributions/nuxt-legacy/package.json index 14dabaf55f..af28fded58 100644 --- a/distributions/nuxt-legacy/package.json +++ b/distributions/nuxt-legacy/package.json @@ -53,7 +53,8 @@ "@nuxt/common": "2.3.2", "@nuxt/core": "2.3.2", "@nuxt/generator": "2.3.2", - "@nuxt/webpack": "2.3.2" + "@nuxt/webpack": "2.3.2", + "@nuxtjs/opencollective": "^0.1.0" }, "engines": { "node": ">=6.0.0", diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json index a4985e3310..8be673221d 100644 --- a/distributions/nuxt/package.json +++ b/distributions/nuxt/package.json @@ -53,7 +53,8 @@ "@nuxt/common": "2.3.2", "@nuxt/core": "2.3.2", "@nuxt/generator": "2.3.2", - "@nuxt/webpack": "2.3.2" + "@nuxt/webpack": "2.3.2", + "@nuxtjs/opencollective": "^0.1.0" }, "engines": { "node": ">=8.0.0", diff --git a/packages/core/package.json b/packages/core/package.json index e9e6a27c07..097b8b2d15 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -13,7 +13,6 @@ "@nuxt/server": "2.3.2", "@nuxt/vue-renderer": "2.3.2", "@nuxtjs/devalue": "^1.1.0", - "@nuxtjs/opencollective": "^0.1.0", "consola": "^2.3.0", "debug": "^4.1.0", "esm": "^3.0.84", From 7e1beed9b8688871304c3f4caadb922747b2601a Mon Sep 17 00:00:00 2001 From: Dmitry Molotkov Date: Sun, 25 Nov 2018 17:48:13 +0300 Subject: [PATCH 09/22] perf(pkg): remove lodash dependency from packages (#4411) --- packages/common/package.json | 3 +-- packages/config/package.json | 1 - packages/core/package.json | 1 - packages/webpack/package.json | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 5e1c56fe87..2b307cbbe4 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -8,8 +8,7 @@ ], "main": "dist/common.js", "dependencies": { - "consola": "^2.3.0", - "lodash": "^4.17.11" + "consola": "^2.3.0" }, "publishConfig": { "access": "public" diff --git a/packages/config/package.json b/packages/config/package.json index d6c5547a77..5ff6718b4a 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -10,7 +10,6 @@ "dependencies": { "@nuxt/common": "2.3.2", "consola": "^2.3.0", - "lodash": "^4.17.11", "std-env": "^2.2.1" }, "publishConfig": { diff --git a/packages/core/package.json b/packages/core/package.json index 097b8b2d15..134f8186ce 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -18,7 +18,6 @@ "esm": "^3.0.84", "fs-extra": "^7.0.1", "hash-sum": "^1.0.2", - "lodash": "^4.17.11", "std-env": "^2.2.1" }, "publishConfig": { diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 4f672544bc..fd2dc13216 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -25,7 +25,6 @@ "glob": "^7.1.3", "hash-sum": "^1.0.2", "html-webpack-plugin": "^3.2.0", - "lodash": "^4.17.11", "memory-fs": "^0.4.1", "mini-css-extract-plugin": "^0.4.4", "optimize-css-assets-webpack-plugin": "^5.0.1", From 289d30f836acc78a7fddbfa08e956cfe8603319b Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 19:55:51 +0330 Subject: [PATCH 10/22] remove typings --- packages/vue-app/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json index 3b807b28de..84e1762ce4 100644 --- a/packages/vue-app/package.json +++ b/packages/vue-app/package.json @@ -8,7 +8,6 @@ "template" ], "main": "dist/vue-app.js", - "typings": "types/index.d.ts", "publishConfig": { "access": "public" }, From b582e706fc249dea092360a87f0f1238d0c56506 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 19:58:34 +0330 Subject: [PATCH 11/22] update patch-only dependencies --- packages/vue-renderer/package.json | 2 +- packages/webpack/package.json | 6 +++--- yarn.lock | 32 +++++++++++++++--------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json index 9e0913336c..8df0aa7d5e 100644 --- a/packages/vue-renderer/package.json +++ b/packages/vue-renderer/package.json @@ -16,7 +16,7 @@ "vue": "^2.5.17", "vue-meta": "^1.5.5", "vue-no-ssr": "^1.1.0", - "vue-router": "^3.0.1", + "vue-router": "^3.0.2", "vue-server-renderer": "^2.5.17", "vue-template-compiler": "^2.5.17", "vuex": "^3.0.1" diff --git a/packages/webpack/package.json b/packages/webpack/package.json index fd2dc13216..b045fc52ca 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -15,7 +15,7 @@ "@nuxt/friendly-errors-webpack-plugin": "^2.3.2", "babel-loader": "^8.0.4", "cache-loader": "^1.2.5", - "caniuse-lite": "^1.0.30000909", + "caniuse-lite": "^1.0.30000910", "chalk": "^2.4.1", "consola": "^2.3.0", "css-loader": "^1.0.1", @@ -26,7 +26,7 @@ "hash-sum": "^1.0.2", "html-webpack-plugin": "^3.2.0", "memory-fs": "^0.4.1", - "mini-css-extract-plugin": "^0.4.4", + "mini-css-extract-plugin": "^0.4.5", "optimize-css-assets-webpack-plugin": "^5.0.1", "pify": "^4.0.1", "postcss": "^7.0.6", @@ -42,7 +42,7 @@ "time-fix-plugin": "^2.0.5", "url-loader": "^1.1.2", "vue-loader": "^15.4.2", - "webpack": "^4.26.0", + "webpack": "^4.26.1", "webpack-bundle-analyzer": "^3.0.3", "webpack-dev-middleware": "^3.4.0", "webpack-hot-middleware": "^2.24.3", diff --git a/yarn.lock b/yarn.lock index e61724d1f8..f9037891fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2545,10 +2545,10 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899, can resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000907.tgz#0b9899bde53fb1c30e214fb12402361e02ff5c42" integrity sha512-No5sQ/OB2Nmka8MNOOM6nJx+Hxt6MQ6h7t7kgJFu9oTuwjykyKRSBP/+i/QAyFHxeHB+ddE0Da1CG5ihx9oehQ== -caniuse-lite@^1.0.30000909: - version "1.0.30000909" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000909.tgz#697e8f447ca5f758e7c6cef39ec429ce18b908d3" - integrity sha512-4Ix9ArKpo3s/dLGVn/el9SAk6Vn2kGhg8XeE4eRTsGEsmm9RnTkwnBsVZs7p4wA8gB+nsgP36vZWYbG8a4nYrg== +caniuse-lite@^1.0.30000910: + version "1.0.30000910" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000910.tgz#755d5181d4b006e5a2b59b1ffa05d0a0470039f5" + integrity sha512-u/nxtHGAzCGZzIxt3dA/tpSPOcirBZFWKwz1EPz4aaupnBI2XR0Rbr74g0zc6Hzy41OEM4uMoZ38k56TpYAWjQ== capture-exit@^1.2.0: version "1.2.0" @@ -6917,10 +6917,10 @@ mimic-fn@^1.0.0: resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -mini-css-extract-plugin@^0.4.4: - version "0.4.4" - resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d" - integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ== +mini-css-extract-plugin@^0.4.5: + version "0.4.5" + resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz#c99e9e78d54f3fa775633aee5933aeaa4e80719a" + integrity sha512-dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w== dependencies: loader-utils "^1.1.0" schema-utils "^1.0.0" @@ -10812,10 +10812,10 @@ vue-no-ssr@^1.1.0: resolved "https://registry.npmjs.org/vue-no-ssr/-/vue-no-ssr-1.1.0.tgz#b323807112f676324d9d7cfde85d7831ced11dd9" integrity sha512-prJ9czuPrVu0GhUZKTS/epFfM15QjLuG6wt61g0nyixPXk0g6eY7wNF4RKIqJsxomOiuSYTv3Zo8A43Vi93xfw== -vue-router@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz#d9b05ad9c7420ba0f626d6500d693e60092cc1e9" - integrity sha512-vLLoY452L+JBpALMP5UHum9+7nzR9PeIBCghU9ZtJ1eWm6ieUI8Zb/DI3MYxH32bxkjzYV1LRjNv4qr8d+uX/w== +vue-router@^3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be" + integrity sha512-opKtsxjp9eOcFWdp6xLQPLmRGgfM932Tl56U9chYTnoWqKxQ8M20N7AkdEbM5beUh6wICoFGYugAX9vQjyJLFg== vue-server-renderer@^2.5.17: version "2.5.17" @@ -10973,10 +10973,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.26.0: - version "4.26.0" - resolved "https://registry.npmjs.org/webpack/-/webpack-4.26.0.tgz#adbe80b869148c8d108b7d88965d00d72b3178de" - integrity sha512-J/dP9SJIc5OtX2FZ/+U9ikQtd6H6Mcbqt0xeXtmPwYGDKf8nkbOQQA9KL2Y0rJOsN1Al9Pdn+/j63X58ub8gvQ== +webpack@^4.26.1: + version "4.26.1" + resolved "https://registry.npmjs.org/webpack/-/webpack-4.26.1.tgz#ff3a9283d363c07b3494dfa702d08f4f2ef6cb39" + integrity sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug== dependencies: "@webassemblyjs/ast" "1.7.11" "@webassemblyjs/helper-module-context" "1.7.11" From b7285fe8f3c3370f1868b923994790edb33e3868 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 20:05:18 +0330 Subject: [PATCH 12/22] remove build with devtools tests as feature is not merged yet --- packages/cli/test/unit/build.test.js | 19 ------------------- packages/cli/test/unit/generate.test.js | 18 ------------------ 2 files changed, 37 deletions(-) diff --git a/packages/cli/test/unit/build.test.js b/packages/cli/test/unit/build.test.js index 924fb32016..09d51058c1 100644 --- a/packages/cli/test/unit/build.test.js +++ b/packages/cli/test/unit/build.test.js @@ -44,25 +44,6 @@ describe('build', () => { expect(process.exit).toHaveBeenCalled() }) - test('build with devtools', async () => { - mockGetNuxt({ - mode: 'universal' - }) - const builder = mockGetBuilder(Promise.resolve()) - - const cmd = NuxtCommand.from(build) - const args = ['build', '.', '--devtools'] - const argv = cmd.getArgv(args) - argv._ = ['.'] - - const options = await cmd.getNuxtConfig(argv) - - await cmd.run() - - expect(options.vue.config.devtools).toBe(true) - expect(builder).toHaveBeenCalled() - }) - test('build with modern mode', async () => { mockGetNuxt({ mode: 'universal' diff --git a/packages/cli/test/unit/generate.test.js b/packages/cli/test/unit/generate.test.js index 9c17b35c78..5e57bfa84d 100644 --- a/packages/cli/test/unit/generate.test.js +++ b/packages/cli/test/unit/generate.test.js @@ -46,24 +46,6 @@ describe('generate', () => { Command.prototype.getArgv = getArgv }) - test('build with devtools', async () => { - mockGetNuxt() - const generator = mockGetGenerator(Promise.resolve()) - - const cmd = NuxtCommand.from(generate) - const args = ['generate', '.', '--devtools'] - const argv = cmd.getArgv(args) - argv._ = ['.'] - - const options = await cmd.getNuxtConfig(argv) - - await cmd.run() - - expect(options.vue.config.devtools).toBe(true) - expect(generator).toHaveBeenCalled() - expect(generator.mock.calls[0][0].build).toBe(true) - }) - test('generate with modern mode', async () => { mockGetNuxt() mockGetGenerator(Promise.resolve()) From f10c9829a86b0f6848c1db9694c087edfd081fc9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 26 Nov 2018 20:24:49 +0330 Subject: [PATCH 13/22] chore(deps): update dependency vue-meta to ^1.5.6 (#4427) --- packages/vue-renderer/package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json index 8df0aa7d5e..0728277272 100644 --- a/packages/vue-renderer/package.json +++ b/packages/vue-renderer/package.json @@ -14,7 +14,7 @@ "fs-extra": "^7.0.1", "lru-cache": "^4.1.3", "vue": "^2.5.17", - "vue-meta": "^1.5.5", + "vue-meta": "^1.5.6", "vue-no-ssr": "^1.1.0", "vue-router": "^3.0.2", "vue-server-renderer": "^2.5.17", diff --git a/yarn.lock b/yarn.lock index f9037891fa..fce7b03f14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3566,7 +3566,7 @@ deep-is@~0.1.3: resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -deepmerge@^2.0.0: +deepmerge@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170" integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA== @@ -10798,12 +10798,12 @@ vue-loader@^15.4.2: vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" -vue-meta@^1.5.5: - version "1.5.5" - resolved "https://registry.npmjs.org/vue-meta/-/vue-meta-1.5.5.tgz#e24a5fea3a0c11b67c85947f0a7ee3f3edcbc01d" - integrity sha512-DJLmAnuHexTk7+zxMcvmTqMEyil+sdeu67yLH6ajxFG/KTuYNnzX+qOkv6BiVgt21KYV8fw2H8aaLjfhQ7fG5w== +vue-meta@^1.5.6: + version "1.5.6" + resolved "https://registry.npmjs.org/vue-meta/-/vue-meta-1.5.6.tgz#8c6e56e560217c63637bb9ed66434df15c162057" + integrity sha512-0MK3VGtAeZvGBkWmvCIsTE3LzoXvfbbduF1vbNOa491tYw7E1IlLMsmdr0DNypIdrFGS4NmOajVMJcDXCSp2VA== dependencies: - deepmerge "^2.0.0" + deepmerge "^2.2.1" lodash.isplainobject "^4.0.6" object-assign "^4.1.1" From 2e90166f2a87271dedaf7072c2f7d9457bff5d34 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 20:32:11 +0330 Subject: [PATCH 14/22] update @nuxtjs/opencollective to 0.2.0 --- distributions/nuxt-legacy/package.json | 2 +- distributions/nuxt/package.json | 2 +- yarn.lock | 36 +++++++------------------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/distributions/nuxt-legacy/package.json b/distributions/nuxt-legacy/package.json index af28fded58..455769001d 100644 --- a/distributions/nuxt-legacy/package.json +++ b/distributions/nuxt-legacy/package.json @@ -54,7 +54,7 @@ "@nuxt/core": "2.3.2", "@nuxt/generator": "2.3.2", "@nuxt/webpack": "2.3.2", - "@nuxtjs/opencollective": "^0.1.0" + "@nuxtjs/opencollective": "^0.2.0" }, "engines": { "node": ">=6.0.0", diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json index 8be673221d..b23cb3d8ca 100644 --- a/distributions/nuxt/package.json +++ b/distributions/nuxt/package.json @@ -54,7 +54,7 @@ "@nuxt/core": "2.3.2", "@nuxt/generator": "2.3.2", "@nuxt/webpack": "2.3.2", - "@nuxtjs/opencollective": "^0.1.0" + "@nuxtjs/opencollective": "^0.2.0" }, "engines": { "node": ">=8.0.0", diff --git a/yarn.lock b/yarn.lock index fce7b03f14..6b13372666 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1270,15 +1270,14 @@ resolved "https://registry.npmjs.org/@nuxtjs/eslint-config/-/eslint-config-0.0.1.tgz#3aeed1cc6a2e01331c7e6b56bfa7152ce8bb2d90" integrity sha512-Scz5oYNtVwePF1ebXcWPrFxBpNF5wAkYh8L++6f2ZdLyUb1mCOwzE2+oVZxS25hGCYUyecFEshbqeSwkC+ktqA== -"@nuxtjs/opencollective@^0.1.0": - version "0.1.0" - resolved "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.1.0.tgz#5dfb10b2148ce77e9590bca9b9ed6e71d2a500eb" - integrity sha512-e09TxGpTxMOfVwvVWPKNttKslnCtbvp5ofc0EwlKdA4IA8AUIyeteGraGZGs+JO4zw4y2+YxRlNN2xQ+c6KFjw== +"@nuxtjs/opencollective@^0.2.0": + version "0.2.0" + resolved "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.2.0.tgz#2badff33d6fd2dcd5dc5ce95e2171c8095f12d25" + integrity sha512-A6htoJrs0ZJCmy+PI/ihQFzgkh1rXcMI2p8kt2x7W4Qjv+BjRygiZ/BQMgrZmIKktBzbQgqLFX1CMBh0HvLGvQ== dependencies: chalk "^2.4.1" - consola "^1.4.3" - esm "^3.0.79" - node-fetch "^2.2.0" + consola "^2.3.0" + node-fetch "^2.3.0" "@nuxtjs/youch@^4.2.3": version "4.2.3" @@ -2914,16 +2913,6 @@ connect@^3.6.6: parseurl "~1.3.2" utils-merge "1.0.1" -consola@^1.4.3: - version "1.4.5" - resolved "https://registry.npmjs.org/consola/-/consola-1.4.5.tgz#09732d07cb50af07332e54e0f42fafb92b962c4a" - integrity sha512-movqq3MbyXbSf7cG/x+EbO3VjKQVZPB/zeB5+lN1TuBYh9BWDemLQca9P+a4xpO4lXva9rz+Bd8XyqlH136Lww== - dependencies: - chalk "^2.3.2" - figures "^2.0.0" - lodash "^4.17.5" - std-env "^1.1.0" - consola@^2.0.0-1, consola@^2.0.7, consola@^2.2.4: version "2.2.6" resolved "https://registry.npmjs.org/consola/-/consola-2.2.6.tgz#01360c5b3a3a9e49bbd497ad4e04037c05e772fd" @@ -4165,7 +4154,7 @@ eslint@^5.9.0: table "^5.0.2" text-table "^0.2.0" -esm@^3.0.79, esm@^3.0.84: +esm@^3.0.84: version "3.0.84" resolved "https://registry.npmjs.org/esm/-/esm-3.0.84.tgz#bb108989f4673b32d4f62406869c28eed3815a63" integrity sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw== @@ -5478,7 +5467,7 @@ is-callable@^1.1.3, is-callable@^1.1.4: resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== -is-ci@^1.0.10, is-ci@^1.1.0: +is-ci@^1.0.10: version "1.2.1" resolved "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== @@ -7139,7 +7128,7 @@ node-fetch-npm@^2.0.2: json-parse-better-errors "^1.0.0" safe-buffer "^5.1.1" -node-fetch@^2.2.0, node-fetch@^2.3.0: +node-fetch@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5" integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA== @@ -9978,13 +9967,6 @@ statuses@~1.4.0: resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew== -std-env@^1.1.0: - version "1.3.1" - resolved "https://registry.npmjs.org/std-env/-/std-env-1.3.1.tgz#4e1758412439e9ece1d437b1b098551911aa44ee" - integrity sha512-KI2F2pPJpd3lHjng+QLezu0eq+QDtXcv1um016mhOPAJFHKL+09ykK5PUBWta2pZDC8BVV0VPya08A15bUXSLQ== - dependencies: - is-ci "^1.1.0" - std-env@^2.1.1, std-env@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/std-env/-/std-env-2.2.1.tgz#2ffa0fdc9e2263e0004c1211966e960948a40f6b" From d0af6a473664bbf55b06aec30023a51dd3d6dc9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= Date: Mon, 26 Nov 2018 18:37:12 +0100 Subject: [PATCH 15/22] bump: Bump to v2.3.3 --- distributions/nuxt-legacy/package.json | 16 ++++++++-------- distributions/nuxt-start/package.json | 10 +++++----- distributions/nuxt/package.json | 16 ++++++++-------- lerna.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 6 +++--- packages/common/package.json | 4 ++-- packages/config/package.json | 6 +++--- packages/core/package.json | 12 ++++++------ packages/generator/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/vue-app/package.json | 4 ++-- packages/vue-renderer/package.json | 6 +++--- packages/webpack/package.json | 6 +++--- 14 files changed, 55 insertions(+), 55 deletions(-) diff --git a/distributions/nuxt-legacy/package.json b/distributions/nuxt-legacy/package.json index 455769001d..e77c9a69ac 100644 --- a/distributions/nuxt-legacy/package.json +++ b/distributions/nuxt-legacy/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-legacy", - "version": "2.3.2", + "version": "2.3.3", "description": "Legacy build of Nuxt.js for Node.js < 8.0.0", "keywords": [ "nuxt", @@ -48,12 +48,12 @@ "@babel/polyfill": "^7.0.0", "@babel/preset-env": "^7.1.6", "@babel/register": "^7.0.0", - "@nuxt/builder": "2.3.2", - "@nuxt/cli": "2.3.2", - "@nuxt/common": "2.3.2", - "@nuxt/core": "2.3.2", - "@nuxt/generator": "2.3.2", - "@nuxt/webpack": "2.3.2", + "@nuxt/builder": "2.3.3", + "@nuxt/cli": "2.3.3", + "@nuxt/common": "2.3.3", + "@nuxt/core": "2.3.3", + "@nuxt/generator": "2.3.3", + "@nuxt/webpack": "2.3.3", "@nuxtjs/opencollective": "^0.2.0" }, "engines": { @@ -64,5 +64,5 @@ "url": "https://opencollective.com/nuxtjs", "logoUrl": "https://opencollective.com/nuxtjs/logo.txt?reverse=true&variant=variant2" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/distributions/nuxt-start/package.json b/distributions/nuxt-start/package.json index 5082d8c8f1..77c489e9a4 100644 --- a/distributions/nuxt-start/package.json +++ b/distributions/nuxt-start/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-start", - "version": "2.3.2", + "version": "2.3.3", "description": "Starts Nuxt.js Application in production mode", "keywords": [ "nuxt", @@ -46,13 +46,13 @@ "main": "dist/nuxt-start.js", "bin": "bin/nuxt-start.js", "dependencies": { - "@nuxt/cli": "2.3.2", - "@nuxt/common": "2.3.2", - "@nuxt/core": "2.3.2" + "@nuxt/cli": "2.3.3", + "@nuxt/common": "2.3.3", + "@nuxt/core": "2.3.3" }, "engines": { "node": ">=8.0.0", "npm": ">=5.0.0" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json index b23cb3d8ca..dc03cd7334 100644 --- a/distributions/nuxt/package.json +++ b/distributions/nuxt/package.json @@ -1,6 +1,6 @@ { "name": "nuxt", - "version": "2.3.2", + "version": "2.3.3", "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)", "keywords": [ "nuxt", @@ -48,12 +48,12 @@ "postinstall": "opencollective || exit 0" }, "dependencies": { - "@nuxt/builder": "2.3.2", - "@nuxt/cli": "2.3.2", - "@nuxt/common": "2.3.2", - "@nuxt/core": "2.3.2", - "@nuxt/generator": "2.3.2", - "@nuxt/webpack": "2.3.2", + "@nuxt/builder": "2.3.3", + "@nuxt/cli": "2.3.3", + "@nuxt/common": "2.3.3", + "@nuxt/core": "2.3.3", + "@nuxt/generator": "2.3.3", + "@nuxt/webpack": "2.3.3", "@nuxtjs/opencollective": "^0.2.0" }, "engines": { @@ -64,5 +64,5 @@ "url": "https://opencollective.com/nuxtjs", "logoUrl": "https://opencollective.com/nuxtjs/logo.txt?reverse=true&variant=variant2" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/lerna.json b/lerna.json index 6f70cb1d60..254feae183 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.3.2", + "version": "2.3.3", "npmClient": "yarn", "useWorkspaces": true, "conventionalCommits": true, diff --git a/packages/builder/package.json b/packages/builder/package.json index 7083e19e92..e9c3ed5390 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/builder", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,8 +8,8 @@ ], "main": "dist/builder.js", "dependencies": { - "@nuxt/common": "2.3.2", - "@nuxt/vue-app": "2.3.2", + "@nuxt/common": "2.3.3", + "@nuxt/vue-app": "2.3.3", "@nuxtjs/devalue": "^1.1.0", "chokidar": "^2.0.4", "consola": "^2.3.0", @@ -24,5 +24,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 71db142146..24b39010f6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/cli", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -12,7 +12,7 @@ "nuxt-cli": "bin/nuxt-cli.js" }, "dependencies": { - "@nuxt/config": "2.3.2", + "@nuxt/config": "2.3.3", "boxen": "^2.0.0", "chalk": "^2.4.1", "consola": "^2.3.0", @@ -25,5 +25,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/packages/common/package.json b/packages/common/package.json index 2b307cbbe4..67d4b2fb1b 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/common", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -13,5 +13,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/packages/config/package.json b/packages/config/package.json index 5ff6718b4a..9a5ef9d278 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/config", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,12 +8,12 @@ ], "main": "dist/config.js", "dependencies": { - "@nuxt/common": "2.3.2", + "@nuxt/common": "2.3.3", "consola": "^2.3.0", "std-env": "^2.2.1" }, "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/packages/core/package.json b/packages/core/package.json index 134f8186ce..7260c2a222 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/core", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,10 +8,10 @@ ], "main": "dist/core.js", "dependencies": { - "@nuxt/common": "2.3.2", - "@nuxt/config": "2.3.2", - "@nuxt/server": "2.3.2", - "@nuxt/vue-renderer": "2.3.2", + "@nuxt/common": "2.3.3", + "@nuxt/config": "2.3.3", + "@nuxt/server": "2.3.3", + "@nuxt/vue-renderer": "2.3.3", "@nuxtjs/devalue": "^1.1.0", "consola": "^2.3.0", "debug": "^4.1.0", @@ -23,5 +23,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/packages/generator/package.json b/packages/generator/package.json index e884050fa9..c62c951237 100644 --- a/packages/generator/package.json +++ b/packages/generator/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/generator", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,7 +8,7 @@ ], "main": "dist/generator.js", "dependencies": { - "@nuxt/common": "2.3.2", + "@nuxt/common": "2.3.3", "chalk": "^2.4.1", "consola": "^2.3.0", "fs-extra": "^7.0.1", @@ -17,5 +17,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/packages/server/package.json b/packages/server/package.json index 40ae13fc9f..3a97aa58b3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/server", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,8 +8,8 @@ ], "main": "dist/server.js", "dependencies": { - "@nuxt/common": "2.3.2", - "@nuxt/config": "2.3.2", + "@nuxt/common": "2.3.3", + "@nuxt/config": "2.3.3", "@nuxtjs/youch": "^4.2.3", "browserslist-useragent": "^2.0.1", "chalk": "^2.4.1", @@ -29,5 +29,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json index 84e1762ce4..614e4b6bd0 100644 --- a/packages/vue-app/package.json +++ b/packages/vue-app/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/vue-app", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -11,5 +11,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json index 0728277272..373d605343 100644 --- a/packages/vue-renderer/package.json +++ b/packages/vue-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/vue-renderer", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,7 +8,7 @@ ], "main": "dist/vue-renderer.js", "dependencies": { - "@nuxt/common": "2.3.2", + "@nuxt/common": "2.3.3", "@nuxtjs/devalue": "^1.1.0", "consola": "^2.3.0", "fs-extra": "^7.0.1", @@ -24,5 +24,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } diff --git a/packages/webpack/package.json b/packages/webpack/package.json index b045fc52ca..6af9e7ef3a 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/webpack", - "version": "2.3.2", + "version": "2.3.3", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -11,7 +11,7 @@ "@babel/core": "^7.1.6", "@babel/polyfill": "^7.0.0", "@nuxt/babel-preset-app": "2.3.2", - "@nuxt/common": "2.3.2", + "@nuxt/common": "2.3.3", "@nuxt/friendly-errors-webpack-plugin": "^2.3.2", "babel-loader": "^8.0.4", "cache-loader": "^1.2.5", @@ -52,5 +52,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" } From eefa13033f106508732f984d6a6a45894a572197 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 21:09:31 +0330 Subject: [PATCH 16/22] hotfix: build on prepublish hook --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 4b5d719988..cb6e9968b3 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "test:lint": "yarn lint", "test:unit": "jest test/unit", "postinstall": "lerna link && yarn dev", + "prepublish": "yarn build", "release": "lerna version" }, "devDependencies": { From be126bd962fd6491713d72b2f281c2677e4eb358 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 21:12:22 +0330 Subject: [PATCH 17/22] remove extra gitHead --- distributions/nuxt-legacy/package.json | 3 +-- distributions/nuxt-start/package.json | 3 +-- distributions/nuxt/package.json | 3 +-- packages/babel-preset-app/package.json | 3 +-- packages/builder/package.json | 3 +-- packages/cli/package.json | 3 +-- packages/common/package.json | 3 +-- packages/config/package.json | 3 +-- packages/core/package.json | 3 +-- packages/generator/package.json | 3 +-- packages/server/package.json | 3 +-- packages/vue-app/package.json | 3 +-- packages/vue-renderer/package.json | 3 +-- packages/webpack/package.json | 3 +-- 14 files changed, 14 insertions(+), 28 deletions(-) diff --git a/distributions/nuxt-legacy/package.json b/distributions/nuxt-legacy/package.json index e77c9a69ac..361a19abce 100644 --- a/distributions/nuxt-legacy/package.json +++ b/distributions/nuxt-legacy/package.json @@ -63,6 +63,5 @@ "collective": { "url": "https://opencollective.com/nuxtjs", "logoUrl": "https://opencollective.com/nuxtjs/logo.txt?reverse=true&variant=variant2" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/distributions/nuxt-start/package.json b/distributions/nuxt-start/package.json index 77c489e9a4..a39555a573 100644 --- a/distributions/nuxt-start/package.json +++ b/distributions/nuxt-start/package.json @@ -53,6 +53,5 @@ "engines": { "node": ">=8.0.0", "npm": ">=5.0.0" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json index dc03cd7334..1faab7694c 100644 --- a/distributions/nuxt/package.json +++ b/distributions/nuxt/package.json @@ -63,6 +63,5 @@ "collective": { "url": "https://opencollective.com/nuxtjs", "logoUrl": "https://opencollective.com/nuxtjs/logo.txt?reverse=true&variant=variant2" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/babel-preset-app/package.json b/packages/babel-preset-app/package.json index d74c291164..b6e2fac472 100644 --- a/packages/babel-preset-app/package.json +++ b/packages/babel-preset-app/package.json @@ -23,6 +23,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22" + } } diff --git a/packages/builder/package.json b/packages/builder/package.json index e9c3ed5390..b9f6fbb68e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -23,6 +23,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/cli/package.json b/packages/cli/package.json index 24b39010f6..c51b434f72 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -24,6 +24,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/common/package.json b/packages/common/package.json index 67d4b2fb1b..0a01a78500 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -12,6 +12,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/config/package.json b/packages/config/package.json index 9a5ef9d278..ce45c0b7c2 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -14,6 +14,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/core/package.json b/packages/core/package.json index 7260c2a222..dd384c4af8 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -22,6 +22,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/generator/package.json b/packages/generator/package.json index c62c951237..53f8b09c54 100644 --- a/packages/generator/package.json +++ b/packages/generator/package.json @@ -16,6 +16,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/server/package.json b/packages/server/package.json index 3a97aa58b3..d72636ba20 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -28,6 +28,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json index 614e4b6bd0..ab1f9f721c 100644 --- a/packages/vue-app/package.json +++ b/packages/vue-app/package.json @@ -10,6 +10,5 @@ "main": "dist/vue-app.js", "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json index 373d605343..38489d0960 100644 --- a/packages/vue-renderer/package.json +++ b/packages/vue-renderer/package.json @@ -23,6 +23,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 6af9e7ef3a..7195377f86 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -51,6 +51,5 @@ }, "publishConfig": { "access": "public" - }, - "gitHead": "2e90166f2a87271dedaf7072c2f7d9457bff5d34" + } } From c96e9f49964c6acaf3daa2f17b16261663a5d42c Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 21:14:29 +0330 Subject: [PATCH 18/22] lerna auto tag --- lerna.json | 1 - 1 file changed, 1 deletion(-) diff --git a/lerna.json b/lerna.json index 254feae183..1002d9acf2 100644 --- a/lerna.json +++ b/lerna.json @@ -5,7 +5,6 @@ "conventionalCommits": true, "exact": true, "noPush": true, - "gitTagVersion": false, "packages": [ "packages/*", "distributions/*" From e4a02a51aceb3c92e47a31c2e83df8b20cc666a6 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 21:17:40 +0330 Subject: [PATCH 19/22] whitelist CHANGELOG files --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index b0f7541c96..f8050cf3e4 100644 --- a/.gitignore +++ b/.gitignore @@ -58,5 +58,3 @@ Temporary Items # Junit report from jest-junit *junit.xml -# Don't version control changelogs for now -**/CHANGELOG.md From 16c5b892fa3104992f3a6778ac97a0fcb1ca657c Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 21:20:03 +0330 Subject: [PATCH 20/22] v2.3.4 --- CHANGELOG.md | 23 +++++++++++++++++++++++ distributions/nuxt-legacy/CHANGELOG.md | 11 +++++++++++ distributions/nuxt-legacy/package.json | 14 +++++++------- distributions/nuxt-start/CHANGELOG.md | 8 ++++++++ distributions/nuxt-start/package.json | 8 ++++---- distributions/nuxt/CHANGELOG.md | 11 +++++++++++ distributions/nuxt/package.json | 14 +++++++------- lerna.json | 2 +- packages/babel-preset-app/CHANGELOG.md | 8 ++++++++ packages/babel-preset-app/package.json | 2 +- packages/builder/CHANGELOG.md | 8 ++++++++ packages/builder/package.json | 6 +++--- packages/cli/CHANGELOG.md | 11 +++++++++++ packages/cli/package.json | 4 ++-- packages/common/CHANGELOG.md | 11 +++++++++++ packages/common/package.json | 2 +- packages/config/CHANGELOG.md | 11 +++++++++++ packages/config/package.json | 4 ++-- packages/core/CHANGELOG.md | 16 ++++++++++++++++ packages/core/package.json | 10 +++++----- packages/generator/CHANGELOG.md | 8 ++++++++ packages/generator/package.json | 4 ++-- packages/server/CHANGELOG.md | 12 ++++++++++++ packages/server/package.json | 6 +++--- packages/vue-app/CHANGELOG.md | 14 ++++++++++++++ packages/vue-app/package.json | 2 +- packages/vue-renderer/CHANGELOG.md | 8 ++++++++ packages/vue-renderer/package.json | 4 ++-- packages/webpack/CHANGELOG.md | 16 ++++++++++++++++ packages/webpack/package.json | 6 +++--- 30 files changed, 220 insertions(+), 44 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 distributions/nuxt-legacy/CHANGELOG.md create mode 100644 distributions/nuxt-start/CHANGELOG.md create mode 100644 distributions/nuxt/CHANGELOG.md create mode 100644 packages/babel-preset-app/CHANGELOG.md create mode 100644 packages/builder/CHANGELOG.md create mode 100644 packages/cli/CHANGELOG.md create mode 100644 packages/common/CHANGELOG.md create mode 100644 packages/config/CHANGELOG.md create mode 100644 packages/core/CHANGELOG.md create mode 100644 packages/generator/CHANGELOG.md create mode 100644 packages/server/CHANGELOG.md create mode 100644 packages/vue-app/CHANGELOG.md create mode 100644 packages/vue-renderer/CHANGELOG.md create mode 100644 packages/webpack/CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..7f9bc524e5 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,23 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Bug Fixes + +* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([4a85c03](https://github.com/nuxt/nuxt.js/commit/4a85c03)) +* **progress-bar:** allow 0 for values and remove duplicate defaults ([#4397](https://github.com/nuxt/nuxt.js/issues/4397)) ([8030ca1](https://github.com/nuxt/nuxt.js/commit/8030ca1)) +* **scrollBehavior:** emit triggerScroll event after changing layer ([#4399](https://github.com/nuxt/nuxt.js/issues/4399)) ([0c6c69b](https://github.com/nuxt/nuxt.js/commit/0c6c69b)), closes [#4080](https://github.com/nuxt/nuxt.js/issues/4080) +* **server, jsdom:** fix timeout error message ([#4412](https://github.com/nuxt/nuxt.js/issues/4412)) ([e1c1240](https://github.com/nuxt/nuxt.js/commit/e1c1240)) +* **server, vue-app:** allow unicode page names ([#4402](https://github.com/nuxt/nuxt.js/issues/4402)) ([d187793](https://github.com/nuxt/nuxt.js/commit/d187793)) +* empty error message in dev mode ([47f02ae](https://github.com/nuxt/nuxt.js/commit/47f02ae)) +* modern=true or false not work as expected ([#4378](https://github.com/nuxt/nuxt.js/issues/4378)) ([ff7c083](https://github.com/nuxt/nuxt.js/commit/ff7c083)) +* router Expected "0" to be defined ([#4394](https://github.com/nuxt/nuxt.js/issues/4394)) ([54d2737](https://github.com/nuxt/nuxt.js/commit/54d2737)) + + +### Performance Improvements + +* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed)) diff --git a/distributions/nuxt-legacy/CHANGELOG.md b/distributions/nuxt-legacy/CHANGELOG.md new file mode 100644 index 0000000000..aaa1417a42 --- /dev/null +++ b/distributions/nuxt-legacy/CHANGELOG.md @@ -0,0 +1,11 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Bug Fixes + +* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([4a85c03](https://github.com/nuxt/nuxt.js/commit/4a85c03)) diff --git a/distributions/nuxt-legacy/package.json b/distributions/nuxt-legacy/package.json index 361a19abce..56c5249199 100644 --- a/distributions/nuxt-legacy/package.json +++ b/distributions/nuxt-legacy/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-legacy", - "version": "2.3.3", + "version": "2.3.4", "description": "Legacy build of Nuxt.js for Node.js < 8.0.0", "keywords": [ "nuxt", @@ -48,12 +48,12 @@ "@babel/polyfill": "^7.0.0", "@babel/preset-env": "^7.1.6", "@babel/register": "^7.0.0", - "@nuxt/builder": "2.3.3", - "@nuxt/cli": "2.3.3", - "@nuxt/common": "2.3.3", - "@nuxt/core": "2.3.3", - "@nuxt/generator": "2.3.3", - "@nuxt/webpack": "2.3.3", + "@nuxt/builder": "2.3.4", + "@nuxt/cli": "2.3.4", + "@nuxt/common": "2.3.4", + "@nuxt/core": "2.3.4", + "@nuxt/generator": "2.3.4", + "@nuxt/webpack": "2.3.4", "@nuxtjs/opencollective": "^0.2.0" }, "engines": { diff --git a/distributions/nuxt-start/CHANGELOG.md b/distributions/nuxt-start/CHANGELOG.md new file mode 100644 index 0000000000..c388535083 --- /dev/null +++ b/distributions/nuxt-start/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + +**Note:** Version bump only for package nuxt-start diff --git a/distributions/nuxt-start/package.json b/distributions/nuxt-start/package.json index a39555a573..ece97ea7c9 100644 --- a/distributions/nuxt-start/package.json +++ b/distributions/nuxt-start/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-start", - "version": "2.3.3", + "version": "2.3.4", "description": "Starts Nuxt.js Application in production mode", "keywords": [ "nuxt", @@ -46,9 +46,9 @@ "main": "dist/nuxt-start.js", "bin": "bin/nuxt-start.js", "dependencies": { - "@nuxt/cli": "2.3.3", - "@nuxt/common": "2.3.3", - "@nuxt/core": "2.3.3" + "@nuxt/cli": "2.3.4", + "@nuxt/common": "2.3.4", + "@nuxt/core": "2.3.4" }, "engines": { "node": ">=8.0.0", diff --git a/distributions/nuxt/CHANGELOG.md b/distributions/nuxt/CHANGELOG.md new file mode 100644 index 0000000000..aaa1417a42 --- /dev/null +++ b/distributions/nuxt/CHANGELOG.md @@ -0,0 +1,11 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Bug Fixes + +* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([4a85c03](https://github.com/nuxt/nuxt.js/commit/4a85c03)) diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json index 1faab7694c..1a6164d06d 100644 --- a/distributions/nuxt/package.json +++ b/distributions/nuxt/package.json @@ -1,6 +1,6 @@ { "name": "nuxt", - "version": "2.3.3", + "version": "2.3.4", "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)", "keywords": [ "nuxt", @@ -48,12 +48,12 @@ "postinstall": "opencollective || exit 0" }, "dependencies": { - "@nuxt/builder": "2.3.3", - "@nuxt/cli": "2.3.3", - "@nuxt/common": "2.3.3", - "@nuxt/core": "2.3.3", - "@nuxt/generator": "2.3.3", - "@nuxt/webpack": "2.3.3", + "@nuxt/builder": "2.3.4", + "@nuxt/cli": "2.3.4", + "@nuxt/common": "2.3.4", + "@nuxt/core": "2.3.4", + "@nuxt/generator": "2.3.4", + "@nuxt/webpack": "2.3.4", "@nuxtjs/opencollective": "^0.2.0" }, "engines": { diff --git a/lerna.json b/lerna.json index 1002d9acf2..d23a34d3aa 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.3.3", + "version": "2.3.4", "npmClient": "yarn", "useWorkspaces": true, "conventionalCommits": true, diff --git a/packages/babel-preset-app/CHANGELOG.md b/packages/babel-preset-app/CHANGELOG.md new file mode 100644 index 0000000000..3643b937dc --- /dev/null +++ b/packages/babel-preset-app/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + +**Note:** Version bump only for package @nuxt/babel-preset-app diff --git a/packages/babel-preset-app/package.json b/packages/babel-preset-app/package.json index b6e2fac472..ffb6f2f2bd 100644 --- a/packages/babel-preset-app/package.json +++ b/packages/babel-preset-app/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/babel-preset-app", - "version": "2.3.2", + "version": "2.3.4", "description": "babel-preset-app for nuxt.js", "repository": "nuxt/nuxt.js", "license": "MIT", diff --git a/packages/builder/CHANGELOG.md b/packages/builder/CHANGELOG.md new file mode 100644 index 0000000000..aa7bb548a6 --- /dev/null +++ b/packages/builder/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + +**Note:** Version bump only for package @nuxt/builder diff --git a/packages/builder/package.json b/packages/builder/package.json index b9f6fbb68e..ad3d8b683e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/builder", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,8 +8,8 @@ ], "main": "dist/builder.js", "dependencies": { - "@nuxt/common": "2.3.3", - "@nuxt/vue-app": "2.3.3", + "@nuxt/common": "2.3.4", + "@nuxt/vue-app": "2.3.4", "@nuxtjs/devalue": "^1.1.0", "chokidar": "^2.0.4", "consola": "^2.3.0", diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md new file mode 100644 index 0000000000..e177651fe8 --- /dev/null +++ b/packages/cli/CHANGELOG.md @@ -0,0 +1,11 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Bug Fixes + +* modern=true or false not work as expected ([#4378](https://github.com/nuxt/nuxt.js/issues/4378)) ([ff7c083](https://github.com/nuxt/nuxt.js/commit/ff7c083)) diff --git a/packages/cli/package.json b/packages/cli/package.json index c51b434f72..2e47c89056 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/cli", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -12,7 +12,7 @@ "nuxt-cli": "bin/nuxt-cli.js" }, "dependencies": { - "@nuxt/config": "2.3.3", + "@nuxt/config": "2.3.4", "boxen": "^2.0.0", "chalk": "^2.4.1", "consola": "^2.3.0", diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md new file mode 100644 index 0000000000..128438c101 --- /dev/null +++ b/packages/common/CHANGELOG.md @@ -0,0 +1,11 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Performance Improvements + +* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed)) diff --git a/packages/common/package.json b/packages/common/package.json index 0a01a78500..6f236d630f 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/common", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md new file mode 100644 index 0000000000..128438c101 --- /dev/null +++ b/packages/config/CHANGELOG.md @@ -0,0 +1,11 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Performance Improvements + +* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed)) diff --git a/packages/config/package.json b/packages/config/package.json index ce45c0b7c2..4b4dd371ed 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/config", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,7 +8,7 @@ ], "main": "dist/config.js", "dependencies": { - "@nuxt/common": "2.3.3", + "@nuxt/common": "2.3.4", "consola": "^2.3.0", "std-env": "^2.2.1" }, diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md new file mode 100644 index 0000000000..3be2538a47 --- /dev/null +++ b/packages/core/CHANGELOG.md @@ -0,0 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Bug Fixes + +* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([4a85c03](https://github.com/nuxt/nuxt.js/commit/4a85c03)) + + +### Performance Improvements + +* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed)) diff --git a/packages/core/package.json b/packages/core/package.json index dd384c4af8..17967b3fd9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/core", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,10 +8,10 @@ ], "main": "dist/core.js", "dependencies": { - "@nuxt/common": "2.3.3", - "@nuxt/config": "2.3.3", - "@nuxt/server": "2.3.3", - "@nuxt/vue-renderer": "2.3.3", + "@nuxt/common": "2.3.4", + "@nuxt/config": "2.3.4", + "@nuxt/server": "2.3.4", + "@nuxt/vue-renderer": "2.3.4", "@nuxtjs/devalue": "^1.1.0", "consola": "^2.3.0", "debug": "^4.1.0", diff --git a/packages/generator/CHANGELOG.md b/packages/generator/CHANGELOG.md new file mode 100644 index 0000000000..3fd1b73a39 --- /dev/null +++ b/packages/generator/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + +**Note:** Version bump only for package @nuxt/generator diff --git a/packages/generator/package.json b/packages/generator/package.json index 53f8b09c54..81031d7bb2 100644 --- a/packages/generator/package.json +++ b/packages/generator/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/generator", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,7 +8,7 @@ ], "main": "dist/generator.js", "dependencies": { - "@nuxt/common": "2.3.3", + "@nuxt/common": "2.3.4", "chalk": "^2.4.1", "consola": "^2.3.0", "fs-extra": "^7.0.1", diff --git a/packages/server/CHANGELOG.md b/packages/server/CHANGELOG.md new file mode 100644 index 0000000000..bfb2af2099 --- /dev/null +++ b/packages/server/CHANGELOG.md @@ -0,0 +1,12 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Bug Fixes + +* **server, jsdom:** fix timeout error message ([#4412](https://github.com/nuxt/nuxt.js/issues/4412)) ([e1c1240](https://github.com/nuxt/nuxt.js/commit/e1c1240)) +* **server, vue-app:** allow unicode page names ([#4402](https://github.com/nuxt/nuxt.js/issues/4402)) ([d187793](https://github.com/nuxt/nuxt.js/commit/d187793)) diff --git a/packages/server/package.json b/packages/server/package.json index d72636ba20..26cb0931a6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/server", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,8 +8,8 @@ ], "main": "dist/server.js", "dependencies": { - "@nuxt/common": "2.3.3", - "@nuxt/config": "2.3.3", + "@nuxt/common": "2.3.4", + "@nuxt/config": "2.3.4", "@nuxtjs/youch": "^4.2.3", "browserslist-useragent": "^2.0.1", "chalk": "^2.4.1", diff --git a/packages/vue-app/CHANGELOG.md b/packages/vue-app/CHANGELOG.md new file mode 100644 index 0000000000..1d4e3e6e22 --- /dev/null +++ b/packages/vue-app/CHANGELOG.md @@ -0,0 +1,14 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Bug Fixes + +* **progress-bar:** allow 0 for values and remove duplicate defaults ([#4397](https://github.com/nuxt/nuxt.js/issues/4397)) ([8030ca1](https://github.com/nuxt/nuxt.js/commit/8030ca1)) +* **scrollBehavior:** emit triggerScroll event after changing layer ([#4399](https://github.com/nuxt/nuxt.js/issues/4399)) ([0c6c69b](https://github.com/nuxt/nuxt.js/commit/0c6c69b)), closes [#4080](https://github.com/nuxt/nuxt.js/issues/4080) +* **server, vue-app:** allow unicode page names ([#4402](https://github.com/nuxt/nuxt.js/issues/4402)) ([d187793](https://github.com/nuxt/nuxt.js/commit/d187793)) +* router Expected "0" to be defined ([#4394](https://github.com/nuxt/nuxt.js/issues/4394)) ([54d2737](https://github.com/nuxt/nuxt.js/commit/54d2737)) diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json index ab1f9f721c..a15fc106e9 100644 --- a/packages/vue-app/package.json +++ b/packages/vue-app/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/vue-app", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ diff --git a/packages/vue-renderer/CHANGELOG.md b/packages/vue-renderer/CHANGELOG.md new file mode 100644 index 0000000000..d6b4010d30 --- /dev/null +++ b/packages/vue-renderer/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + +**Note:** Version bump only for package @nuxt/vue-renderer diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json index 38489d0960..afa6a245f1 100644 --- a/packages/vue-renderer/package.json +++ b/packages/vue-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/vue-renderer", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -8,7 +8,7 @@ ], "main": "dist/vue-renderer.js", "dependencies": { - "@nuxt/common": "2.3.3", + "@nuxt/common": "2.3.4", "@nuxtjs/devalue": "^1.1.0", "consola": "^2.3.0", "fs-extra": "^7.0.1", diff --git a/packages/webpack/CHANGELOG.md b/packages/webpack/CHANGELOG.md new file mode 100644 index 0000000000..fa0ac6972f --- /dev/null +++ b/packages/webpack/CHANGELOG.md @@ -0,0 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26) + + +### Bug Fixes + +* empty error message in dev mode ([47f02ae](https://github.com/nuxt/nuxt.js/commit/47f02ae)) + + +### Performance Improvements + +* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed)) diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 7195377f86..00636b2cae 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/webpack", - "version": "2.3.3", + "version": "2.3.4", "repository": "nuxt/nuxt.js", "license": "MIT", "files": [ @@ -10,8 +10,8 @@ "dependencies": { "@babel/core": "^7.1.6", "@babel/polyfill": "^7.0.0", - "@nuxt/babel-preset-app": "2.3.2", - "@nuxt/common": "2.3.3", + "@nuxt/babel-preset-app": "2.3.4", + "@nuxt/common": "2.3.4", "@nuxt/friendly-errors-webpack-plugin": "^2.3.2", "babel-loader": "^8.0.4", "cache-loader": "^1.2.5", From 0f28f9cdb64d8f7894cf476ffce735a32b5c2011 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 26 Nov 2018 21:23:55 +0330 Subject: [PATCH 21/22] add simple release script --- lerna.json | 1 - package.json | 3 +-- scripts/release | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100755 scripts/release diff --git a/lerna.json b/lerna.json index d23a34d3aa..89b3c6926d 100644 --- a/lerna.json +++ b/lerna.json @@ -4,7 +4,6 @@ "useWorkspaces": true, "conventionalCommits": true, "exact": true, - "noPush": true, "packages": [ "packages/*", "distributions/*" diff --git a/package.json b/package.json index cb6e9968b3..82c98f9ca5 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,7 @@ "test:lint": "yarn lint", "test:unit": "jest test/unit", "postinstall": "lerna link && yarn dev", - "prepublish": "yarn build", - "release": "lerna version" + "release": "./scripts/release" }, "devDependencies": { "@babel/core": "^7.1.6", diff --git a/scripts/release b/scripts/release new file mode 100755 index 0000000000..7a2724fda9 --- /dev/null +++ b/scripts/release @@ -0,0 +1,5 @@ +#!/bin/bash +set -e +yarn lerna version +yarn build +./scripts/workspace-run npm publish -q From 6ed3ecacc78207226121ce8f190ec0af15887883 Mon Sep 17 00:00:00 2001 From: Dmitry Molotkov Date: Wed, 28 Nov 2018 19:30:40 +0300 Subject: [PATCH 22/22] hotfix(vue-app): ReferenceError error passed with routeChanged (#4444) --- packages/vue-app/template/client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-app/template/client.js b/packages/vue-app/template/client.js index 21196fac77..8036612cf4 100644 --- a/packages/vue-app/template/client.js +++ b/packages/vue-app/template/client.js @@ -145,7 +145,7 @@ async function loadAsyncComponents(to, from, next) { // Call next() next() } catch (err) { - this.error(err) + const error = this.error(err) this.<%= globals.nuxt %>.$emit('routeChanged', to, from, error) next(false) }