From 1a42be3fdde8a8881b6bf59cbca1fbaad4c94e87 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Wed, 27 Jun 2018 22:34:08 +0530 Subject: [PATCH 01/44] fix: Add scope ID only if scoped style is present Fixes #75 --- src/assembler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assembler.ts b/src/assembler.ts index 2c554f6..ce378b0 100644 --- a/src/assembler.ts +++ b/src/assembler.ts @@ -335,7 +335,7 @@ export function assembleFromSource( })} } : undefined /* scoped */ - const __vue_scope_id__ = ${e(hasScopedStyle) ? e(scopeId) : 'undefined'} + const __vue_scope_id__ = ${hasScopedStyle ? e(scopeId) : 'undefined'} /* module identifier */ const __vue_module_identifier__ = ${ compiler.template.optimizeSSR ? e(scopeId) : 'undefined' From 86ae2f6362ad3e0d2e3043faf653275b3281dd68 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Wed, 27 Jun 2018 22:35:33 +0530 Subject: [PATCH 02/44] chore(release): 3.4.1 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a88369e..eb8c1c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [3.4.1](https://github.com/vuejs/vue-component-compiler/compare/v3.4.0...v3.4.1) (2018-06-27) + + +### Bug Fixes + +* Add scope ID only if scoped style is present ([1a42be3](https://github.com/vuejs/vue-component-compiler/commit/1a42be3)), closes [#75](https://github.com/vuejs/vue-component-compiler/issues/75) + + + # [3.4.0](https://github.com/vuejs/vue-component-compiler/compare/v3.3.3...v3.4.0) (2018-06-24) diff --git a/package.json b/package.json index 0a6d9f4..c3b978f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "3.4.0", + "version": "3.4.1", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From 89f363444202d264291f0f5a335b45a319ceb645 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Fri, 13 Jul 2018 13:43:32 +0530 Subject: [PATCH 03/44] chore: Bump @vue/component-compiler --- package.json | 2 +- src/compiler.ts | 5 ++++- yarn.lock | 14 +++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index c3b978f..9788fd7 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "vue-template-compiler": "*" }, "dependencies": { - "@vue/component-compiler-utils": "^1.2.1", + "@vue/component-compiler-utils": "^2.1.0", "clean-css": "^4.1.11", "hash-sum": "^1.0.2", "postcss-modules-sync": "^1.0.0", diff --git a/src/compiler.ts b/src/compiler.ts index ca11eb7..48b3022 100644 --- a/src/compiler.ts +++ b/src/compiler.ts @@ -18,6 +18,8 @@ import hash = require('hash-sum') import * as fs from 'fs' import * as path from 'path' +const templateCompiler = require('vue-template-compiler') + export interface TemplateOptions { compiler: VueTemplateCompiler compilerOptions: VueTemplateCompilerOptions @@ -85,7 +87,8 @@ export class SFCCompiler { const descriptor = parse({ source, filename, - needMap: true + needMap: true, + compiler: templateCompiler }) const scopeId = diff --git a/yarn.lock b/yarn.lock index b4725cd..f9507a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -46,9 +46,9 @@ version "9.6.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.7.tgz#5f3816d1db2155edcde1b2e3aa5d0e5c520cb564" -"@vue/component-compiler-utils@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-1.2.1.tgz#3d543baa75cfe5dab96e29415b78366450156ef6" +"@vue/component-compiler-utils@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.1.0.tgz#8331eadc8acdbc35aace5a61d2153e6f6434bfe2" dependencies: consolidate "^0.15.1" hash-sum "^1.0.2" @@ -56,7 +56,7 @@ merge-source-map "^1.1.0" postcss "^6.0.20" postcss-selector-parser "^3.1.1" - prettier "^1.11.1" + prettier "^1.13.7" source-map "^0.5.6" vue-template-es2015-compiler "^1.6.0" @@ -3771,9 +3771,9 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.11.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325" +prettier@^1.13.7: + version "1.13.7" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" pretty-format@^22.4.3: version "22.4.3" From 8ef7d8f3a090c7442b48c67304044a8928f7fbda Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Fri, 13 Jul 2018 13:44:35 +0530 Subject: [PATCH 04/44] chore(release): 3.4.2 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb8c1c9..d13f005 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [3.4.2](https://github.com/vuejs/vue-component-compiler/compare/v3.4.1...v3.4.2) (2018-07-13) + + + ## [3.4.1](https://github.com/vuejs/vue-component-compiler/compare/v3.4.0...v3.4.1) (2018-06-27) diff --git a/package.json b/package.json index 9788fd7..4c4a816 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "3.4.1", + "version": "3.4.2", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From 541a82483d4ea44b010e2394a65875819a094ad0 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 31 Jul 2018 12:49:11 +0200 Subject: [PATCH 05/44] fix: Use basename for __file in production mode --- src/assembler.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/assembler.ts b/src/assembler.ts index ce378b0..112bc16 100644 --- a/src/assembler.ts +++ b/src/assembler.ts @@ -1,6 +1,7 @@ import { SourceMapGenerator } from 'source-map' import { SFCCompiler, DescriptorCompileResult } from './compiler' import { merge } from './source-map' +import * as path from 'path' // const merge = require('merge-source-map') @@ -221,9 +222,8 @@ export function assembleFromSource( ) { const component = (typeof script === 'function' ? script.options : script) || {} - if (${e(!compiler.template.isProduction)}) { - component.__file = ${e(filename)} - } + // For security concerns, we use only base name in production mode. + component.__file = ${compiler.template.isProduction ? e(path.basename(filename)) : e(filename)} if (!component.render) { component.render = template.render @@ -302,7 +302,7 @@ export function assembleFromSource( .replace('var staticRenderFns =', 'var __vue_staticRenderFns__ =') .replace('render._withStripped =', '__vue_render__._withStripped =')} /* style */ - const __vue_inject_styles__ = ${hasStyle} ? function (inject) { + const __vue_inject_styles__ = ${hasStyle ? `function (inject) { if (!inject) return ${styles.map((style, index) => { const source = IDENTIFIER.test(style.source) @@ -333,7 +333,7 @@ export function assembleFromSource( : '') ) })} - } : undefined + }` : 'undefined'} /* scoped */ const __vue_scope_id__ = ${hasScopedStyle ? e(scopeId) : 'undefined'} /* module identifier */ From e2833fb52ed777fcb5cd3a3d37436f3ecf40987b Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 31 Jul 2018 13:19:38 +0200 Subject: [PATCH 06/44] chore(release): 3.4.3 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d13f005..37632eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [3.4.3](https://github.com/vuejs/vue-component-compiler/compare/v3.4.2...v3.4.3) (2018-07-31) + + +### Bug Fixes + +* Use basename for __file in production mode ([541a824](https://github.com/vuejs/vue-component-compiler/commit/541a824)) + + + ## [3.4.2](https://github.com/vuejs/vue-component-compiler/compare/v3.4.1...v3.4.2) (2018-07-13) diff --git a/package.json b/package.json index 4c4a816..70d0629 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "3.4.2", + "version": "3.4.3", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From e05ed45a5df26680314f523e209f9f015ed82c55 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 31 Jul 2018 13:22:16 +0200 Subject: [PATCH 07/44] chore: Remove extra files from npm package --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 70d0629..c7380c3 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,9 @@ }, "main": "dist/index.js", "typings": "dist/index.d.ts", + "files": [ + "dist" + ], "scripts": { "build": "tsc", "prepare": "yarn build", From ed5874d68fd31f3ad8b46ea03c5c4cccdc18ecf9 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 31 Jul 2018 13:22:20 +0200 Subject: [PATCH 08/44] chore(release): 3.4.4 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37632eb..9e11114 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [3.4.4](https://github.com/vuejs/vue-component-compiler/compare/v3.4.3...v3.4.4) (2018-07-31) + + + ## [3.4.3](https://github.com/vuejs/vue-component-compiler/compare/v3.4.2...v3.4.3) (2018-07-31) diff --git a/package.json b/package.json index c7380c3..21e4890 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "3.4.3", + "version": "3.4.4", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From 78a2da36e71220050d743830bbd5aaac62756219 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 31 Jul 2018 16:36:32 +0200 Subject: [PATCH 09/44] fix: Do not generate style injector code if component has no style --- src/assembler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assembler.ts b/src/assembler.ts index 112bc16..e7cdb3b 100644 --- a/src/assembler.ts +++ b/src/assembler.ts @@ -345,9 +345,9 @@ export function assembleFromSource( /* component normalizer */ ${normalizeComponent} /* style inject */ - ${!compiler.template.optimizeSSR ? createInjector : ''} + ${hasStyle && !compiler.template.optimizeSSR ? createInjector : ''} /* style inject SSR */ - ${compiler.template.optimizeSSR ? createInjectorSSR : ''} + ${hasStyle && compiler.template.optimizeSSR ? createInjectorSSR : ''} ` From 3c31e95ccd1337affb4ed89febfea06ce98596ee Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 28 Aug 2018 06:24:06 +0530 Subject: [PATCH 10/44] chore(release): 3.4.5 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e11114..30553b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [3.4.5](https://github.com/vuejs/vue-component-compiler/compare/v3.4.4...v3.4.5) (2018-08-28) + + +### Bug Fixes + +* Do not generate style injector code if component has no style ([78a2da3](https://github.com/vuejs/vue-component-compiler/commit/78a2da3)) + + + ## [3.4.4](https://github.com/vuejs/vue-component-compiler/compare/v3.4.3...v3.4.4) (2018-07-31) diff --git a/package.json b/package.json index 21e4890..4b4b941 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "3.4.4", + "version": "3.4.5", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From 9d43b80f3b239f54a0d59967f6396be3fccc2729 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 28 Aug 2018 06:32:29 +0530 Subject: [PATCH 11/44] feat: Allow disabling clean CSS --- src/compiler.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/compiler.ts b/src/compiler.ts index 48b3022..3389879 100644 --- a/src/compiler.ts +++ b/src/compiler.ts @@ -155,6 +155,8 @@ export class SFCCompiler { let tokens = undefined const needsCSSModules = style.module === true || typeof style.module === 'string' + const needsCleanCSS = + this.template.isProduction && !(this.style.postcssCleanOptions && this.style.postcssCleanOptions.disabled) const postcssPlugins = [ needsCSSModules ? postcssModules({ @@ -165,7 +167,7 @@ export class SFCCompiler { } }) : undefined, - this.template.isProduction + needsCleanCSS ? postcssClean(this.style.postcssCleanOptions) : undefined ] From 880afca132a54b57ec46efc8a8c007fd42cfbf40 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 28 Aug 2018 06:33:05 +0530 Subject: [PATCH 12/44] chore(release): 3.5.0 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30553b7..ecc5fbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +# [3.5.0](https://github.com/vuejs/vue-component-compiler/compare/v3.4.5...v3.5.0) (2018-08-28) + + +### Features + +* Allow disabling clean CSS ([9d43b80](https://github.com/vuejs/vue-component-compiler/commit/9d43b80)) + + + ## [3.4.5](https://github.com/vuejs/vue-component-compiler/compare/v3.4.4...v3.4.5) (2018-08-28) diff --git a/package.json b/package.json index 4b4b941..26f876a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "3.4.5", + "version": "3.5.0", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From ccf7d8476451ab0eb3035a7d27af239dad8865dd Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 28 Aug 2018 07:25:05 +0530 Subject: [PATCH 13/44] feat: Add compileToDescriptorAsync and compileStyleAsync methods --- package.json | 8 +- src/compiler.ts | 112 +- test/__snapshots__/compile.spec.ts.snap | 1251 +++++++++++++++++++++++ test/compile.spec.ts | 46 +- 4 files changed, 1390 insertions(+), 27 deletions(-) create mode 100644 test/__snapshots__/compile.spec.ts.snap diff --git a/package.json b/package.json index 26f876a..5299ad1 100644 --- a/package.json +++ b/package.json @@ -23,11 +23,11 @@ ], "scripts": { "build": "tsc", - "prepare": "yarn build", + "prepare": "rm -rf dist && npm run build", + "pretest": "npm run build", "test": "jest", - "pretest": "yarn build", - "changelog": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s", - "version": "npm run changelog && git add CHANGELOG.md" + "prerelease": "npm run test", + "release": "standard-version -a" }, "homepage": "https://github.com/vuejs/vue-component-compiler#readme", "devDependencies": { diff --git a/src/compiler.ts b/src/compiler.ts index 3389879..f1b81da 100644 --- a/src/compiler.ts +++ b/src/compiler.ts @@ -2,9 +2,11 @@ import { parse, compileTemplate, compileStyle, + compileStyleAsync, SFCBlock, StyleCompileResults, - TemplateCompileResult + TemplateCompileResult, + StyleCompileOptions } from '@vue/component-compiler-utils' import { VueTemplateCompiler, @@ -14,10 +16,10 @@ import { AssetURLOptions } from '@vue/component-compiler-utils/dist/templateComp import postcssModules from 'postcss-modules-sync' import postcssClean from './postcss-clean' -import hash = require('hash-sum') import * as fs from 'fs' import * as path from 'path' +const hash = require('hash-sum') const templateCompiler = require('vue-template-compiler') export interface TemplateOptions { @@ -121,6 +123,49 @@ export class SFCCompiler { } } + async compileToDescriptorAsync( + filename: string, + source: string + ): Promise { + const descriptor = parse({ + source, + filename, + needMap: true, + compiler: templateCompiler + }) + + const scopeId = + 'data-v-' + + (this.template.isProduction + ? hash(path.basename(filename) + source) + : hash(filename + source)) + + const template = + descriptor.template && this.compileTemplate(filename, descriptor.template) + + const styles = await Promise.all( + descriptor.styles.map(style => + this.compileStyleAsync(filename, scopeId, style) + ) + ) + + const { script: rawScript, customBlocks } = descriptor + const script = rawScript && { + code: rawScript.src + ? this.read(rawScript.src, filename) + : rawScript.content, + map: rawScript.map + } + + return { + scopeId, + template, + styles, + script, + customBlocks + } + } + compileTemplate( filename: string, template: SFCBlock @@ -152,7 +197,28 @@ export class SFCCompiler { scopeId: string, style: SFCBlock ): StyleCompileResult { - let tokens = undefined + const { options, prepare } = this.doCompileStyle(filename, scopeId, style) + + return prepare(compileStyle(options)) + } + + async compileStyleAsync( + filename: string, + scopeId: string, + style: SFCBlock + ): Promise { + const { options, prepare } = this.doCompileStyle(filename, scopeId, style) + + return prepare(await compileStyleAsync(options)) + } + + private doCompileStyle( + filename: string, + scopeId: string, + style: SFCBlock + ): { options: StyleCompileOptions, prepare: (result: StyleCompileResults) => StyleCompileResult } { + let tokens: any = undefined + const needsCSSModules = style.module === true || typeof style.module === 'string' const needsCleanCSS = @@ -179,26 +245,28 @@ export class SFCCompiler { this.style.preprocessOptions[style.lang]) || {} const source = style.src ? this.read(style.src, filename) : style.content - const result = compileStyle({ - source: preprocessOptions.data ? `${preprocessOptions.data}\n${source}` : source, - filename, - id: scopeId, - map: style.map, - scoped: style.scoped || false, - postcssPlugins, - postcssOptions: this.style.postcssOptions, - preprocessLang: style.lang, - preprocessOptions, - trim: this.style.trim - }) - return { - media: style.attrs.media, - scoped: style.scoped, - moduleName: style.module === true ? '$style' : style.module, - module: tokens, - ...result, - code: result.code + options: { + source: preprocessOptions.data ? `${preprocessOptions.data}\n${source}` : source, + filename, + id: scopeId, + map: style.map, + scoped: style.scoped || false, + postcssPlugins, + postcssOptions: this.style.postcssOptions, + preprocessLang: style.lang, + preprocessOptions, + trim: this.style.trim + }, + + prepare: result => ({ + media: style.attrs.media, + scoped: style.scoped, + moduleName: style.module === true ? '$style' : style.module, + module: tokens, + ...result, + code: result.code + }) } } diff --git a/test/__snapshots__/compile.spec.ts.snap b/test/__snapshots__/compile.spec.ts.snap new file mode 100644 index 0000000..692f1bc --- /dev/null +++ b/test/__snapshots__/compile.spec.ts.snap @@ -0,0 +1,1251 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should compile to descriptor (async) 1`] = ` +Object { + "customBlocks": Array [], + "scopeId": "data-v-01ebe570", + "script": Object { + "code": "// +// +// +// +// + +export default { + data () { + return { name: 'John Doe' } + } +} +", + "map": Object { + "file": "foo.vue", + "mappings": ";;;;;;AAMA;AACA;AACA;AACA;AACA", + "names": Array [], + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sources": Array [ + "foo.vue", + ], + "sourcesContent": Array [ + " + + + + + +", + ], + "version": 3, + }, + }, + "styles": Array [ + Object { + "code": " +.title { + color: red; +} +", + "errors": Array [], + "map": Object { + "file": "foo.vue", + "mappings": ";AAcA;EACA,WAAA;CACA", + "names": Array [], + "sources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "sourcesContent": Array [ + " + + + + + +", + ], + "version": 3, + }, + "media": undefined, + "module": undefined, + "moduleName": undefined, + "rawResult": Result { + "css": " +.title { + color: red; +} +", + "lastPlugin": [Function], + "map": Object { + "file": "foo.vue", + "mappings": ";AAcA;EACA,WAAA;CACA", + "names": Array [], + "sources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "sourcesContent": Array [ + " + + + + + +", + ], + "version": 3, + }, + "messages": Array [], + "opts": Object { + "from": "foo.vue", + "map": Object { + "annotation": false, + "inline": false, + "prev": Object { + "file": "foo.vue", + "mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", + "names": Array [], + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sources": Array [ + "foo.vue", + ], + "sourcesContent": Array [ + " + + + + + +", + ], + "version": 3, + }, + }, + "to": "foo.vue", + }, + "processor": Processor { + "plugins": Array [ + [Function], + ], + "version": "6.0.21", + }, + "root": Object { + "indexes": Object {}, + "lastEach": 3, + "nodes": Array [ + Object { + "indexes": Object {}, + "lastEach": 3, + "nodes": Array [ + Object { + "prop": "color", + "raws": Object { + "before": " + ", + "between": ": ", + }, + "source": Object { + "end": Object { + "column": 13, + "line": 16, + }, + "input": Input { + "css": " + + + + + + + + + + + + + +.title { + color: red; +} +", + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "map": PreviousMap { + "consumerCache": SourceMapConsumer { + "__generatedMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "__originalMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "_absoluteSources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", + "_names": ArraySet { + "_array": Array [], + "_set": Map {}, + }, + "_sourceMapURL": undefined, + "_sources": ArraySet { + "_array": Array [ + "foo.vue", + ], + "_set": Map { + "foo.vue" => 0, + }, + }, + "file": "foo.vue", + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sourcesContent": Array [ + " + + + + + +", + ], + }, + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "inline": false, + "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", + }, + }, + "start": Object { + "column": 3, + "line": 16, + }, + }, + "type": "decl", + "value": "red", + }, + ], + "raws": Object { + "after": " +", + "before": " +", + "between": " ", + "semicolon": true, + }, + "selector": ".title", + "source": Object { + "end": Object { + "column": 1, + "line": 17, + }, + "input": Input { + "css": " + + + + + + + + + + + + + +.title { + color: red; +} +", + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "map": PreviousMap { + "consumerCache": SourceMapConsumer { + "__generatedMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "__originalMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "_absoluteSources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", + "_names": ArraySet { + "_array": Array [], + "_set": Map {}, + }, + "_sourceMapURL": undefined, + "_sources": ArraySet { + "_array": Array [ + "foo.vue", + ], + "_set": Map { + "foo.vue" => 0, + }, + }, + "file": "foo.vue", + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sourcesContent": Array [ + " + + + + + +", + ], + }, + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "inline": false, + "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", + }, + }, + "start": Object { + "column": 1, + "line": 15, + }, + }, + "type": "rule", + }, + ], + "raws": Object { + "after": " +", + "semicolon": false, + }, + "source": Object { + "input": Input { + "css": " + + + + + + + + + + + + + +.title { + color: red; +} +", + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "map": PreviousMap { + "consumerCache": SourceMapConsumer { + "__generatedMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "__originalMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "_absoluteSources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", + "_names": ArraySet { + "_array": Array [], + "_set": Map {}, + }, + "_sourceMapURL": undefined, + "_sources": ArraySet { + "_array": Array [ + "foo.vue", + ], + "_set": Map { + "foo.vue" => 0, + }, + }, + "file": "foo.vue", + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sourcesContent": Array [ + " + + + + + +", + ], + }, + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "inline": false, + "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", + }, + }, + "start": Object { + "column": 1, + "line": 1, + }, + }, + "type": "root", + }, + }, + "scoped": undefined, + }, + ], + "template": Object { + "code": "var render = function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c(\\"h1\\", { staticClass: \\"title\\", attrs: { id: \\"test\\" } }, [ + _vm._v(\\"Hello \\" + _vm._s(_vm.name) + \\"!\\") + ]) +} +var staticRenderFns = [] +render._withStripped = true +", + "errors": Array [], + "functional": false, + "source": " +

Hello {{ name }}!

+", + "tips": Array [], + }, +} +`; + +exports[`should compile to descriptor 1`] = ` +Object { + "customBlocks": Array [], + "scopeId": "data-v-01ebe570", + "script": Object { + "code": "// +// +// +// +// + +export default { + data () { + return { name: 'John Doe' } + } +} +", + "map": Object { + "file": "foo.vue", + "mappings": ";;;;;;AAMA;AACA;AACA;AACA;AACA", + "names": Array [], + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sources": Array [ + "foo.vue", + ], + "sourcesContent": Array [ + " + + + + + +", + ], + "version": 3, + }, + }, + "styles": Array [ + Object { + "code": " +.title { + color: red; +} +", + "errors": Array [], + "map": Object { + "file": "foo.vue", + "mappings": ";AAcA;EACA,WAAA;CACA", + "names": Array [], + "sources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "sourcesContent": Array [ + " + + + + + +", + ], + "version": 3, + }, + "media": undefined, + "module": undefined, + "moduleName": undefined, + "rawResult": LazyResult { + "processed": true, + "result": Result { + "css": " +.title { + color: red; +} +", + "lastPlugin": [Function], + "map": Object { + "file": "foo.vue", + "mappings": ";AAcA;EACA,WAAA;CACA", + "names": Array [], + "sources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "sourcesContent": Array [ + " + + + + + +", + ], + "version": 3, + }, + "messages": Array [], + "opts": Object { + "from": "foo.vue", + "map": Object { + "annotation": false, + "inline": false, + "prev": Object { + "file": "foo.vue", + "mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", + "names": Array [], + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sources": Array [ + "foo.vue", + ], + "sourcesContent": Array [ + " + + + + + +", + ], + "version": 3, + }, + }, + "to": "foo.vue", + }, + "processor": Processor { + "plugins": Array [ + [Function], + ], + "version": "6.0.21", + }, + "root": Object { + "indexes": Object {}, + "lastEach": 3, + "nodes": Array [ + Object { + "indexes": Object {}, + "lastEach": 3, + "nodes": Array [ + Object { + "prop": "color", + "raws": Object { + "before": " + ", + "between": ": ", + }, + "source": Object { + "end": Object { + "column": 13, + "line": 16, + }, + "input": Input { + "css": " + + + + + + + + + + + + + +.title { + color: red; +} +", + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "map": PreviousMap { + "consumerCache": SourceMapConsumer { + "__generatedMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "__originalMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "_absoluteSources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", + "_names": ArraySet { + "_array": Array [], + "_set": Map {}, + }, + "_sourceMapURL": undefined, + "_sources": ArraySet { + "_array": Array [ + "foo.vue", + ], + "_set": Map { + "foo.vue" => 0, + }, + }, + "file": "foo.vue", + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sourcesContent": Array [ + " + + + + + +", + ], + }, + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "inline": false, + "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", + }, + }, + "start": Object { + "column": 3, + "line": 16, + }, + }, + "type": "decl", + "value": "red", + }, + ], + "raws": Object { + "after": " +", + "before": " +", + "between": " ", + "semicolon": true, + }, + "selector": ".title", + "source": Object { + "end": Object { + "column": 1, + "line": 17, + }, + "input": Input { + "css": " + + + + + + + + + + + + + +.title { + color: red; +} +", + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "map": PreviousMap { + "consumerCache": SourceMapConsumer { + "__generatedMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "__originalMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "_absoluteSources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", + "_names": ArraySet { + "_array": Array [], + "_set": Map {}, + }, + "_sourceMapURL": undefined, + "_sources": ArraySet { + "_array": Array [ + "foo.vue", + ], + "_set": Map { + "foo.vue" => 0, + }, + }, + "file": "foo.vue", + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sourcesContent": Array [ + " + + + + + +", + ], + }, + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "inline": false, + "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", + }, + }, + "start": Object { + "column": 1, + "line": 15, + }, + }, + "type": "rule", + }, + ], + "raws": Object { + "after": " +", + "semicolon": false, + }, + "source": Object { + "input": Input { + "css": " + + + + + + + + + + + + + +.title { + color: red; +} +", + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "map": PreviousMap { + "consumerCache": SourceMapConsumer { + "__generatedMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "__originalMappings": Array [ + Mapping { + "generatedColumn": 0, + "generatedLine": 15, + "name": null, + "originalColumn": 0, + "originalLine": 15, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 16, + "name": null, + "originalColumn": 0, + "originalLine": 16, + "source": 0, + }, + Mapping { + "generatedColumn": 0, + "generatedLine": 17, + "name": null, + "originalColumn": 0, + "originalLine": 17, + "source": 0, + }, + ], + "_absoluteSources": Array [ + "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + ], + "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", + "_names": ArraySet { + "_array": Array [], + "_set": Map {}, + }, + "_sourceMapURL": undefined, + "_sources": ArraySet { + "_array": Array [ + "foo.vue", + ], + "_set": Map { + "foo.vue" => 0, + }, + }, + "file": "foo.vue", + "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sourcesContent": Array [ + " + + + + + +", + ], + }, + "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "inline": false, + "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", + }, + }, + "start": Object { + "column": 1, + "line": 1, + }, + }, + "type": "root", + }, + }, + "stringified": true, + }, + "scoped": undefined, + }, + ], + "template": Object { + "code": "var render = function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c(\\"h1\\", { staticClass: \\"title\\", attrs: { id: \\"test\\" } }, [ + _vm._v(\\"Hello \\" + _vm._s(_vm.name) + \\"!\\") + ]) +} +var staticRenderFns = [] +render._withStripped = true +", + "errors": Array [], + "functional": false, + "source": " +

Hello {{ name }}!

+", + "tips": Array [], + }, +} +`; diff --git a/test/compile.spec.ts b/test/compile.spec.ts index 68f1f40..858037f 100644 --- a/test/compile.spec.ts +++ b/test/compile.spec.ts @@ -1,4 +1,4 @@ -import {createDefaultCompiler} from "../src" +import {createDefaultCompiler, DescriptorCompileResult} from "../src" it('should prepend data scss option to actual style', () => { const compiler = createDefaultCompiler({ @@ -16,3 +16,47 @@ it('should prepend data scss option to actual style', () => { expect(result.code).toEqual(expect.stringContaining('color: red')) }) + +const source = ` + + + + + +` + +it('should compile to descriptor', () => { + const compiler = createDefaultCompiler() + const result = compiler.compileToDescriptor('foo.vue', source) + + expect(result).toMatchSnapshot() +}) + +it('should compile to descriptor (async)', async () => { + const compiler = createDefaultCompiler() + const expected = compiler.compileToDescriptor('foo.vue', source) + const result = await compiler.compileToDescriptorAsync('foo.vue', source) + + function removeRawResult(result: DescriptorCompileResult): DescriptorCompileResult { + result.styles.map(style => { + delete style.rawResult + }) + + return result + } + + expect(result).toMatchSnapshot() + expect(removeRawResult(result)).toEqual(removeRawResult(expected)) +}) From ba54f6e9c24f61c750d99f25492885b7671c81dc Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 28 Aug 2018 07:29:26 +0530 Subject: [PATCH 14/44] chore(release): 3.6.0 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecc5fbb..2b5dfee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +# [3.6.0](https://github.com/vuejs/vue-component-compiler/compare/v3.5.0...v3.6.0) (2018-08-28) + + +### Features + +* Add compileToDescriptorAsync and compileStyleAsync methods ([ccf7d84](https://github.com/vuejs/vue-component-compiler/commit/ccf7d84)) + + + # [3.5.0](https://github.com/vuejs/vue-component-compiler/compare/v3.4.5...v3.5.0) (2018-08-28) diff --git a/package.json b/package.json index 5299ad1..aa25dd9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "3.5.0", + "version": "3.6.0", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From afa1cd440123e2e0c195908c1e15935273ac64a9 Mon Sep 17 00:00:00 2001 From: Luke Watts Date: Sun, 23 Sep 2018 15:23:36 +0100 Subject: [PATCH 15/44] chore: typo (#78) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f2cc4f2..f13e8bd 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ > High level utilities for compiling Vue single file components -This package contains hid level utilities that you can use if you are writing a plugin / transform for a bundler or module system that compiles Vue single file components into JavaScript. It is used in [rollup-plugin-vue](https://github.com/vuejs/rollup-plugin-vue) version 3 and above. +This package contains high level utilities that you can use if you are writing a plugin / transform for a bundler or module system that compiles Vue single file components into JavaScript. It is used in [rollup-plugin-vue](https://github.com/vuejs/rollup-plugin-vue) version 3 and above. The API surface is intentionally minimal - the goal is to reuse as much as possible while being as flexible as possible. From c4bcd403a182059a9c20396451c33fc0a888e9ac Mon Sep 17 00:00:00 2001 From: huochunpeng Date: Sat, 2 Feb 2019 03:17:23 +1100 Subject: [PATCH 16/44] fix: normalize source map file path on windows (#83) * chore: upgrade packages, cleanup type errors Took the opportunity to update TS to latest version, cleanup all type errors. * fix: normalize source map file path on windows Updated test snapshot file. 1. Sources paths was cleaned up by upgrading component-compiler-utils. 2. Styles mapping changes are due to newer version of postcss (from component-compiler-utils). 3. postcss rawResult is removed. * The rawResult contains ast tree which postcss always prepends current working directory to referencing file name. * This is a main pain point of maintaining this snapshot test. * The correctness of rawResult is responsibility of postcss, not vue compiler. So it's irrelevant to test it here. This is a companion PR for vuejs/component-compiler-utils#51 --- package.json | 4 +- src/assembler.ts | 2 +- src/compiler.ts | 40 +- test/__snapshots__/compile.spec.ts.snap | 1032 +---------------------- test/compile.spec.ts | 20 +- yarn.lock | 127 ++- 6 files changed, 131 insertions(+), 1094 deletions(-) diff --git a/package.json b/package.json index aa25dd9..95fd6f9 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "rollup-plugin-image": "^1.0.2", "rollup-plugin-node-resolve": "^3.3.0", "ts-jest": "^22.4.2", - "typescript": "^2.7.2", + "typescript": "^3.2.4", "typescript-eslint-parser": "^15.0.0", "vue": "^2.5.16", "vue-template-compiler": "^2.5.16" @@ -57,7 +57,7 @@ "vue-template-compiler": "*" }, "dependencies": { - "@vue/component-compiler-utils": "^2.1.0", + "@vue/component-compiler-utils": "^2.5.2", "clean-css": "^4.1.11", "hash-sum": "^1.0.2", "postcss-modules-sync": "^1.0.0", diff --git a/src/assembler.ts b/src/assembler.ts index e7cdb3b..750b409 100644 --- a/src/assembler.ts +++ b/src/assembler.ts @@ -74,7 +74,7 @@ export function assembleFromSource( script = script || { source: 'export default {}' } template = template || { source: '' } let map = undefined - const mapGenerator = new SourceMapGenerator({ file: filename }) + const mapGenerator = new SourceMapGenerator({ file: filename.replace(/\\/g, '/') }) const hasScopedStyle = styles.some(style => style.scoped === true) const hasStyle = styles.some(style => style.source || style.module) diff --git a/src/compiler.ts b/src/compiler.ts index f1b81da..42ed177 100644 --- a/src/compiler.ts +++ b/src/compiler.ts @@ -99,20 +99,23 @@ export class SFCCompiler { ? hash(path.basename(filename) + source) : hash(filename + source)) - const template = - descriptor.template && this.compileTemplate(filename, descriptor.template) + const template = descriptor.template + ? this.compileTemplate(filename, descriptor.template) + : undefined const styles = descriptor.styles.map(style => this.compileStyle(filename, scopeId, style) ) const { script: rawScript, customBlocks } = descriptor - const script = rawScript && { - code: rawScript.src - ? this.read(rawScript.src, filename) - : rawScript.content, - map: rawScript.map - } + const script = rawScript + ? { + code: rawScript.src + ? this.read(rawScript.src, filename) + : rawScript.content, + map: rawScript.map + } + : undefined return { scopeId, @@ -140,8 +143,9 @@ export class SFCCompiler { ? hash(path.basename(filename) + source) : hash(filename + source)) - const template = - descriptor.template && this.compileTemplate(filename, descriptor.template) + const template = descriptor.template + ? this.compileTemplate(filename, descriptor.template) + : undefined const styles = await Promise.all( descriptor.styles.map(style => @@ -150,12 +154,14 @@ export class SFCCompiler { ) const { script: rawScript, customBlocks } = descriptor - const script = rawScript && { - code: rawScript.src - ? this.read(rawScript.src, filename) - : rawScript.content, - map: rawScript.map - } + const script = rawScript + ? { + code: rawScript.src + ? this.read(rawScript.src, filename) + : rawScript.content, + map: rawScript.map + } + : undefined return { scopeId, @@ -260,7 +266,7 @@ export class SFCCompiler { }, prepare: result => ({ - media: style.attrs.media, + media: typeof style.attrs.media === 'string' ? style.attrs.media : undefined, scoped: style.scoped, moduleName: style.module === true ? '$style' : style.module, module: tokens, diff --git a/test/__snapshots__/compile.spec.ts.snap b/test/__snapshots__/compile.spec.ts.snap index 692f1bc..2bda97a 100644 --- a/test/__snapshots__/compile.spec.ts.snap +++ b/test/__snapshots__/compile.spec.ts.snap @@ -21,7 +21,7 @@ export default { "file": "foo.vue", "mappings": ";;;;;;AAMA;AACA;AACA;AACA;AACA", "names": Array [], - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sourceRoot": "", "sources": Array [ "foo.vue", ], @@ -59,10 +59,10 @@ export default { "errors": Array [], "map": Object { "file": "foo.vue", - "mappings": ";AAcA;EACA,WAAA;CACA", + "mappings": ";AAcA;EACA,UAAA;AACA", "names": Array [], "sources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "foo.vue", ], "sourcesContent": Array [ " @@ -90,514 +90,6 @@ export default { "media": undefined, "module": undefined, "moduleName": undefined, - "rawResult": Result { - "css": " -.title { - color: red; -} -", - "lastPlugin": [Function], - "map": Object { - "file": "foo.vue", - "mappings": ";AAcA;EACA,WAAA;CACA", - "names": Array [], - "sources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - ], - "sourcesContent": Array [ - " - - - - - -", - ], - "version": 3, - }, - "messages": Array [], - "opts": Object { - "from": "foo.vue", - "map": Object { - "annotation": false, - "inline": false, - "prev": Object { - "file": "foo.vue", - "mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", - "names": Array [], - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", - "sources": Array [ - "foo.vue", - ], - "sourcesContent": Array [ - " - - - - - -", - ], - "version": 3, - }, - }, - "to": "foo.vue", - }, - "processor": Processor { - "plugins": Array [ - [Function], - ], - "version": "6.0.21", - }, - "root": Object { - "indexes": Object {}, - "lastEach": 3, - "nodes": Array [ - Object { - "indexes": Object {}, - "lastEach": 3, - "nodes": Array [ - Object { - "prop": "color", - "raws": Object { - "before": " - ", - "between": ": ", - }, - "source": Object { - "end": Object { - "column": 13, - "line": 16, - }, - "input": Input { - "css": " - - - - - - - - - - - - - -.title { - color: red; -} -", - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "map": PreviousMap { - "consumerCache": SourceMapConsumer { - "__generatedMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "__originalMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "_absoluteSources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - ], - "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", - "_names": ArraySet { - "_array": Array [], - "_set": Map {}, - }, - "_sourceMapURL": undefined, - "_sources": ArraySet { - "_array": Array [ - "foo.vue", - ], - "_set": Map { - "foo.vue" => 0, - }, - }, - "file": "foo.vue", - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", - "sourcesContent": Array [ - " - - - - - -", - ], - }, - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "inline": false, - "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", - }, - }, - "start": Object { - "column": 3, - "line": 16, - }, - }, - "type": "decl", - "value": "red", - }, - ], - "raws": Object { - "after": " -", - "before": " -", - "between": " ", - "semicolon": true, - }, - "selector": ".title", - "source": Object { - "end": Object { - "column": 1, - "line": 17, - }, - "input": Input { - "css": " - - - - - - - - - - - - - -.title { - color: red; -} -", - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "map": PreviousMap { - "consumerCache": SourceMapConsumer { - "__generatedMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "__originalMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "_absoluteSources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - ], - "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", - "_names": ArraySet { - "_array": Array [], - "_set": Map {}, - }, - "_sourceMapURL": undefined, - "_sources": ArraySet { - "_array": Array [ - "foo.vue", - ], - "_set": Map { - "foo.vue" => 0, - }, - }, - "file": "foo.vue", - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", - "sourcesContent": Array [ - " - - - - - -", - ], - }, - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "inline": false, - "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", - }, - }, - "start": Object { - "column": 1, - "line": 15, - }, - }, - "type": "rule", - }, - ], - "raws": Object { - "after": " -", - "semicolon": false, - }, - "source": Object { - "input": Input { - "css": " - - - - - - - - - - - - - -.title { - color: red; -} -", - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "map": PreviousMap { - "consumerCache": SourceMapConsumer { - "__generatedMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "__originalMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "_absoluteSources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - ], - "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", - "_names": ArraySet { - "_array": Array [], - "_set": Map {}, - }, - "_sourceMapURL": undefined, - "_sources": ArraySet { - "_array": Array [ - "foo.vue", - ], - "_set": Map { - "foo.vue" => 0, - }, - }, - "file": "foo.vue", - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", - "sourcesContent": Array [ - " - - - - - -", - ], - }, - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "inline": false, - "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", - }, - }, - "start": Object { - "column": 1, - "line": 1, - }, - }, - "type": "root", - }, - }, "scoped": undefined, }, ], @@ -644,7 +136,7 @@ export default { "file": "foo.vue", "mappings": ";;;;;;AAMA;AACA;AACA;AACA;AACA", "names": Array [], - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", + "sourceRoot": "", "sources": Array [ "foo.vue", ], @@ -682,10 +174,10 @@ export default { "errors": Array [], "map": Object { "file": "foo.vue", - "mappings": ";AAcA;EACA,WAAA;CACA", + "mappings": ";AAcA;EACA,UAAA;AACA", "names": Array [], "sources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", + "foo.vue", ], "sourcesContent": Array [ " @@ -713,518 +205,6 @@ export default { "media": undefined, "module": undefined, "moduleName": undefined, - "rawResult": LazyResult { - "processed": true, - "result": Result { - "css": " -.title { - color: red; -} -", - "lastPlugin": [Function], - "map": Object { - "file": "foo.vue", - "mappings": ";AAcA;EACA,WAAA;CACA", - "names": Array [], - "sources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - ], - "sourcesContent": Array [ - " - - - - - -", - ], - "version": 3, - }, - "messages": Array [], - "opts": Object { - "from": "foo.vue", - "map": Object { - "annotation": false, - "inline": false, - "prev": Object { - "file": "foo.vue", - "mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", - "names": Array [], - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", - "sources": Array [ - "foo.vue", - ], - "sourcesContent": Array [ - " - - - - - -", - ], - "version": 3, - }, - }, - "to": "foo.vue", - }, - "processor": Processor { - "plugins": Array [ - [Function], - ], - "version": "6.0.21", - }, - "root": Object { - "indexes": Object {}, - "lastEach": 3, - "nodes": Array [ - Object { - "indexes": Object {}, - "lastEach": 3, - "nodes": Array [ - Object { - "prop": "color", - "raws": Object { - "before": " - ", - "between": ": ", - }, - "source": Object { - "end": Object { - "column": 13, - "line": 16, - }, - "input": Input { - "css": " - - - - - - - - - - - - - -.title { - color: red; -} -", - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "map": PreviousMap { - "consumerCache": SourceMapConsumer { - "__generatedMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "__originalMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "_absoluteSources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - ], - "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", - "_names": ArraySet { - "_array": Array [], - "_set": Map {}, - }, - "_sourceMapURL": undefined, - "_sources": ArraySet { - "_array": Array [ - "foo.vue", - ], - "_set": Map { - "foo.vue" => 0, - }, - }, - "file": "foo.vue", - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", - "sourcesContent": Array [ - " - - - - - -", - ], - }, - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "inline": false, - "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", - }, - }, - "start": Object { - "column": 3, - "line": 16, - }, - }, - "type": "decl", - "value": "red", - }, - ], - "raws": Object { - "after": " -", - "before": " -", - "between": " ", - "semicolon": true, - }, - "selector": ".title", - "source": Object { - "end": Object { - "column": 1, - "line": 17, - }, - "input": Input { - "css": " - - - - - - - - - - - - - -.title { - color: red; -} -", - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "map": PreviousMap { - "consumerCache": SourceMapConsumer { - "__generatedMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "__originalMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "_absoluteSources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - ], - "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", - "_names": ArraySet { - "_array": Array [], - "_set": Map {}, - }, - "_sourceMapURL": undefined, - "_sources": ArraySet { - "_array": Array [ - "foo.vue", - ], - "_set": Map { - "foo.vue" => 0, - }, - }, - "file": "foo.vue", - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", - "sourcesContent": Array [ - " - - - - - -", - ], - }, - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "inline": false, - "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", - }, - }, - "start": Object { - "column": 1, - "line": 15, - }, - }, - "type": "rule", - }, - ], - "raws": Object { - "after": " -", - "semicolon": false, - }, - "source": Object { - "input": Input { - "css": " - - - - - - - - - - - - - -.title { - color: red; -} -", - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "map": PreviousMap { - "consumerCache": SourceMapConsumer { - "__generatedMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "__originalMappings": Array [ - Mapping { - "generatedColumn": 0, - "generatedLine": 15, - "name": null, - "originalColumn": 0, - "originalLine": 15, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 16, - "name": null, - "originalColumn": 0, - "originalLine": 16, - "source": 0, - }, - Mapping { - "generatedColumn": 0, - "generatedLine": 17, - "name": null, - "originalColumn": 0, - "originalLine": 17, - "source": 0, - }, - ], - "_absoluteSources": Array [ - "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - ], - "_mappings": ";;;;;;;;;;;;;;AAcA;AACA;AACA", - "_names": ArraySet { - "_array": Array [], - "_set": Map {}, - }, - "_sourceMapURL": undefined, - "_sources": ArraySet { - "_array": Array [ - "foo.vue", - ], - "_set": Map { - "foo.vue" => 0, - }, - }, - "file": "foo.vue", - "sourceRoot": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler", - "sourcesContent": Array [ - " - - - - - -", - ], - }, - "file": "/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler/foo.vue", - "inline": false, - "text": "{\\"version\\":3,\\"sources\\":[\\"foo.vue\\"],\\"names\\":[],\\"mappings\\":\\";;;;;;;;;;;;;;AAcA;AACA;AACA\\",\\"file\\":\\"foo.vue\\",\\"sourceRoot\\":\\"/Users/300005163/Workspace/OpenSource/vuejs/vue-component-compiler\\",\\"sourcesContent\\":[\\"\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\"]}", - }, - }, - "start": Object { - "column": 1, - "line": 1, - }, - }, - "type": "root", - }, - }, - "stringified": true, - }, "scoped": undefined, }, ], diff --git a/test/compile.spec.ts b/test/compile.spec.ts index 858037f..00e3a99 100644 --- a/test/compile.spec.ts +++ b/test/compile.spec.ts @@ -41,7 +41,7 @@ it('should compile to descriptor', () => { const compiler = createDefaultCompiler() const result = compiler.compileToDescriptor('foo.vue', source) - expect(result).toMatchSnapshot() + expect(removeRawResult(result)).toMatchSnapshot() }) it('should compile to descriptor (async)', async () => { @@ -49,14 +49,14 @@ it('should compile to descriptor (async)', async () => { const expected = compiler.compileToDescriptor('foo.vue', source) const result = await compiler.compileToDescriptorAsync('foo.vue', source) - function removeRawResult(result: DescriptorCompileResult): DescriptorCompileResult { - result.styles.map(style => { - delete style.rawResult - }) - - return result - } - - expect(result).toMatchSnapshot() + expect(removeRawResult(result)).toMatchSnapshot() expect(removeRawResult(result)).toEqual(removeRawResult(expected)) }) + +function removeRawResult(result: DescriptorCompileResult): DescriptorCompileResult { + result.styles.map(style => { + delete style.rawResult + }) + + return result +} diff --git a/yarn.lock b/yarn.lock index f9507a7..f1340ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -46,19 +46,20 @@ version "9.6.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.7.tgz#5f3816d1db2155edcde1b2e3aa5d0e5c520cb564" -"@vue/component-compiler-utils@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.1.0.tgz#8331eadc8acdbc35aace5a61d2153e6f6434bfe2" +"@vue/component-compiler-utils@^2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.5.2.tgz#a8d57e773354ab10e4742c7d6a8dd86184d4d7be" + integrity sha512-3exq9O89GXo9E+CGKzgURCbasG15FtFMs8QRrCUVWGaKue4Egpw41MHb3Avtikv1VykKfBq3FvAnf9Nx3sdVJg== dependencies: consolidate "^0.15.1" hash-sum "^1.0.2" lru-cache "^4.1.2" merge-source-map "^1.1.0" - postcss "^6.0.20" - postcss-selector-parser "^3.1.1" - prettier "^1.13.7" - source-map "^0.5.6" - vue-template-es2015-compiler "^1.6.0" + postcss "^7.0.14" + postcss-selector-parser "^5.0.0" + prettier "1.16.3" + source-map "~0.6.1" + vue-template-es2015-compiler "^1.8.2" JSONStream@^1.0.4: version "1.3.2" @@ -145,6 +146,7 @@ ansi-styles@^2.2.1: ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== dependencies: color-convert "^1.9.0" @@ -837,8 +839,9 @@ block-stream@*: inherits "~2.0.0" bluebird@^3.1.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" + version "3.5.3" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" + integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== boom@2.x.x: version "2.10.1" @@ -1001,7 +1004,7 @@ chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2: +chalk@^2.0.0, chalk@^2.0.1: version "2.4.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" dependencies: @@ -1009,6 +1012,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^2.3.2, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + character-parser@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0" @@ -1093,14 +1105,16 @@ collection-visit@^1.0.0: object-visit "^1.0.0" color-convert@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== dependencies: - color-name "^1.1.1" + color-name "1.1.3" -color-name@^1.1.1: +color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.6" @@ -1146,6 +1160,7 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: consolidate@^0.15.1: version "0.15.1" resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" + integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw== dependencies: bluebird "^3.1.1" @@ -1357,6 +1372,11 @@ cssesc@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" +cssesc@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" + integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== + cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": version "0.3.2" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b" @@ -1510,12 +1530,6 @@ dot-prop@^3.0.0: dependencies: is-obj "^1.0.0" -dot-prop@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" - dependencies: - is-obj "^1.0.0" - duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" @@ -2074,6 +2088,7 @@ has-flag@^1.0.0: has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-unicode@^2.0.0: version "2.0.1" @@ -2234,6 +2249,7 @@ indent-string@^3.0.0: indexes-of@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" + integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= inflight@^1.0.4: version "1.0.6" @@ -2428,6 +2444,7 @@ is-number@^4.0.0: is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= is-odd@^2.0.0: version "2.0.0" @@ -3112,13 +3129,21 @@ loud-rejection@^1.0.0: currently-unhandled "^0.4.1" signal-exit "^3.0.0" -lru-cache@^4.0.1, lru-cache@^4.1.2: +lru-cache@^4.0.1: version "4.1.2" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f" dependencies: pseudomap "^1.0.2" yallist "^2.1.2" +lru-cache@^4.1.2: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + magic-string@^0.22.4: version "0.22.5" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e" @@ -3187,6 +3212,7 @@ meow@^4.0.0: merge-source-map@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" + integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== dependencies: source-map "^0.6.1" @@ -3738,11 +3764,12 @@ postcss-modules-sync@^1.0.0: postcss-modules-scope "^1.0.2" string-hash "^1.1.0" -postcss-selector-parser@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865" +postcss-selector-parser@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c" + integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ== dependencies: - dot-prop "^4.1.1" + cssesc "^2.0.0" indexes-of "^1.0.1" uniq "^1.0.1" @@ -3755,7 +3782,7 @@ postcss@^5.2.5: source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.1, postcss@^6.0.20: +postcss@^6.0.1: version "6.0.21" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d" dependencies: @@ -3763,6 +3790,15 @@ postcss@^6.0.1, postcss@^6.0.20: source-map "^0.6.1" supports-color "^5.3.0" +postcss@^7.0.14: + version "7.0.14" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5" + integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -3771,9 +3807,10 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.13.7: - version "1.13.7" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" +prettier@1.16.3: + version "1.16.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" + integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== pretty-format@^22.4.3: version "22.4.3" @@ -3807,6 +3844,7 @@ proxy-from-env@^1.0.0: pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= pug-attrs@^2.0.3: version "2.0.3" @@ -4448,6 +4486,7 @@ source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, sourc source-map@0.6.*, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== source-map@^0.4.2, source-map@^0.4.4: version "0.4.4" @@ -4627,8 +4666,16 @@ supports-color@^3.1.2, supports-color@^3.2.3: has-flag "^1.0.0" supports-color@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== dependencies: has-flag "^3.0.0" @@ -4798,9 +4845,10 @@ typescript-eslint-parser@^15.0.0: lodash.unescape "4.0.1" semver "5.5.0" -typescript@^2.7.2: - version "2.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170" +typescript@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d" + integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg== uglify-js@^2.6, uglify-js@^2.6.1: version "2.8.29" @@ -4831,6 +4879,7 @@ union-value@^1.0.0: uniq@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" + integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= universalify@^0.1.0: version "0.1.1" @@ -4898,9 +4947,10 @@ vue-template-compiler@^2.5.16: de-indent "^1.0.2" he "^1.1.0" -vue-template-es2015-compiler@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18" +vue-template-es2015-compiler@^1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.2.tgz#dd73e80ba58bb65dd7a8aa2aeef6089cf6116f2a" + integrity sha512-cliV19VHLJqFUYbz/XeWXe5CO6guzwd0yrrqqp0bmjlMP3ZZULY7fu8RTC4+3lmHwo6ESVDHFDsvjB15hcR5IA== vue@^2.5.16: version "2.5.16" @@ -5039,6 +5089,7 @@ y18n@^3.2.1: yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= yallist@^3.0.0, yallist@^3.0.2: version "3.0.2" From d4ae5be72567410160353a8aa2e2b43f0cee13f6 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Thu, 11 Apr 2019 09:59:53 +0530 Subject: [PATCH 17/44] fix(#84): Move postcss-modules plugins to last (#86) --- src/compiler.ts | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/compiler.ts b/src/compiler.ts index 42ed177..a8bbc29 100644 --- a/src/compiler.ts +++ b/src/compiler.ts @@ -229,22 +229,24 @@ export class SFCCompiler { style.module === true || typeof style.module === 'string' const needsCleanCSS = this.template.isProduction && !(this.style.postcssCleanOptions && this.style.postcssCleanOptions.disabled) - const postcssPlugins = [ - needsCSSModules - ? postcssModules({ - generateScopedName: '[path][local]-[hash:base64:4]', - ...this.style.postcssModulesOptions, - getJSON: (t: any) => { - tokens = t - } - }) - : undefined, - needsCleanCSS - ? postcssClean(this.style.postcssCleanOptions) - : undefined - ] - .concat(this.style.postcssPlugins) + const postcssPlugins = (this.style.postcssPlugins || []) + .slice() + .concat([ + needsCleanCSS + ? postcssClean(this.style.postcssCleanOptions) + : undefined, + needsCSSModules + ? postcssModules({ + generateScopedName: '[path][local]-[hash:base64:4]', + ...this.style.postcssModulesOptions, + getJSON: (t: any) => { + tokens = t + } + }) + : undefined, + ]) .filter(Boolean) + const preprocessOptions = (style.lang && this.style.preprocessOptions && From 12f487850ee7891f8c9d4432f7eb32dcb1c9618e Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Thu, 11 Apr 2019 10:23:34 +0530 Subject: [PATCH 18/44] chore: Upgrade @vue/component-compiler-utils BREAKING CHANGE: Update to @vue/component-compiler-utils@3.0.0 which uses `sass` instead of `node-sass` --- package.json | 10 +- yarn.lock | 608 +++++++++++++++++++++------------------------------ 2 files changed, 254 insertions(+), 364 deletions(-) diff --git a/package.json b/package.json index 95fd6f9..a88cd90 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "babel-preset-env": "^1.6.1", "conventional-changelog": "^1.1.24", "jest": "^22.4.2", - "node-sass": "^4.9.0", + "sass": "^1.18.0", "pug": "^2.0.3", "puppeteer": "^1.3.0", "rollup": "^0.58.2", @@ -52,12 +52,18 @@ "vue": "^2.5.16", "vue-template-compiler": "^2.5.16" }, + "optionalDependencies": { + "sass": "^1.18.0", + "pug": "^2.0.3", + "less": "^3.9.0", + "stylus": "^0.54.5" + }, "peerDependencies": { "postcss": ">=6.0", "vue-template-compiler": "*" }, "dependencies": { - "@vue/component-compiler-utils": "^2.5.2", + "@vue/component-compiler-utils": "^3.0.0", "clean-css": "^4.1.11", "hash-sum": "^1.0.2", "postcss-modules-sync": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index f1340ef..063093a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -46,10 +46,10 @@ version "9.6.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.7.tgz#5f3816d1db2155edcde1b2e3aa5d0e5c520cb564" -"@vue/component-compiler-utils@^2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.5.2.tgz#a8d57e773354ab10e4742c7d6a8dd86184d4d7be" - integrity sha512-3exq9O89GXo9E+CGKzgURCbasG15FtFMs8QRrCUVWGaKue4Egpw41MHb3Avtikv1VykKfBq3FvAnf9Nx3sdVJg== +"@vue/component-compiler-utils@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz#d16fa26b836c06df5baaeb45f3d80afc47e35634" + integrity sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw== dependencies: consolidate "^0.15.1" hash-sum "^1.0.2" @@ -59,7 +59,7 @@ postcss-selector-parser "^5.0.0" prettier "1.16.3" source-map "~0.6.1" - vue-template-es2015-compiler "^1.8.2" + vue-template-es2015-compiler "^1.9.0" JSONStream@^1.0.4: version "1.3.2" @@ -253,10 +253,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" -assert-plus@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" - assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" @@ -269,9 +265,10 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" +async-each@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735" + integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg== async-limiter@~1.0.0: version "1.0.0" @@ -295,15 +292,11 @@ atob@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc" -aws-sign2@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" -aws4@^1.2.1, aws4@^1.6.0: +aws4@^1.6.0: version "1.7.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289" @@ -832,23 +825,11 @@ binary-extensions@^1.0.0: version "1.11.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - dependencies: - inherits "~2.0.0" - bluebird@^3.1.1: version "3.5.3" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - boom@4.x.x: version "4.3.1" resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" @@ -876,7 +857,7 @@ braces@^1.8.2: preserve "^0.2.0" repeat-element "^1.1.2" -braces@^2.3.1: +braces@^2.3.1, braces@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" dependencies: @@ -967,10 +948,6 @@ camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" -camelcase@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" @@ -979,10 +956,6 @@ caniuse-lite@^1.0.30000792: version "1.0.30000830" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000830.tgz#cb96b8a2dd3cbfe04acea2af3c4e894249095328" -caseless@~0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" - caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -994,7 +967,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -1042,6 +1015,25 @@ chokidar@^1.6.0: optionalDependencies: fsevents "^1.0.0" +chokidar@^2.0.0: + version "2.1.5" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d" + integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A== + dependencies: + anymatch "^2.0.0" + async-each "^1.0.1" + braces "^2.3.2" + glob-parent "^3.1.0" + inherits "^2.0.3" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^3.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.2.1" + upath "^1.1.1" + optionalDependencies: + fsevents "^1.2.7" + chownr@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" @@ -1073,14 +1065,6 @@ cliui@^2.1.0: right-align "^0.1.1" wordwrap "0.0.2" -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - cliui@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" @@ -1089,6 +1073,11 @@ cliui@^4.0.0: strip-ansi "^4.0.0" wrap-ansi "^2.0.0" +clone@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1116,16 +1105,12 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: +combined-stream@1.0.6, combined-stream@~1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" dependencies: delayed-stream "~1.0.0" -commander@^2.9.0: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" - compare-func@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648" @@ -1333,13 +1318,6 @@ cpx@^1.5.0: shell-quote "^1.6.1" subarg "^1.0.0" -cross-spawn@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" - cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -1348,18 +1326,17 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" -cryptiles@2.x.x: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" - dependencies: - boom "2.x.x" - cryptiles@3.x.x: version "3.1.2" resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" dependencies: boom "5.x.x" +css-parse@1.7.x: + version "1.7.0" + resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b" + integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs= + css-selector-tokenizer@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" @@ -1421,6 +1398,13 @@ de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" +debug@*, debug@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -1448,6 +1432,11 @@ decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" @@ -1548,6 +1537,13 @@ emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" +errno@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" + integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== + dependencies: + prr "~1.0.1" + error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" @@ -1695,7 +1691,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.0, extend@~3.0.1: +extend@~3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" @@ -1828,14 +1824,6 @@ forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - form-data@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099" @@ -1875,14 +1863,13 @@ fsevents@^1.0.0, fsevents@^1.1.1: nan "^2.9.2" node-pre-gyp "^0.9.0" -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" +fsevents@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4" + integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw== dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" + nan "^2.9.2" + node-pre-gyp "^0.10.0" function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" @@ -1901,22 +1888,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaze@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105" - dependencies: - globule "^1.0.0" - -generate-function@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74" - -generate-object-property@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0" - dependencies: - is-property "^1.0.0" - generic-names@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-1.0.3.tgz#2d786a121aee508876796939e8e3bff836c20917" @@ -1998,23 +1969,33 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + glob2base@^0.0.12: version "0.0.12" resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" dependencies: find-index "^0.1.1" -glob@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" +glob@7.0.x: + version "7.0.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" + integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo= dependencies: + fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "2 || 3" + minimatch "^3.0.2" once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: +glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: @@ -2029,14 +2010,6 @@ globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" -globule@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" - dependencies: - glob "~7.1.1" - lodash "~4.17.4" - minimatch "~3.0.2" - graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -2059,15 +2032,6 @@ har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" -har-validator@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" - dependencies: - chalk "^1.1.1" - commander "^2.9.0" - is-my-json-valid "^2.12.4" - pinkie-promise "^2.0.0" - har-validator@~5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" @@ -2131,15 +2095,6 @@ hash-sum@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" -hawk@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" - dependencies: - boom "2.x.x" - cryptiles "2.x.x" - hoek "2.x.x" - sntp "1.x.x" - hawk@~6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" @@ -2153,10 +2108,6 @@ he@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" -hoek@2.x.x: - version "2.16.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" - hoek@4.x.x: version "4.2.1" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" @@ -2178,14 +2129,6 @@ html-encoding-sniffer@^1.0.2: dependencies: whatwg-encoding "^1.0.1" -http-signature@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" - dependencies: - assert-plus "^0.2.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - http-signature@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" @@ -2221,6 +2164,11 @@ ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" +image-size@~0.5.0: + version "0.5.5" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" + integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= + import-local@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc" @@ -2232,10 +2180,6 @@ imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" -in-publish@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" - indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" @@ -2258,7 +2202,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3: +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -2381,6 +2325,11 @@ is-extglob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + is-finite@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" @@ -2407,24 +2356,24 @@ is-glob@^2.0.0, is-glob@^2.0.1: dependencies: is-extglob "^1.0.0" +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + is-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" -is-my-ip-valid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824" - -is-my-json-valid@^2.12.4: - version "2.17.2" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c" - dependencies: - generate-function "^2.0.0" - generate-object-property "^1.1.0" - is-my-ip-valid "^1.0.0" - jsonpointer "^4.0.0" - xtend "^4.0.0" - is-number@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" @@ -2474,10 +2423,6 @@ is-promise@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" -is-property@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" - is-regex@^1.0.3, is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" @@ -2869,7 +2814,7 @@ jest@^22.4.2: import-local "^1.0.0" jest-cli "^22.4.3" -js-base64@^2.1.8, js-base64@^2.1.9: +js-base64@^2.1.9: version "2.4.3" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" @@ -2971,10 +2916,6 @@ jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" -jsonpointer@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" - jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -3025,6 +2966,22 @@ left-pad@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" +less@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474" + integrity sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w== + dependencies: + clone "^2.1.2" + optionalDependencies: + errno "^0.1.1" + graceful-fs "^4.1.2" + image-size "~0.5.0" + mime "^1.4.1" + mkdirp "^0.5.0" + promise "^7.1.1" + request "^2.83.0" + source-map "~0.6.0" + leven@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" @@ -3075,18 +3032,6 @@ lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - -lodash.clonedeep@^4.3.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - -lodash.mergewith@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -3108,7 +3053,7 @@ lodash.unescape@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" -lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.1, lodash@~4.17.4: +lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.1: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -3180,7 +3125,7 @@ mem@^1.1.0: dependencies: mimic-fn "^1.0.0" -meow@^3.3.0, meow@^3.7.0: +meow@^3.3.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" dependencies: @@ -3244,7 +3189,7 @@ micromatch@^2.1.5, micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.1.4, micromatch@^3.1.8: +micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" dependencies: @@ -3266,13 +3211,13 @@ mime-db@~1.33.0: version "1.33.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" -mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7: +mime-types@^2.1.12, mime-types@~2.1.17: version "2.1.18" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" dependencies: mime-db "~1.33.0" -mime@^1.3.4: +mime@^1.3.4, mime@^1.4.1: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" @@ -3280,7 +3225,7 @@ mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" -"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -3331,7 +3276,7 @@ mkdirp@0.5.0: dependencies: minimist "0.0.8" -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: +mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -3345,7 +3290,12 @@ ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" -nan@^2.10.0, nan@^2.9.2: +ms@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +nan@^2.9.2: version "2.10.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" @@ -3378,23 +3328,14 @@ needle@^2.2.0: iconv-lite "^0.4.4" sax "^1.2.4" -node-gyp@^3.3.1: - version "3.6.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60" +needle@^2.2.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.0.tgz#ce3fea21197267bacb310705a7bbe24f2a3a3492" + integrity sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg== dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - minimatch "^3.0.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "2" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" + debug "^4.1.0" + iconv-lite "^0.4.4" + sax "^1.2.4" node-int64@^0.4.0: version "0.4.0" @@ -3409,6 +3350,22 @@ node-notifier@^5.2.1: shellwords "^0.1.1" which "^1.3.0" +node-pre-gyp@^0.10.0: + version "0.10.3" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" + integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + node-pre-gyp@^0.9.0: version "0.9.1" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0" @@ -3424,36 +3381,6 @@ node-pre-gyp@^0.9.0: semver "^5.3.0" tar "^4" -node-sass@^4.9.0: - version "4.9.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52" - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^3.0.0" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.10.0" - node-gyp "^3.3.1" - npmlog "^4.0.0" - request "~2.79.0" - sass-graph "^2.2.4" - stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" - -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - dependencies: - abbrev "1" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -3476,6 +3403,11 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + npm-bundled@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" @@ -3493,7 +3425,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" dependencies: @@ -3510,7 +3442,7 @@ nwmatcher@^1.4.3: version "1.4.4" resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e" -oauth-sign@~0.8.1, oauth-sign@~0.8.2: +oauth-sign@~0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" @@ -3584,12 +3516,6 @@ os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - dependencies: - lcid "^1.0.0" - os-locale@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" @@ -3602,7 +3528,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@0, osenv@^0.1.4: +osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" dependencies: @@ -3663,6 +3589,11 @@ pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= + path-exists@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" @@ -3831,7 +3762,7 @@ progress@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f" -promise@^7.0.1: +promise@^7.0.1, promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" dependencies: @@ -3841,6 +3772,11 @@ proxy-from-env@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" +prr@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" + integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= + pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -3964,10 +3900,6 @@ q@^1.4.1, q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" -qs@~6.3.0: - version "6.3.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" - qs@~6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" @@ -3992,6 +3924,16 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -4043,6 +3985,15 @@ readdirp@^2.0.0: readable-stream "^2.0.2" set-immediate-shim "^1.0.1" +readdirp@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + realpath-native@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.0.tgz#7885721a83b43bd5327609f0ddecb2482305fdf0" @@ -4150,7 +4101,7 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.0" tough-cookie ">=2.3.3" -request@2, request@^2.83.0: +request@^2.83.0: version "2.85.0" resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" dependencies: @@ -4177,31 +4128,6 @@ request@2, request@^2.83.0: tunnel-agent "^0.6.0" uuid "^3.1.0" -request@~2.79.0: - version "2.79.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.11.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~2.0.6" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - qs "~6.3.0" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "~0.4.1" - uuid "^3.0.0" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -4244,7 +4170,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1: +rimraf@^2.5.4, rimraf@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -4328,34 +4254,26 @@ sane@^2.0.0: optionalDependencies: fsevents "^1.1.1" -sass-graph@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" +sass@^1.18.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.18.0.tgz#f34371c31e268e555c2ac8e43d2b64d194e7d090" + integrity sha512-Mc579V+BhH693tqt+lvph+gmRqmC6BjtsEVsjkW1944DEA5a0wPuCi781hL3fY4EDuqZnEVPbu42CZRywwE97g== dependencies: - glob "^7.0.0" - lodash "^4.0.0" - scss-tokenizer "^0.2.3" - yargs "^7.0.0" + chokidar "^2.0.0" + +sax@0.5.x: + version "0.5.8" + resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1" + integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE= sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" -scss-tokenizer@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" - dependencies: - js-base64 "^2.1.8" - source-map "^0.4.2" - "semver@2 || 3 || 4 || 5", semver@5.5.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -4440,12 +4358,6 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - sntp@2.x.x: version "2.1.0" resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" @@ -4479,16 +4391,23 @@ source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" +source-map@0.1.x: + version "0.1.43" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" + integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y= + dependencies: + amdefine ">=0.0.4" + source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" -source-map@0.6.*, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: +source-map@0.6.*, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.4.2, source-map@^0.4.4: +source-map@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: @@ -4563,12 +4482,6 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -stdout-stream@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" - dependencies: - readable-stream "^2.0.1" - stealthy-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" @@ -4605,7 +4518,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -stringstream@~0.0.4, stringstream@~0.0.5: +stringstream@~0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -4649,6 +4562,18 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" +stylus@^0.54.5: + version "0.54.5" + resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79" + integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk= + dependencies: + css-parse "1.7.x" + debug "*" + glob "7.0.x" + mkdirp "0.5.x" + sax "0.5.x" + source-map "0.1.x" + subarg@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" @@ -4683,14 +4608,6 @@ symbol-tree@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" -tar@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - tar@^4: version "4.4.1" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749" @@ -4766,7 +4683,7 @@ token-stream@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a" -tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3: +tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.3: version "2.3.4" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" dependencies: @@ -4794,12 +4711,6 @@ trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" -"true-case-path@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62" - dependencies: - glob "^6.0.4" - ts-jest@^22.4.2: version "22.4.4" resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-22.4.4.tgz#7b5c0abb2188fe7170840df9f80e78659aaf8a24" @@ -4820,10 +4731,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tunnel-agent@~0.4.1: - version "0.4.3" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" - tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" @@ -4892,6 +4799,11 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" +upath@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068" + integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q== + urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" @@ -4913,7 +4825,7 @@ util.promisify@^1.0.0: define-properties "^1.1.2" object.getownpropertydescriptors "^2.0.3" -uuid@^3.0.0, uuid@^3.1.0: +uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" @@ -4947,10 +4859,10 @@ vue-template-compiler@^2.5.16: de-indent "^1.0.2" he "^1.1.0" -vue-template-es2015-compiler@^1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.2.tgz#dd73e80ba58bb65dd7a8aa2aeef6089cf6116f2a" - integrity sha512-cliV19VHLJqFUYbz/XeWXe5CO6guzwd0yrrqqp0bmjlMP3ZZULY7fu8RTC4+3lmHwo6ESVDHFDsvjB15hcR5IA== +vue-template-es2015-compiler@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" + integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== vue@^2.5.16: version "2.5.16" @@ -4997,15 +4909,11 @@ whatwg-url@^6.4.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" -which-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@1, which@^1.2.12, which@^1.2.9, which@^1.3.0: +which@^1.2.12, which@^1.2.9, which@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" dependencies: @@ -5078,7 +4986,7 @@ xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" -xtend@^4.0.0, xtend@~4.0.1: +xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -5095,12 +5003,6 @@ yallist@^3.0.0, yallist@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" -yargs-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" - dependencies: - camelcase "^3.0.0" - yargs-parser@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" @@ -5147,24 +5049,6 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^5.0.0" - yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" From 4faf89aa55dfe14234db814e2049b6967414813b Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Thu, 11 Apr 2019 10:26:03 +0530 Subject: [PATCH 19/44] chore(release): 4.0.0 --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b5dfee..648e667 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,34 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +# [4.0.0](https://github.com/vuejs/vue-component-compiler/compare/v3.4.5...v4.0.0) (2019-04-11) + + +### Bug Fixes + +* **#84:** Move postcss-modules plugins to last ([#86](https://github.com/vuejs/vue-component-compiler/issues/86)) ([d4ae5be](https://github.com/vuejs/vue-component-compiler/commit/d4ae5be)), closes [#84](https://github.com/vuejs/vue-component-compiler/issues/84) +* normalize source map file path on windows ([#83](https://github.com/vuejs/vue-component-compiler/issues/83)) ([c4bcd40](https://github.com/vuejs/vue-component-compiler/commit/c4bcd40)), closes [vuejs/component-compiler-utils#51](https://github.com/vuejs/component-compiler-utils/issues/51) + + +### Chores + +* Upgrade [@vue](https://github.com/vue)/component-compiler-utils ([12f4878](https://github.com/vuejs/vue-component-compiler/commit/12f4878)) + + +### Features + +* Add compileToDescriptorAsync and compileStyleAsync methods ([ccf7d84](https://github.com/vuejs/vue-component-compiler/commit/ccf7d84)) +* Allow disabling clean CSS ([9d43b80](https://github.com/vuejs/vue-component-compiler/commit/9d43b80)) + + +### BREAKING CHANGES + +* Update to @vue/component-compiler-utils@3.0.0 which +uses `sass` instead of `node-sass` + + + # [3.6.0](https://github.com/vuejs/vue-component-compiler/compare/v3.5.0...v3.6.0) (2018-08-28) diff --git a/package.json b/package.json index a88cd90..8af1217 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "3.6.0", + "version": "4.0.0", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From 714f08d6bbe9549ce4042e9e4b2962a8d8972c02 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Sat, 26 Oct 2019 18:47:21 +0530 Subject: [PATCH 20/44] feat: inject styles to shadow DOM (#89) --- src/assembler.ts | 67 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/src/assembler.ts b/src/assembler.ts index 750b409..2e89d8c 100644 --- a/src/assembler.ts +++ b/src/assembler.ts @@ -26,9 +26,11 @@ export interface AssembleResults { } export interface AssembleOptions { + isWebComponent?: boolean normalizer?: string styleInjector?: string styleInjectorSSR?: string + styleInjectorShadow?: string } export function assemble( @@ -214,11 +216,52 @@ export function assembleFromSource( ? createImport('__vue_create_injector_ssr__', options.styleInjectorSSR) : inlineCreateInjectorSSR + const inlineCreateInjectorShadow = `function __vue_create_injector_shadow__(__, shadowRoot) { + function createStyleElement(shadowRoot) { + var styleElement = document.createElement('style') + styleElement.type = 'text/css' + shadowRoot.appendChild(styleElement) + + return styleElement + } + + return function addStyle(id, css) { + const styleElement = createStyleElement(shadowRoot) + if (css.media) styleElement.setAttribute('media', css.media) + + let code = css.source + + if (${e(compiler.template.isProduction)} && css.map) { + // https://developer.chrome.com/devtools/docs/javascript-debugging + // this makes source maps inside style tags work properly in Chrome + code += '\\n/*# sourceURL=' + css.map.sources[0] + ' */' + // http://stackoverflow.com/a/26603875 + code += + '\\n/*# sourceMappingURL=data:application/json;base64,' + + btoa(unescape(encodeURIComponent(JSON.stringify(css.map)))) + + ' */' + } + + if ('styleSheet' in styleElement) { + styleElement.styleSheet.cssText = code + } else { + while (styleElement.firstChild) { + styleElement.removeChild(styleElement.firstChild) + } + styleElement.appendChild(document.createTextNode(code)) + } + } + }` + + const createInjectorShadow = options.styleInjectorShadow + ? createImport('__vue_create_injector_shadow__', options.styleInjectorShadow) + : inlineCreateInjectorShadow + // language=JavaScript const inlineNormalizeComponent = `function __vue_normalize__( template, style, script, - scope, functional, moduleIdentifier, - createInjector, createInjectorSSR + scope, functional, moduleIdentifier, shadowMode, + createInjector, createInjectorSSR, createInjectorShadow ) { const component = (typeof script === 'function' ? script.options : script) || {} @@ -263,9 +306,13 @@ export function assembleFromSource( component._ssrRegister = hook } else if (style) { - hook = function(context) { - style.call(this, createInjector(context)) - } + hook = shadowMode + ? function(context) { + style.call(this, createInjectorShadow(context, this.$root.$options.shadowRoot)) + } + : function(context) { + style.call(this, createInjector(context)) + } } if (hook !== undefined) { @@ -345,9 +392,11 @@ export function assembleFromSource( /* component normalizer */ ${normalizeComponent} /* style inject */ - ${hasStyle && !compiler.template.optimizeSSR ? createInjector : ''} + ${hasStyle && !compiler.template.optimizeSSR && !options.isWebComponent ? createInjector : ''} /* style inject SSR */ ${hasStyle && compiler.template.optimizeSSR ? createInjectorSSR : ''} + /* style inject shadow dom */ + ${hasStyle && options.isWebComponent ? createInjectorShadow : ''} ` @@ -403,6 +452,7 @@ export function assembleFromSource( __vue_scope_id__, __vue_is_functional_template__, __vue_module_identifier__, + ${options.isWebComponent ? 'true' : 'false'}, ${ code.indexOf('__vue_create_injector__') > -1 ? '__vue_create_injector__' @@ -412,6 +462,11 @@ export function assembleFromSource( code.indexOf('__vue_create_injector_ssr__') > -1 ? '__vue_create_injector_ssr__' : 'undefined' + }, + ${ + code.indexOf('__vue_create_injector_shadow__') > -1 + ? '__vue_create_injector_shadow__' + : 'undefined' } )` From 57d69e3075071ed883798070e82ae6fd06bed0ba Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Sat, 26 Oct 2019 18:48:24 +0530 Subject: [PATCH 21/44] chore(release): 4.1.0 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 648e667..5a373da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +# [4.1.0](https://github.com/vuejs/vue-component-compiler/compare/v4.0.0...v4.1.0) (2019-10-26) + + +### Features + +* inject styles to shadow DOM ([#89](https://github.com/vuejs/vue-component-compiler/issues/89)) ([714f08d](https://github.com/vuejs/vue-component-compiler/commit/714f08d)) + + + # [4.0.0](https://github.com/vuejs/vue-component-compiler/compare/v3.4.5...v4.0.0) (2019-04-11) diff --git a/package.json b/package.json index 8af1217..5de06dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "4.0.0", + "version": "4.1.0", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From fb1ab41697f585915ba0bd3d4861b761915d8086 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Thu, 21 Nov 2019 13:02:12 +0800 Subject: [PATCH 22/44] feat: use __vue_component__ identifier for normalized component and default export (#91) --- src/assembler.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/assembler.ts b/src/assembler.ts index 2e89d8c..b46f5fc 100644 --- a/src/assembler.ts +++ b/src/assembler.ts @@ -441,7 +441,7 @@ export function assembleFromSource( } code += ` - export default __vue_normalize__( + const __vue_component__ = __vue_normalize__( ${ code.indexOf('__vue_render__') > -1 ? '{ render: __vue_render__, staticRenderFns: __vue_staticRenderFns__ }' @@ -468,7 +468,8 @@ export function assembleFromSource( ? '__vue_create_injector_shadow__' : 'undefined' } - )` + )\n + export default __vue_component__` if (script.map) { map = merge(script.map, JSON.parse(mapGenerator.toString())) From c8c7d3fb460e7fa4a341027bfb49cd7a17fe09e8 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Thu, 21 Nov 2019 10:32:48 +0530 Subject: [PATCH 23/44] chore(release): 4.2.0 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a373da..691bf19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +# [4.2.0](https://github.com/vuejs/vue-component-compiler/compare/v4.1.0...v4.2.0) (2019-11-21) + + +### Features + +* use __vue_component__ identifier for normalized component and default export ([#91](https://github.com/vuejs/vue-component-compiler/issues/91)) ([fb1ab41](https://github.com/vuejs/vue-component-compiler/commit/fb1ab41)) + + + # [4.1.0](https://github.com/vuejs/vue-component-compiler/compare/v4.0.0...v4.1.0) (2019-10-26) diff --git a/package.json b/package.json index 5de06dd..0e82376 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "4.1.0", + "version": "4.2.0", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From 049b6b1cdf170ce6b0f22ccbb3873fe09937af44 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 12 May 2020 01:46:37 +0530 Subject: [PATCH 24/44] chore: use circleci node image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 42f34e2..03d74ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: ~/project docker: - - image: alekzonder/puppeteer # base image: node/8-slim + - image: circleci/node:12-browsers steps: - checkout - run: From 7b4dceb0b7212b0ca3202969bc6c2081c2d88b2b Mon Sep 17 00:00:00 2001 From: carbotaniuman <41451839+carbotaniuman@users.noreply.github.com> Date: Mon, 11 May 2020 15:17:48 -0500 Subject: [PATCH 25/44] fix: add pure annotation for tree shaking support (#96) --- src/assembler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assembler.ts b/src/assembler.ts index b46f5fc..7f13261 100644 --- a/src/assembler.ts +++ b/src/assembler.ts @@ -441,7 +441,7 @@ export function assembleFromSource( } code += ` - const __vue_component__ = __vue_normalize__( + const __vue_component__ = /*#__PURE__*/__vue_normalize__( ${ code.indexOf('__vue_render__') > -1 ? '{ render: __vue_render__, staticRenderFns: __vue_staticRenderFns__ }' From d076f8d060af0e8a5380859ce70a1410afd68794 Mon Sep 17 00:00:00 2001 From: Pere Monfort <24bitjs@gmail.com> Date: Mon, 11 May 2020 22:18:31 +0200 Subject: [PATCH 26/44] chore: move head declaration to avoid issue in ssr (#87) Co-authored-by: peremp --- src/assembler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assembler.ts b/src/assembler.ts index 7f13261..00e62c6 100644 --- a/src/assembler.ts +++ b/src/assembler.ts @@ -90,7 +90,6 @@ export function assembleFromSource( // language=JavaScript const inlineCreateInjector = `function __vue_create_injector__() { - const head = document.head || document.getElementsByTagName('head')[0] const styles = __vue_create_injector__.styles || (__vue_create_injector__.styles = {}) const isOldIE = typeof navigator !== 'undefined' && @@ -124,6 +123,7 @@ export function assembleFromSource( } if (!style.element) { + const head = document.head || document.getElementsByTagName('head')[0] const el = style.element = document.createElement('style') el.type = 'text/css' From 8f30d7e7e02d559b020f51da8586f4262cfc2e6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 May 2020 01:48:51 +0530 Subject: [PATCH 27/44] chore(deps): bump handlebars from 4.0.11 to 4.5.3 (#92) Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.11 to 4.5.3. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.11...v4.5.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/yarn.lock b/yarn.lock index 063093a..5872c3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -274,10 +274,6 @@ async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" -async@^1.4.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - async@^2.1.4: version "2.6.0" resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" @@ -1111,6 +1107,11 @@ combined-stream@1.0.6, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" +commander@~2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + compare-func@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648" @@ -2019,14 +2020,15 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" handlebars@^4.0.2, handlebars@^4.0.3: - version "4.0.11" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" + version "4.5.3" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" + integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== dependencies: - async "^1.4.0" + neo-async "^2.6.0" optimist "^0.6.1" - source-map "^0.4.4" + source-map "^0.6.1" optionalDependencies: - uglify-js "^2.6" + uglify-js "^3.1.4" har-schema@^2.0.0: version "2.0.0" @@ -3249,6 +3251,7 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= minipass@^2.2.1, minipass@^2.2.4: version "2.2.4" @@ -3337,6 +3340,11 @@ needle@^2.2.1: iconv-lite "^0.4.4" sax "^1.2.4" +neo-async@^2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" + integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -3497,6 +3505,7 @@ once@^1.3.0, once@^1.4.0: optimist@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" + integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY= dependencies: minimist "~0.0.1" wordwrap "~0.0.2" @@ -4407,12 +4416,6 @@ source-map@0.6.*, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - dependencies: - amdefine ">=0.0.4" - spdx-correct@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" @@ -4757,7 +4760,7 @@ typescript@^3.2.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d" integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg== -uglify-js@^2.6, uglify-js@^2.6.1: +uglify-js@^2.6.1: version "2.8.29" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" dependencies: @@ -4766,6 +4769,14 @@ uglify-js@^2.6, uglify-js@^2.6.1: optionalDependencies: uglify-to-browserify "~1.0.0" +uglify-js@^3.1.4: + version "3.7.3" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a" + integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg== + dependencies: + commander "~2.20.3" + source-map "~0.6.1" + uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" @@ -4943,6 +4954,7 @@ wordwrap@0.0.2: wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= wordwrap@~1.0.0: version "1.0.0" From b2cfeb683d9a3827a6ed1eef60311ad5efbee249 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 May 2020 01:49:06 +0530 Subject: [PATCH 28/44] chore(deps): bump https-proxy-agent from 2.2.1 to 2.2.4 (#95) Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. - [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases) - [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5872c3e..220aff5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -100,9 +100,10 @@ acorn@^5.0.0, acorn@^5.3.0: version "5.5.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" -agent-base@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.0.tgz#9838b5c3392b962bad031e6a4c5e1024abec45ce" +agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== dependencies: es6-promisify "^5.0.0" @@ -1413,10 +1414,11 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6. ms "2.0.0" debug@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== dependencies: - ms "2.0.0" + ms "^2.1.1" decamelize-keys@^1.0.0: version "1.1.0" @@ -1570,12 +1572,14 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es6-promise@^4.0.3: - version "4.2.4" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29" + version "4.2.8" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" + integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== es6-promisify@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" + integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= dependencies: es6-promise "^4.0.3" @@ -2140,10 +2144,11 @@ http-signature@~1.2.0: sshpk "^1.7.0" https-proxy-agent@^2.1.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0" + version "2.2.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" + integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== dependencies: - agent-base "^4.1.0" + agent-base "^4.3.0" debug "^3.1.0" iconv-lite@0.4.19: @@ -3294,9 +3299,9 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" ms@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== nan@^2.9.2: version "2.10.0" From 91dbdf5d3d7b36d1cd0364a4f18fd26b11d628a0 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 12 May 2020 01:51:26 +0530 Subject: [PATCH 29/44] chore(release): 4.2.1 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 691bf19..86f0875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [4.2.1](https://github.com/vuejs/vue-component-compiler/compare/v4.2.0...v4.2.1) (2020-05-11) + + +### Bug Fixes + +* add pure annotation for tree shaking support ([#96](https://github.com/vuejs/vue-component-compiler/issues/96)) ([7b4dceb](https://github.com/vuejs/vue-component-compiler/commit/7b4dceb)) + + + # [4.2.0](https://github.com/vuejs/vue-component-compiler/compare/v4.1.0...v4.2.0) (2019-11-21) diff --git a/package.json b/package.json index 0e82376..8e80093 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "4.2.0", + "version": "4.2.1", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From b8bfc58cc1c786b727fe21145cb5af83365d48c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Fa=C5=82owski?= Date: Fri, 22 May 2020 13:14:14 +0200 Subject: [PATCH 30/44] fix: produce deterministic css class names for css modules (#101) * fix: add missing ts definitions, fix ts errors * fix: return correct class name for css modules in PROD mode --- .gitignore | 2 + package.json | 8 +-- src/compiler.ts | 8 +-- src/postcss-clean.ts | 4 +- test/compile.spec.ts | 61 +++++++++++++++++++ tsconfig.json | 3 +- yarn.lock | 137 ++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 209 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 4d88ed9..fee8225 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ node_modules /dist *.log /test/output/ +.idea +.vscode diff --git a/package.json b/package.json index 8e80093..2d3a41d 100644 --- a/package.json +++ b/package.json @@ -32,13 +32,12 @@ "homepage": "https://github.com/vuejs/vue-component-compiler#readme", "devDependencies": { "@types/clean-css": "^3.4.30", - "@types/jest": "^22.2.3", + "@types/jest": "^25.2.3", "@types/node": "^9.4.7", "babel-plugin-external-helpers": "^6.22.0", "babel-preset-env": "^1.6.1", "conventional-changelog": "^1.1.24", "jest": "^22.4.2", - "sass": "^1.18.0", "pug": "^2.0.3", "puppeteer": "^1.3.0", "rollup": "^0.58.2", @@ -46,6 +45,7 @@ "rollup-plugin-commonjs": "^9.1.0", "rollup-plugin-image": "^1.0.2", "rollup-plugin-node-resolve": "^3.3.0", + "sass": "^1.18.0", "ts-jest": "^22.4.2", "typescript": "^3.2.4", "typescript-eslint-parser": "^15.0.0", @@ -53,9 +53,9 @@ "vue-template-compiler": "^2.5.16" }, "optionalDependencies": { - "sass": "^1.18.0", - "pug": "^2.0.3", "less": "^3.9.0", + "pug": "^2.0.3", + "sass": "^1.18.0", "stylus": "^0.54.5" }, "peerDependencies": { diff --git a/src/compiler.ts b/src/compiler.ts index a8bbc29..ff14650 100644 --- a/src/compiler.ts +++ b/src/compiler.ts @@ -232,9 +232,6 @@ export class SFCCompiler { const postcssPlugins = (this.style.postcssPlugins || []) .slice() .concat([ - needsCleanCSS - ? postcssClean(this.style.postcssCleanOptions) - : undefined, needsCSSModules ? postcssModules({ generateScopedName: '[path][local]-[hash:base64:4]', @@ -244,9 +241,12 @@ export class SFCCompiler { } }) : undefined, + needsCleanCSS + ? postcssClean(this.style.postcssCleanOptions) + : undefined, ]) .filter(Boolean) - + const preprocessOptions = (style.lang && this.style.preprocessOptions && diff --git a/src/postcss-clean.ts b/src/postcss-clean.ts index 13e9304..b2bbd36 100644 --- a/src/postcss-clean.ts +++ b/src/postcss-clean.ts @@ -1,7 +1,7 @@ import * as postcss from 'postcss' -import CleanCSS = require('clean-css') +import CleanCSS from 'clean-css' -export default postcss.plugin('clean', options => { +export default postcss.plugin('clean', (options: any) => { const clean = new CleanCSS({ compatibility: 'ie9', ...options }) return (css: any, res: any) => { diff --git a/test/compile.spec.ts b/test/compile.spec.ts index 00e3a99..d6a6b85 100644 --- a/test/compile.spec.ts +++ b/test/compile.spec.ts @@ -60,3 +60,64 @@ function removeRawResult(result: DescriptorCompileResult): DescriptorCompileResu return result } + +describe('when source contains css module', () => { + const componentSource = ` + + + + + + ` + + + describe('production mode', () => { + const prodCompiler = createDefaultCompiler(({ + template: { + isProduction: true + } + }) as any) + + it('should generate deterministic class names when the same component is compiled multiple times', () => { + + const result1 = prodCompiler.compileToDescriptor('foo.vue', componentSource) + const result2 = prodCompiler.compileToDescriptor('foo.vue', componentSource) + + const styles1 = result1.styles[0].code; + const styles2 = result2.styles[0].code; + + expect(styles1).toEqual(styles2) + }) + }) + + describe('develop mode', () => { + const devCompiler = createDefaultCompiler(({ + template: { + isProduction: false + } + }) as any) + + it('should generate deterministic class names when the same component is compiled multiple times', () => { + + const result1 = devCompiler.compileToDescriptor('foo.vue', componentSource) + const result2 = devCompiler.compileToDescriptor('foo.vue', componentSource) + + const styles1 = result1.styles[0].code; + const styles2 = result2.styles[0].code; + + expect(styles1).toEqual(styles2) + }) + }) +}) diff --git a/tsconfig.json b/tsconfig.json index 975a579..a74a79f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,7 +13,8 @@ "strictNullChecks": true, "noImplicitAny": true, "removeComments": false, - "lib": ["es6", "es7"] + "lib": ["es6", "es7"], + "types": ["@types/jest", "node"] }, "include": ["src", "typings"] } diff --git a/yarn.lock b/yarn.lock index 220aff5..03c6e59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,6 +16,16 @@ esutils "^2.0.2" js-tokens "^3.0.0" +"@jest/types@^25.5.0": + version "25.5.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d" + integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^15.0.0" + chalk "^3.0.0" + "@types/babel-types@*", "@types/babel-types@^7.0.0": version "7.0.1" resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.1.tgz#1405e5396968c4302994b0161ce405b72b874257" @@ -30,13 +40,42 @@ version "3.4.30" resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-3.4.30.tgz#0052c136f5248002428e3638b37de4a39818641d" +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + "@types/estree@0.0.38": version "0.0.38" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2" -"@types/jest@^22.2.3": - version "22.2.3" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-22.2.3.tgz#0157c0316dc3722c43a7b71de3fdf3acbccef10d" +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5" + integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w== + +"@types/istanbul-lib-report@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^1.1.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" + integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== + dependencies: + "@types/istanbul-lib-coverage" "*" + "@types/istanbul-lib-report" "*" + +"@types/jest@^25.2.3": + version "25.2.3" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.3.tgz#33d27e4c4716caae4eced355097a47ad363fdcaf" + integrity sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw== + dependencies: + jest-diff "^25.2.1" + pretty-format "^25.2.1" "@types/node@*": version "10.0.0" @@ -46,6 +85,18 @@ version "9.6.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.7.tgz#5f3816d1db2155edcde1b2e3aa5d0e5c520cb564" +"@types/yargs-parser@*": + version "15.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" + integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== + +"@types/yargs@^15.0.0": + version "15.0.5" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79" + integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w== + dependencies: + "@types/yargs-parser" "*" + "@vue/component-compiler-utils@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz#d16fa26b836c06df5baaeb45f3d80afc47e35634" @@ -140,6 +191,11 @@ ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -151,6 +207,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + anymatch@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" @@ -991,6 +1055,14 @@ chalk@^2.3.2, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + character-parser@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0" @@ -1097,11 +1169,23 @@ color-convert@^1.9.0: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + combined-stream@1.0.6, combined-stream@~1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" @@ -1502,6 +1586,11 @@ detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" +diff-sequences@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" + integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== + diff@^3.2.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -2060,6 +2149,11 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -2632,6 +2726,16 @@ jest-diff@^22.4.3: jest-get-type "^22.4.3" pretty-format "^22.4.3" +jest-diff@^25.2.1: + version "25.5.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" + integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== + dependencies: + chalk "^3.0.0" + diff-sequences "^25.2.6" + jest-get-type "^25.2.6" + pretty-format "^25.5.0" + jest-docblock@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19" @@ -2657,6 +2761,11 @@ jest-get-type@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4" +jest-get-type@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" + integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== + jest-haste-map@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.3.tgz#25842fa2ba350200767ac27f658d58b9d5c2e20b" @@ -3764,6 +3873,16 @@ pretty-format@^22.4.3: ansi-regex "^3.0.0" ansi-styles "^3.2.0" +pretty-format@^25.2.1, pretty-format@^25.5.0: + version "25.5.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" + integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== + dependencies: + "@jest/types" "^25.5.0" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^16.12.0" + private@^0.1.6, private@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -3948,6 +4067,11 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +react-is@^16.12.0: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -4612,6 +4736,13 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" +supports-color@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + symbol-tree@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" From ac34efcf32346c6a9904c883264ec9a614bcedf2 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Fri, 22 May 2020 16:45:10 +0530 Subject: [PATCH 31/44] chore(release): 4.2.2 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86f0875..6606132 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [4.2.2](https://github.com/vuejs/vue-component-compiler/compare/v4.2.1...v4.2.2) (2020-05-22) + + +### Bug Fixes + +* produce deterministic css class names for css modules ([#101](https://github.com/vuejs/vue-component-compiler/issues/101)) ([b8bfc58](https://github.com/vuejs/vue-component-compiler/commit/b8bfc58)) + + + ## [4.2.1](https://github.com/vuejs/vue-component-compiler/compare/v4.2.0...v4.2.1) (2020-05-11) diff --git a/package.json b/package.json index 2d3a41d..b0f5ece 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "4.2.1", + "version": "4.2.2", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From b1aff3f0415c2a13e46fd97fc2af2acdc3aeaeb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Fa=C5=82owski?= Date: Fri, 22 May 2020 15:29:20 +0200 Subject: [PATCH 32/44] fix: set correct clean-css import (#103) --- src/postcss-clean.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/postcss-clean.ts b/src/postcss-clean.ts index b2bbd36..ac1ff60 100644 --- a/src/postcss-clean.ts +++ b/src/postcss-clean.ts @@ -1,5 +1,7 @@ import * as postcss from 'postcss' -import CleanCSS from 'clean-css' +// ESM import of clean-css breaks test/runtime check this fix for reference: +// https://github.com/vuejs/vue-component-compiler/pull/103#issuecomment-632676899 +const CleanCSS = require('clean-css') export default postcss.plugin('clean', (options: any) => { const clean = new CleanCSS({ compatibility: 'ie9', ...options }) From 64213d92fbc4ce2ef724fd3670d9c2f67a371b83 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Fri, 22 May 2020 19:00:43 +0530 Subject: [PATCH 33/44] chore(release): 4.2.3 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6606132..f73dc5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [4.2.3](https://github.com/vuejs/vue-component-compiler/compare/v4.2.2...v4.2.3) (2020-05-22) + + +### Bug Fixes + +* set correct clean-css import ([#103](https://github.com/vuejs/vue-component-compiler/issues/103)) ([b1aff3f](https://github.com/vuejs/vue-component-compiler/commit/b1aff3f)) + + + ## [4.2.2](https://github.com/vuejs/vue-component-compiler/compare/v4.2.1...v4.2.2) (2020-05-22) diff --git a/package.json b/package.json index b0f5ece..e07ff27 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "4.2.2", + "version": "4.2.3", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From 3865c153716a11436c1757f5ecc5ffbcc9e11dd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 22:19:19 -0700 Subject: [PATCH 34/44] chore(deps): bump y18n from 3.2.1 to 3.2.2 (#114) --- yarn.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 03c6e59..012dfd6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5139,8 +5139,9 @@ xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== yallist@^2.1.2: version "2.1.2" From 7e9c7732c697802f455d46ab6ab6a0887656ff06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 22:19:53 -0700 Subject: [PATCH 35/44] chore(deps): bump pug-code-gen from 2.0.1 to 2.0.3 (#111) --- yarn.lock | 78 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/yarn.lock b/yarn.lock index 012dfd6..8ae1836 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27,12 +27,14 @@ chalk "^3.0.0" "@types/babel-types@*", "@types/babel-types@^7.0.0": - version "7.0.1" - resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.1.tgz#1405e5396968c4302994b0161ce405b72b874257" + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.9.tgz#01d7b86949f455402a94c788883fe4ba574cad41" + integrity sha512-qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA== "@types/babylon@^6.16.2": - version "6.16.2" - resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.2.tgz#062ce63b693d9af1c246f5aedf928bc9c30589c8" + version "6.16.5" + resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.5.tgz#1c5641db69eb8cdf378edd25b4be7754beeb48b4" + integrity sha512-xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w== dependencies: "@types/babel-types" "*" @@ -130,6 +132,7 @@ abbrev@1: acorn-globals@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf" + integrity sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8= dependencies: acorn "^4.0.4" @@ -142,6 +145,7 @@ acorn-globals@^4.1.0: acorn@^3.1.0: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" + integrity sha1-ReN/s56No/JbruP/U2niu18iAXo= acorn@^4.0.4, acorn@~4.0.2: version "4.0.13" @@ -846,6 +850,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0: babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" + integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= dependencies: babel-runtime "^6.26.0" esutils "^2.0.2" @@ -855,6 +860,7 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26 babylon@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" + integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== balanced-match@^1.0.0: version "1.0.0" @@ -1235,9 +1241,10 @@ consolidate@^0.15.1: dependencies: bluebird "^3.1.1" -constantinople@^3.0.1: +constantinople@^3.0.1, constantinople@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647" + integrity sha512-yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw== dependencies: "@types/babel-types" "^7.0.0" "@types/babylon" "^6.16.2" @@ -1380,7 +1387,12 @@ copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" -core-js@^2.4.0, core-js@^2.5.0: +core-js@^2.4.0: + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== + +core-js@^2.5.0: version "2.5.5" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b" @@ -1598,6 +1610,7 @@ diff@^3.2.0: doctypes@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9" + integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk= domexception@^1.0.0: version "1.0.1" @@ -1712,8 +1725,9 @@ estree-walker@^0.5.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.1.tgz#64fc375053abc6f57d73e9bd2f004644ad3c5854" esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== exec-sh@^0.2.0: version "0.2.1" @@ -2937,6 +2951,7 @@ js-base64@^2.1.9: js-stringify@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db" + integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds= js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" @@ -3169,10 +3184,15 @@ lodash.unescape@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" -lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.1: +lodash@^4.13.1, lodash@^4.14.0, lodash@^4.2.1: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" +lodash@^4.17.4: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -3915,30 +3935,33 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -pug-attrs@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.3.tgz#a3095f970e64151f7bdad957eef55fb5d7905d15" +pug-attrs@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.4.tgz#b2f44c439e4eb4ad5d4ef25cac20d18ad28cc336" + integrity sha512-TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ== dependencies: constantinople "^3.0.1" js-stringify "^1.0.1" - pug-runtime "^2.0.4" + pug-runtime "^2.0.5" pug-code-gen@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.1.tgz#0951ec83225d74d8cfc476a7f99a259b5f7d050c" + version "2.0.3" + resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.3.tgz#122eb9ada9b5bf601705fe15aaa0a7d26bc134ab" + integrity sha512-r9sezXdDuZJfW9J91TN/2LFbiqDhmltTFmGpHTsGdrNGp3p4SxAjjXEfnuK2e4ywYsRIVP0NeLbSAMHUcaX1EA== dependencies: - constantinople "^3.0.1" + constantinople "^3.1.2" doctypes "^1.1.0" js-stringify "^1.0.1" - pug-attrs "^2.0.3" - pug-error "^1.3.2" - pug-runtime "^2.0.4" + pug-attrs "^2.0.4" + pug-error "^1.3.3" + pug-runtime "^2.0.5" void-elements "^2.0.1" with "^5.0.0" -pug-error@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26" +pug-error@^1.3.2, pug-error@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.3.tgz#f342fb008752d58034c185de03602dd9ffe15fa6" + integrity sha512-qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ== pug-filters@^3.1.0: version "3.1.0" @@ -3981,9 +4004,10 @@ pug-parser@^5.0.0: pug-error "^1.3.2" token-stream "0.0.1" -pug-runtime@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.4.tgz#e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58" +pug-runtime@^2.0.4, pug-runtime@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.5.tgz#6da7976c36bf22f68e733c359240d8ae7a32953a" + integrity sha512-P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw== pug-strip-comments@^1.0.3: version "1.0.3" @@ -4159,6 +4183,7 @@ regenerate@^1.2.1: regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== regenerator-transform@^0.10.0: version "0.10.1" @@ -4795,6 +4820,7 @@ tmpl@1.0.x: to-fast-properties@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" + integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= to-object-path@^0.3.0: version "0.3.0" @@ -4998,6 +5024,7 @@ vlq@^0.2.2: void-elements@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" + integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= vue-template-compiler@^2.5.16: version "2.5.16" @@ -5079,6 +5106,7 @@ window-size@0.1.0: with@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe" + integrity sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4= dependencies: acorn "^3.1.0" acorn-globals "^3.0.0" From a4cad458ffb99edb55fa029a909ccb7044dcfc76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 22:20:14 -0700 Subject: [PATCH 36/44] chore(deps): bump ini from 1.3.5 to 1.3.7 (#109) --- yarn.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8ae1836..197c81d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2322,8 +2322,9 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" ini@^1.3.2, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + version "1.3.7" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" + integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== invariant@^2.2.2: version "2.2.4" From 0cfbb6606f130066013e574a434ca4234de0f8de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 22:20:36 -0700 Subject: [PATCH 37/44] chore(deps): bump extend from 3.0.1 to 3.0.2 (#100) --- yarn.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 197c81d..ae9ff78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1800,8 +1800,9 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: is-extendable "^1.0.1" extend@~3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== extglob@^0.3.1: version "0.3.2" From 7899cb7b77dadb4e8715454196925eb42fb028db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 22:20:49 -0700 Subject: [PATCH 38/44] chore(deps): bump mixin-deep from 1.3.1 to 1.3.2 (#98) --- yarn.lock | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index ae9ff78..c2d35e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2435,6 +2435,7 @@ is-extendable@^0.1.0, is-extendable@^0.1.1: is-extendable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== dependencies: is-plain-object "^2.0.4" @@ -2525,6 +2526,7 @@ is-plain-obj@^1.1.0: is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== dependencies: isobject "^3.0.1" @@ -2593,6 +2595,7 @@ isobject@^2.0.0: isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= isstream@~0.1.2: version "0.1.2" @@ -3403,8 +3406,9 @@ minizlib@^1.1.0: minipass "^2.2.1" mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== dependencies: for-in "^1.0.2" is-extendable "^1.0.1" From 8b0b01c6746907dda56e433fac44f5f921b55264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 22:21:06 -0700 Subject: [PATCH 39/44] chore(deps): bump merge from 1.2.0 to 1.2.1 (#99) --- yarn.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index c2d35e1..f624492 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3309,8 +3309,9 @@ merge-stream@^1.0.1: readable-stream "^2.0.1" merge@^1.1.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" + integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== micromatch@^2.1.5, micromatch@^2.3.11: version "2.3.11" From 2ad75ed90e520a9c8b8df109310b6736cac449a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 21:48:47 -0700 Subject: [PATCH 40/44] chore(deps): bump pug from 2.0.3 to 3.0.1 (#112) Bumps [pug](https://github.com/pugjs/pug) from 2.0.3 to 3.0.1. - [Release notes](https://github.com/pugjs/pug/releases) - [Commits](https://github.com/pugjs/pug/compare/pug@2.0.3...pug@3.0.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 389 ++++++++++++++++++++++++--------------------------- 2 files changed, 185 insertions(+), 208 deletions(-) diff --git a/package.json b/package.json index e07ff27..c442372 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "babel-preset-env": "^1.6.1", "conventional-changelog": "^1.1.24", "jest": "^22.4.2", - "pug": "^2.0.3", + "pug": "^3.0.1", "puppeteer": "^1.3.0", "rollup": "^0.58.2", "rollup-plugin-babel": "^3.0.4", @@ -54,7 +54,7 @@ }, "optionalDependencies": { "less": "^3.9.0", - "pug": "^2.0.3", + "pug": "^3.0.1", "sass": "^1.18.0", "stylus": "^0.54.5" }, diff --git a/yarn.lock b/yarn.lock index f624492..5c6617c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,6 +8,11 @@ dependencies: "@babel/highlight" "7.0.0-beta.46" +"@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== + "@babel/highlight@7.0.0-beta.46": version "7.0.0-beta.46" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.46.tgz#c553c51e65f572bdedd6eff66fc0bb563016645e" @@ -16,6 +21,19 @@ esutils "^2.0.2" js-tokens "^3.0.0" +"@babel/parser@^7.6.0", "@babel/parser@^7.9.6": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380" + integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q== + +"@babel/types@^7.6.1", "@babel/types@^7.9.6": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802" + integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.0" + to-fast-properties "^2.0.0" + "@jest/types@^25.5.0": version "25.5.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d" @@ -26,18 +44,6 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" -"@types/babel-types@*", "@types/babel-types@^7.0.0": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.9.tgz#01d7b86949f455402a94c788883fe4ba574cad41" - integrity sha512-qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA== - -"@types/babylon@^6.16.2": - version "6.16.5" - resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.5.tgz#1c5641db69eb8cdf378edd25b4be7754beeb48b4" - integrity sha512-xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w== - dependencies: - "@types/babel-types" "*" - "@types/clean-css@^3.4.30": version "3.4.30" resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-3.4.30.tgz#0052c136f5248002428e3638b37de4a39818641d" @@ -129,32 +135,21 @@ abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" -acorn-globals@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf" - integrity sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8= - dependencies: - acorn "^4.0.4" - acorn-globals@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538" dependencies: acorn "^5.0.0" -acorn@^3.1.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" - integrity sha1-ReN/s56No/JbruP/U2niu18iAXo= - -acorn@^4.0.4, acorn@~4.0.2: - version "4.0.13" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" - acorn@^5.0.0, acorn@^5.3.0: version "5.5.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" +acorn@^7.1.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -171,14 +166,6 @@ ajv@^5.1.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -318,6 +305,11 @@ asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" +assert-never@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe" + integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw== + assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" @@ -857,6 +849,13 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26 lodash "^4.17.4" to-fast-properties "^1.0.3" +babel-walk@3.0.0-canary-5: + version "3.0.0-canary-5" + resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11" + integrity sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw== + dependencies: + "@babel/types" "^7.9.6" + babylon@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" @@ -1007,10 +1006,6 @@ camelcase-keys@^4.0.0: map-obj "^2.0.0" quick-lru "^1.0.0" -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" @@ -1027,13 +1022,6 @@ caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -1069,9 +1057,10 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -character-parser@^2.1.1: +character-parser@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0" + integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A= dependencies: is-regex "^1.0.3" @@ -1132,14 +1121,6 @@ clean-css@^4.1.11: dependencies: source-map "0.5.x" -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" - cliui@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" @@ -1241,15 +1222,13 @@ consolidate@^0.15.1: dependencies: bluebird "^3.1.1" -constantinople@^3.0.1, constantinople@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647" - integrity sha512-yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw== +constantinople@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151" + integrity sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw== dependencies: - "@types/babel-types" "^7.0.0" - "@types/babylon" "^6.16.2" - babel-types "^6.26.0" - babylon "^6.18.0" + "@babel/parser" "^7.6.0" + "@babel/types" "^7.6.1" conventional-changelog-angular@^1.6.6: version "1.6.6" @@ -1523,7 +1502,7 @@ decamelize-keys@^1.0.0: decamelize "^1.1.0" map-obj "^1.0.0" -decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2: +decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -2206,6 +2185,13 @@ has@^1.0.1: dependencies: function-bind "^1.0.2" +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + hash-sum@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" @@ -2379,6 +2365,13 @@ is-ci@^1.0.10: dependencies: ci-info "^1.0.0" +is-core-module@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" + integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== + dependencies: + has "^1.0.3" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -2421,12 +2414,13 @@ is-equal-shallow@^0.1.3: dependencies: is-primitive "^2.0.0" -is-expression@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f" +is-expression@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab" + integrity sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A== dependencies: - acorn "~4.0.2" - object-assign "^4.0.1" + acorn "^7.1.1" + object-assign "^4.1.1" is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -2953,7 +2947,7 @@ js-base64@^2.1.9: version "2.4.3" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" -js-stringify@^1.0.1: +js-stringify@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db" integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds= @@ -3088,10 +3082,6 @@ kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" @@ -3198,10 +3188,6 @@ lodash@^4.17.4: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" - loose-envify@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" @@ -3595,7 +3581,7 @@ oauth-sign@~0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -3766,6 +3752,11 @@ path-parse@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" @@ -3942,102 +3933,108 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -pug-attrs@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.4.tgz#b2f44c439e4eb4ad5d4ef25cac20d18ad28cc336" - integrity sha512-TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ== +pug-attrs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-3.0.0.tgz#b10451e0348165e31fad1cc23ebddd9dc7347c41" + integrity sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA== dependencies: - constantinople "^3.0.1" - js-stringify "^1.0.1" - pug-runtime "^2.0.5" + constantinople "^4.0.1" + js-stringify "^1.0.2" + pug-runtime "^3.0.0" -pug-code-gen@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.3.tgz#122eb9ada9b5bf601705fe15aaa0a7d26bc134ab" - integrity sha512-r9sezXdDuZJfW9J91TN/2LFbiqDhmltTFmGpHTsGdrNGp3p4SxAjjXEfnuK2e4ywYsRIVP0NeLbSAMHUcaX1EA== +pug-code-gen@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.2.tgz#ad190f4943133bf186b60b80de483100e132e2ce" + integrity sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg== dependencies: - constantinople "^3.1.2" + constantinople "^4.0.1" doctypes "^1.1.0" - js-stringify "^1.0.1" - pug-attrs "^2.0.4" - pug-error "^1.3.3" - pug-runtime "^2.0.5" - void-elements "^2.0.1" - with "^5.0.0" - -pug-error@^1.3.2, pug-error@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.3.tgz#f342fb008752d58034c185de03602dd9ffe15fa6" - integrity sha512-qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ== + js-stringify "^1.0.2" + pug-attrs "^3.0.0" + pug-error "^2.0.0" + pug-runtime "^3.0.0" + void-elements "^3.1.0" + with "^7.0.0" + +pug-error@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5" + integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ== -pug-filters@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-3.1.0.tgz#27165555bc04c236e4aa2b0366246dfa021b626e" +pug-filters@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-4.0.0.tgz#d3e49af5ba8472e9b7a66d980e707ce9d2cc9b5e" + integrity sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A== dependencies: - clean-css "^4.1.11" - constantinople "^3.0.1" + constantinople "^4.0.1" jstransformer "1.0.0" - pug-error "^1.3.2" - pug-walk "^1.1.7" - resolve "^1.1.6" - uglify-js "^2.6.1" + pug-error "^2.0.0" + pug-walk "^2.0.0" + resolve "^1.15.1" -pug-lexer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.0.0.tgz#210c18457ef2e1760242740c5e647bd794cec278" +pug-lexer@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-5.0.1.tgz#ae44628c5bef9b190b665683b288ca9024b8b0d5" + integrity sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w== dependencies: - character-parser "^2.1.1" - is-expression "^3.0.0" - pug-error "^1.3.2" + character-parser "^2.2.0" + is-expression "^4.0.0" + pug-error "^2.0.0" -pug-linker@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.5.tgz#9e9a7ae4005682d027deeb96b000f88eeb83a02f" +pug-linker@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-4.0.0.tgz#12cbc0594fc5a3e06b9fc59e6f93c146962a7708" + integrity sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw== dependencies: - pug-error "^1.3.2" - pug-walk "^1.1.7" + pug-error "^2.0.0" + pug-walk "^2.0.0" -pug-load@^2.0.11: - version "2.0.11" - resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.11.tgz#e648e57ed113fe2c1f45d57858ea2bad6bc01527" +pug-load@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-3.0.0.tgz#9fd9cda52202b08adb11d25681fb9f34bd41b662" + integrity sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ== dependencies: - object-assign "^4.1.0" - pug-walk "^1.1.7" + object-assign "^4.1.1" + pug-walk "^2.0.0" -pug-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-5.0.0.tgz#e394ad9b3fca93123940aff885c06e44ab7e68e4" +pug-parser@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-6.0.0.tgz#a8fdc035863a95b2c1dc5ebf4ecf80b4e76a1260" + integrity sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw== dependencies: - pug-error "^1.3.2" - token-stream "0.0.1" + pug-error "^2.0.0" + token-stream "1.0.0" -pug-runtime@^2.0.4, pug-runtime@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.5.tgz#6da7976c36bf22f68e733c359240d8ae7a32953a" - integrity sha512-P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw== +pug-runtime@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-3.0.1.tgz#f636976204723f35a8c5f6fad6acda2a191b83d7" + integrity sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg== -pug-strip-comments@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz#f1559592206edc6f85310dacf4afb48a025af59f" +pug-strip-comments@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz#f94b07fd6b495523330f490a7f554b4ff876303e" + integrity sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ== dependencies: - pug-error "^1.3.2" + pug-error "^2.0.0" -pug-walk@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.7.tgz#c00d5c5128bac5806bec15d2b7e7cdabe42531f3" +pug-walk@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-2.0.0.tgz#417aabc29232bb4499b5b5069a2b2d2a24d5f5fe" + integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ== -pug@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.3.tgz#71cba82537c95a5eab7ed04696e4221f53aa878e" - dependencies: - pug-code-gen "^2.0.1" - pug-filters "^3.1.0" - pug-lexer "^4.0.0" - pug-linker "^3.0.5" - pug-load "^2.0.11" - pug-parser "^5.0.0" - pug-runtime "^2.0.4" - pug-strip-comments "^1.0.3" +pug@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.1.tgz#9b287554043e6d18852673a382b0350595bdc067" + integrity sha512-9v1o2yXMfSKJy2PykKyWUhpgx9Pf9D/UlPgIs2pTTxR6DQZ0oivy4I9f8PlWXRY4sjIhDU4TMJ7hQmYnNJc2bw== + dependencies: + pug-code-gen "^3.0.2" + pug-filters "^4.0.0" + pug-lexer "^5.0.0" + pug-linker "^4.0.0" + pug-load "^3.0.0" + pug-parser "^6.0.0" + pug-runtime "^3.0.0" + pug-strip-comments "^2.0.0" punycode@^1.4.1: version "1.4.1" @@ -4330,16 +4327,18 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.5.0: dependencies: path-parse "^1.0.5" +resolve@^1.15.1: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - dependencies: - align-text "^0.1.1" - rimraf@^2.5.4, rimraf@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" @@ -4568,7 +4567,7 @@ source-map@0.1.x: dependencies: amdefine ">=0.0.4" -source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: +source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -4829,6 +4828,11 @@ to-fast-properties@^1.0.3: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -4851,9 +4855,10 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -token-stream@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a" +token-stream@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4" + integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ= tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.3: version "2.3.4" @@ -4929,15 +4934,6 @@ typescript@^3.2.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d" integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg== -uglify-js@^2.6.1: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - uglify-js@^3.1.4: version "3.7.3" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a" @@ -4946,10 +4942,6 @@ uglify-js@^3.1.4: commander "~2.20.3" source-map "~0.6.1" -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - ultron@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" @@ -5028,10 +5020,10 @@ vlq@^0.2.2: version "0.2.3" resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" -void-elements@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" - integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= +void-elements@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09" + integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk= vue-template-compiler@^2.5.16: version "2.5.16" @@ -5106,21 +5098,15 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2" -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - -with@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe" - integrity sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4= +with@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/with/-/with-7.0.2.tgz#ccee3ad542d25538a7a7a80aad212b9828495bac" + integrity sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w== dependencies: - acorn "^3.1.0" - acorn-globals "^3.0.0" - -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" + "@babel/parser" "^7.9.6" + "@babel/types" "^7.9.6" + assert-never "^1.2.1" + babel-walk "3.0.0-canary-5" wordwrap@~0.0.2: version "0.0.3" @@ -5233,15 +5219,6 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" - yauzl@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" From d70e50eb1ab6860ff37f0784f487855f7ba404f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 21:59:07 -0700 Subject: [PATCH 41/44] chore(deps): bump lodash from 4.17.10 to 4.17.21 (#115) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.21) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5c6617c..18473aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3179,11 +3179,7 @@ lodash.unescape@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" -lodash@^4.13.1, lodash@^4.14.0, lodash@^4.2.1: - version "4.17.10" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" - -lodash@^4.17.4: +lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.1: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== From 205324ac5db9fdf59fade0edf21c3266cb35bcac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 21:59:26 -0700 Subject: [PATCH 42/44] chore(deps-dev): bump puppeteer from 1.3.0 to 1.13.0 (#108) Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 1.3.0 to 1.13.0. - [Release notes](https://github.com/puppeteer/puppeteer/releases) - [Commits](https://github.com/puppeteer/puppeteer/compare/v1.3.0...v1.13.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 117 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 49 deletions(-) diff --git a/yarn.lock b/yarn.lock index 18473aa..9bee42a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -961,6 +961,11 @@ bser@^2.0.0: dependencies: node-int64 "^0.4.0" +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + buffer-from@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531" @@ -1203,10 +1208,12 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" +concat-stream@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== dependencies: + buffer-from "^1.0.0" inherits "^2.0.3" readable-stream "^2.2.2" typedarray "^0.0.6" @@ -1482,7 +1489,7 @@ debug@*, debug@^4.1.0: dependencies: ms "^2.1.1" -debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -1802,14 +1809,15 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-zip@^1.6.5: - version "1.6.6" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c" +extract-zip@^1.6.6: + version "1.7.0" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" + integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== dependencies: - concat-stream "1.6.0" - debug "2.6.9" - mkdirp "0.5.0" - yauzl "2.4.1" + concat-stream "^1.6.2" + debug "^2.6.9" + mkdirp "^0.5.4" + yauzl "^2.10.0" extsprintf@1.3.0: version "1.3.0" @@ -1841,9 +1849,10 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= dependencies: pend "~1.2.0" @@ -2238,7 +2247,7 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -https-proxy-agent@^2.1.0: +https-proxy-agent@^2.2.1: version "2.2.4" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== @@ -3341,10 +3350,15 @@ mime-types@^2.1.12, mime-types@~2.1.17: dependencies: mime-db "~1.33.0" -mime@^1.3.4, mime@^1.4.1: +mime@^1.4.1: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" +mime@^2.0.3: + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -3370,6 +3384,11 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" @@ -3396,18 +3415,19 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" - dependencies: - minimist "0.0.8" - mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: minimist "0.0.8" +mkdirp@^0.5.4: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" @@ -3905,9 +3925,10 @@ process-nextick-args@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" -progress@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f" +progress@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== promise@^7.0.1, promise@^7.1.1: version "7.3.1" @@ -4041,17 +4062,18 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d" puppeteer@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.3.0.tgz#f571c5f27153ca164a8188e6328ce2e4946878f3" + version "1.13.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.13.0.tgz#187ccf5ed5caf08ed1291b262d033cc364bf88ab" + integrity sha512-LUXgvhjfB/P6IOUDAKxOcbCz9ISwBLL9UpKghYrcBDwrOGx1m60y0iN2M64mdAUbT4+7oZM5DTxOW7equa2fxQ== dependencies: - debug "^2.6.8" - extract-zip "^1.6.5" - https-proxy-agent "^2.1.0" - mime "^1.3.4" - progress "^2.0.0" + debug "^4.1.0" + extract-zip "^1.6.6" + https-proxy-agent "^2.2.1" + mime "^2.0.3" + progress "^2.0.1" proxy-from-env "^1.0.0" rimraf "^2.6.1" - ws "^3.0.0" + ws "^6.1.0" q@^1.4.1, q@^1.5.1: version "1.5.1" @@ -4938,10 +4960,6 @@ uglify-js@^3.1.4: commander "~2.20.3" source-map "~0.6.1" -ultron@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" - union-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" @@ -5132,14 +5150,6 @@ write-file-atomic@^2.1.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" -ws@^3.0.0: - version "3.3.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" - dependencies: - async-limiter "~1.0.0" - safe-buffer "~5.1.0" - ultron "~1.1.0" - ws@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289" @@ -5147,6 +5157,13 @@ ws@^4.0.0: async-limiter "~1.0.0" safe-buffer "~5.1.0" +ws@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + dependencies: + async-limiter "~1.0.0" + xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" @@ -5215,8 +5232,10 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yauzl@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= dependencies: - fd-slicer "~1.0.1" + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" From 845a310d643ab99b50db1babee9fca0bba48302c Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 4 May 2021 22:01:52 -0700 Subject: [PATCH 43/44] chore(release): 4.2.4 --- CHANGELOG.md | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f73dc5d..095edb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ -# Change Log +# Changelog All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [4.2.4](https://github.com/vuejs/vue-component-compiler/compare/v4.2.3...v4.2.4) (2021-05-05) + ## [4.2.3](https://github.com/vuejs/vue-component-compiler/compare/v4.2.2...v4.2.3) (2020-05-22) diff --git a/package.json b/package.json index c442372..45d8540 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vue/component-compiler", - "version": "4.2.3", + "version": "4.2.4", "description": "bundler agnostic API for compiling Vue SFC", "repository": { "type": "git", From 1103c3affb31f009399f351bb3d72535ea757f26 Mon Sep 17 00:00:00 2001 From: Evan You Date: Mon, 15 Aug 2022 21:34:32 -0400 Subject: [PATCH 44/44] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index f13e8bd..2936a39 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +> ⚠️ DEPRECATED: please use [@vue/compiler-sfc](https://github.com/vuejs/core/tree/main/packages/compiler-sfc) instead. +> +> Vue 2.7 also ships [2.x of `@vue/compiler-sfc`](https://github.com/vuejs/vue/blob/main/packages/compiler-sfc/src/index.ts) with largely compatible API with 3.x. + # @vue/component-compiler [![Build Status](https://circleci.com/gh/vuejs/vue-component-compiler/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-component-compiler) > High level utilities for compiling Vue single file components