diff --git a/package.json b/package.json index c89aebf0f18..39dbfdf47e9 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "@rollup/plugin-node-resolve": "^7.1.1", "@rollup/plugin-replace": "^2.2.1", "@types/jest": "^25.1.4", + "@types/node": "13.11.1", "@types/puppeteer": "^2.0.0", "brotli": "^1.3.2", "chalk": "^2.4.2", diff --git a/packages/compiler-sfc/src/templateTransformAssetUrl.ts b/packages/compiler-sfc/src/templateTransformAssetUrl.ts index 3232c15bb35..b981bf67071 100644 --- a/packages/compiler-sfc/src/templateTransformAssetUrl.ts +++ b/packages/compiler-sfc/src/templateTransformAssetUrl.ts @@ -69,8 +69,8 @@ export const transformAssetUrl: NodeTransform = ( } function getImportsExpressionExp( - path: string | undefined, - hash: string | undefined, + path: string | null, + hash: string | null, loc: SourceLocation, context: TransformContext ): ExpressionNode { diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts index 39d7414a11f..5b26aec108b 100644 --- a/packages/reactivity/src/ref.ts +++ b/packages/reactivity/src/ref.ts @@ -151,9 +151,6 @@ type SymbolExtract = (T extends { [Symbol.asyncIterator]: infer V } (T extends { [Symbol.iterator]: infer V } ? { [Symbol.iterator]: V } : {}) & (T extends { [Symbol.match]: infer V } ? { [Symbol.match]: V } : {}) & (T extends { [Symbol.matchAll]: infer V } ? { [Symbol.matchAll]: V } : {}) & - (T extends { [Symbol.observable]: infer V } - ? { [Symbol.observable]: V } - : {}) & (T extends { [Symbol.replace]: infer V } ? { [Symbol.replace]: V } : {}) & (T extends { [Symbol.search]: infer V } ? { [Symbol.search]: V } : {}) & (T extends { [Symbol.species]: infer V } ? { [Symbol.species]: V } : {}) & diff --git a/packages/template-explorer/src/index.ts b/packages/template-explorer/src/index.ts index f5579fbd6bf..e16c1b62571 100644 --- a/packages/template-explorer/src/index.ts +++ b/packages/template-explorer/src/index.ts @@ -97,7 +97,7 @@ window.init = () => { } } - const sharedEditorOptions: m.editor.IEditorConstructionOptions = { + const sharedEditorOptions: m.editor.IStandaloneEditorConstructionOptions = { theme: 'vs-dark', fontSize: 14, wordWrap: 'on', diff --git a/yarn.lock b/yarn.lock index 46783b009b6..8be1b15114b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -843,6 +843,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c" integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg== +"@types/node@13.11.1": + version "13.11.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.1.tgz#49a2a83df9d26daacead30d0ccc8762b128d53c7" + integrity sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g== + "@types/prettier@^1.19.0": version "1.19.1" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f"