From 111455f99a9182c5b3b6a479d1f81a148c3a8d3e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 7 Feb 2019 11:21:51 +0330 Subject: [PATCH 1/3] fix(deps): update serve-placeholder and esm (#4970) --- package.json | 2 +- packages/cli/package.json | 2 +- packages/core/package.json | 2 +- packages/server/package.json | 2 +- yarn.lock | 39 ++++++++++++++---------------------- 5 files changed, 19 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index c8b4847ff8..a2786f0cbc 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "eslint-plugin-promise": "^4.0.1", "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^5.1.0", - "esm": "^3.1.4", + "esm": "^3.2.3", "express": "^4.16.4", "finalhandler": "^1.1.1", "fork-ts-checker-webpack-plugin": "^0.5.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index 41d13a3658..965e412b14 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -16,7 +16,7 @@ "boxen": "^2.1.0", "chalk": "^2.4.2", "consola": "^2.3.2", - "esm": "^3.1.4", + "esm": "^3.2.3", "execa": "^1.0.0", "minimist": "^1.2.0", "pretty-bytes": "^5.1.0", diff --git a/packages/core/package.json b/packages/core/package.json index 37bb280297..8e61ddbb17 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -15,7 +15,7 @@ "@nuxt/vue-renderer": "2.4.3", "consola": "^2.3.2", "debug": "^4.1.1", - "esm": "^3.1.4", + "esm": "^3.2.3", "fs-extra": "^7.0.1", "hash-sum": "^1.0.2", "std-env": "^2.2.1" diff --git a/packages/server/package.json b/packages/server/package.json index 744c611967..e354f06d5a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -23,7 +23,7 @@ "on-headers": "^1.0.1", "pify": "^4.0.1", "semver": "^5.6.0", - "serve-placeholder": "^1.1.0", + "serve-placeholder": "^1.1.1", "serve-static": "^1.13.2", "server-destroy": "^1.0.1", "ua-parser-js": "^0.7.19" diff --git a/yarn.lock b/yarn.lock index 39b263ce72..afa1738f0e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3694,15 +3694,6 @@ default-require-extensions@^1.0.0: dependencies: strip-bom "^2.0.0" -defaults-deep@^0.2.4: - version "0.2.4" - resolved "https://registry.npmjs.org/defaults-deep/-/defaults-deep-0.2.4.tgz#a479cfeafce025810fb93aa8d2dde0ee2d677cc6" - integrity sha512-V6BtqzcMvn0EPOy7f+SfMhfmTawq+7UQdt9yZH0EBK89+IHo5f+Hse/qzTorAXOBrQpxpwb6cB/8OgtaMrT+Fg== - dependencies: - for-own "^0.1.3" - is-extendable "^0.1.1" - lazy-cache "^0.2.3" - defaults@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" @@ -3739,6 +3730,11 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" +defu@^0.0.1: + version "0.0.1" + resolved "https://registry.npmjs.org/defu/-/defu-0.0.1.tgz#74dc4d64e401d7f95c6755fe98bc5cd688833a8f" + integrity sha512-Pz9yznbSzVTNA67lcfqVnktROx2BrrBBcmQqGrfe0zdiN5pl5GQogLA4uaP3U1pR1LHIZpEYTAh2sn+v4rH1dA== + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -4288,10 +4284,10 @@ eslint@^5.12.1: table "^5.0.2" text-table "^0.2.0" -esm@^3.1.4: - version "3.1.4" - resolved "https://registry.npmjs.org/esm/-/esm-3.1.4.tgz#d75f7c1b16e5be57e0446c267d8c0fda9566983d" - integrity sha512-GScwIz0110RTNzBmAQEdqaAYkD9zVhj2Jo+jeizjIcdyTw+C6S0Zv/dlPYgfF41hRTu2f1vQYliubzIkusx2gA== +esm@^3.2.3: + version "3.2.3" + resolved "https://registry.npmjs.org/esm/-/esm-3.2.3.tgz#a5453468d030bdc5ec539f5ce5d9e95731f956d2" + integrity sha512-qkokqXI9pblukGvc0gG1FHMwKWjriIyCgDKbpzgtlis5tQ21dIFPL5s7ffcSVdE+k9Zw7R5ZC/dl0z/Ib5m1Pw== espree@^4.1.0: version "4.1.0" @@ -4794,7 +4790,7 @@ for-in@^1.0.1, for-in@^1.0.2: resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= -for-own@^0.1.3, for-own@^0.1.4: +for-own@^0.1.4: version "0.1.5" resolved "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= @@ -6643,11 +6639,6 @@ launch-editor@^2.2.1: chalk "^2.3.0" shell-quote "^1.6.1" -lazy-cache@^0.2.3: - version "0.2.7" - resolved "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" - integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U= - lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" @@ -9935,12 +9926,12 @@ serialize-javascript@^1.3.0, serialize-javascript@^1.4.0, serialize-javascript@^ resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879" integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw== -serve-placeholder@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/serve-placeholder/-/serve-placeholder-1.1.0.tgz#3c0930b311a9896c3d90903bb8ea60fff12101b2" - integrity sha512-kMYOLX8hwcyQ/8nLuyPcOhGhi4c29sJLsfz3i1vOFQnYMtZdPSsJLxxblTU+5wf6CPHh/g3EYo/V/SQ6eVEO5Q== +serve-placeholder@^1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/serve-placeholder/-/serve-placeholder-1.1.1.tgz#aab67f559abda831d8ddc66ee3da8564304273d6" + integrity sha512-dkRNJTSHfkDJUpOSN8LAQav+BJlwiPETND4YDDCiTfb0Ot5RGBXx5vZa4qYugi6dA1eNow0tKTqTTKQSxqcpWw== dependencies: - defaults-deep "^0.2.4" + defu "^0.0.1" serve-static@1.13.2, serve-static@^1.13.2: version "1.13.2" From dbf70999e43782d1130852aa3d31c1e9c1486507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Pallar=C3=A9s?= Date: Thu, 7 Feb 2019 11:14:38 +0100 Subject: [PATCH 2/3] fix(vue-app): fix `getNuxtChildComponents` method (#4969) --- 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 f207d3c594..b6632144ab 100644 --- a/packages/vue-app/template/client.js +++ b/packages/vue-app/template/client.js @@ -528,7 +528,7 @@ const noopFetch = () => {} // Special hot reload with asyncData(context) function getNuxtChildComponents($parent, $components = []) { $parent.$children.forEach(($child) => { - if ($child.$vnode.data.nuxtChild && !$components.find(c =>(c.$options.__file === $child.$options.__file))) { + if ($child.$vnode && $child.$vnode.data.nuxtChild && !$components.find(c =>(c.$options.__file === $child.$options.__file))) { $components.push($child) } if ($child.$children && $child.$children.length) { From 17cc12f0051c9666341ad79b4391d15fbf4355d6 Mon Sep 17 00:00:00 2001 From: Kevin Marrec Date: Fri, 1 Feb 2019 14:05:03 +0100 Subject: [PATCH 3/3] improvement(ts): transpileOnly when using `nuxt-ts start` (#4906) --- packages/typescript/src/index.js | 3 ++- packages/typescript/test/setup.test.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/typescript/src/index.js b/packages/typescript/src/index.js index 4631bdedd5..6cc30c8c49 100644 --- a/packages/typescript/src/index.js +++ b/packages/typescript/src/index.js @@ -47,6 +47,7 @@ export async function setup(tsConfigPath) { project: tsConfigPath, compilerOptions: { module: 'commonjs' - } + }, + transpileOnly: process.argv[2] === 'start' }) } diff --git a/packages/typescript/test/setup.test.js b/packages/typescript/test/setup.test.js index 2f50ed5829..54b0614274 100644 --- a/packages/typescript/test/setup.test.js +++ b/packages/typescript/test/setup.test.js @@ -38,7 +38,8 @@ describe('typescript setup', () => { project: tsConfigPath, compilerOptions: { module: 'commonjs' - } + }, + transpileOnly: false }) })