From 0c635afb1b600998feec15752c0c191ff656f374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= Date: Fri, 3 May 2019 13:31:50 +0200 Subject: [PATCH 1/3] chore: prefer .tsx? files over .jsx? file extensions (#3909) close #3898 --- packages/@vue/cli-plugin-typescript/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/@vue/cli-plugin-typescript/index.js b/packages/@vue/cli-plugin-typescript/index.js index 2649564635..8d65a125dd 100644 --- a/packages/@vue/cli-plugin-typescript/index.js +++ b/packages/@vue/cli-plugin-typescript/index.js @@ -15,7 +15,8 @@ module.exports = (api, options) => { config.resolve .extensions - .merge(['.ts', '.tsx']) + .prepend('.ts') + .prepend('.tsx') const tsRule = config.module.rule('ts').test(/\.ts$/) const tsxRule = config.module.rule('tsx').test(/\.tsx$/) From f99645cfcd47269eeb1fff4284d0c2a0996ec07d Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Sat, 4 May 2019 00:21:37 +0800 Subject: [PATCH 2/3] chore: joi -> @hapi/joi --- packages/@vue/cli-shared-utils/lib/validate.js | 6 +++--- packages/@vue/cli-shared-utils/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/@vue/cli-shared-utils/lib/validate.js b/packages/@vue/cli-shared-utils/lib/validate.js index 995a2cc026..bb2b27754e 100644 --- a/packages/@vue/cli-shared-utils/lib/validate.js +++ b/packages/@vue/cli-shared-utils/lib/validate.js @@ -1,10 +1,10 @@ const { exit } = require('./exit') // proxy to joi for option validation -exports.createSchema = fn => fn(require('joi')) +exports.createSchema = fn => fn(require('@hapi/joi')) exports.validate = (obj, schema, cb) => { - require('joi').validate(obj, schema, {}, err => { + require('@hapi/joi').validate(obj, schema, {}, err => { if (err) { cb(err.message) if (process.env.VUE_CLI_TEST) { @@ -17,7 +17,7 @@ exports.validate = (obj, schema, cb) => { } exports.validateSync = (obj, schema) => { - const result = require('joi').validate(obj, schema) + const result = require('@hapi/joi').validate(obj, schema) if (result.error) { throw result.error } diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json index 35481c2f74..867989199d 100644 --- a/packages/@vue/cli-shared-utils/package.json +++ b/packages/@vue/cli-shared-utils/package.json @@ -20,9 +20,9 @@ }, "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-shared-utils#readme", "dependencies": { + "@hapi/joi": "^15.0.1", "chalk": "^2.4.1", "execa": "^1.0.0", - "joi": "^14.3.0", "launch-editor": "^2.2.1", "lru-cache": "^5.1.1", "node-ipc": "^9.1.1", From 341286b708cfa28c0fc5967b7d569d4eb2c76f26 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Sat, 4 May 2019 00:24:46 +0800 Subject: [PATCH 3/3] chore: remove extraneous log statement --- packages/@vue/cli-service/lib/PluginAPI.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/@vue/cli-service/lib/PluginAPI.js b/packages/@vue/cli-service/lib/PluginAPI.js index a25d04a358..d3672d4ed1 100644 --- a/packages/@vue/cli-service/lib/PluginAPI.js +++ b/packages/@vue/cli-service/lib/PluginAPI.js @@ -24,7 +24,6 @@ class PluginAPI { assertVersion (range) { if (typeof range === 'number') { - console.log(range, Number.isInteger(range)) if (!Number.isInteger(range)) { throw new Error('Expected string or integer value.') }