From 6771a0638f8802b81a1698333e6e9ec0a749e058 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 16:46:36 +0200 Subject: [PATCH 01/31] build(deps): bump tar from 4.4.15 to 4.4.19 (#12250) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/yarn.lock b/yarn.lock index a8bf613003a..6d58f393d2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1810,7 +1810,7 @@ chokidar@^2.0.2, chokidar@^2.0.3: optionalDependencies: fsevents "^1.2.2" -chownr@^1.1.1: +chownr@^1.1.1, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -3519,7 +3519,7 @@ fs-extra@^1.0.0: jsonfile "^2.1.0" klaw "^1.0.0" -fs-minipass@^1.2.5: +fs-minipass@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== @@ -5569,7 +5569,7 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: +minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -5577,7 +5577,7 @@ minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: safe-buffer "^5.1.2" yallist "^3.0.0" -minizlib@^1.2.1: +minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== @@ -5615,7 +5615,7 @@ mkdirp@0.5.1: dependencies: minimist "0.0.8" -mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.0: +mkdirp@0.5.x, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.0: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -7098,7 +7098,7 @@ rxjs@^6.1.0, rxjs@^6.3.3: dependencies: tslib "^1.9.0" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2: +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -7759,17 +7759,17 @@ tapable@^1.0.0, tapable@^1.1.0: integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA== tar@^4: - version "4.4.15" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.15.tgz#3caced4f39ebd46ddda4d6203d48493a919697f8" - integrity sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA== + version "4.4.19" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" + integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" + chownr "^1.1.4" + fs-minipass "^1.2.7" + minipass "^2.9.0" + minizlib "^1.3.3" + mkdirp "^0.5.5" + safe-buffer "^5.2.1" + yallist "^3.1.1" tcp-port-used@^1.0.1: version "1.0.1" @@ -8386,7 +8386,7 @@ yallist@^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, yallist@^3.0.3: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From 39451c7d7362a985648d63ecdbf9e6c786552bb1 Mon Sep 17 00:00:00 2001 From: vue-bot Date: Sat, 4 Sep 2021 16:12:35 +0200 Subject: [PATCH 02/31] chore: update backers [ci skip] (#12255) Co-authored-by: Evan You --- BACKERS.md | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 81dc72dba1b..84eec2c99dd 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -442,36 +442,36 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

Generous Backers via Patreon ($50+)

- - Yoshitaka M - Peter Imburg - Johnny Ray Austin -- errorrik +- errorrik - Wasim Khamlichi

Backers via Patreon

- +- Felix Mok - Jeffrey Rennie -- Keisuke Kita +- Meinhard Dam - Роман Латкин - Alex Riviere -- Fontis -- Jack -- Nick Carr +- WhereJuly +- Fontis +- Jack - Traversy Media - Pierre Baron - Donghai Gai - Aleksander Figiel - Dennis Zanetti -- wickedwei +- wickedwei - Sunny Yuen -- Jules +- Jules - Zeth Odderskov - Thomas Wiedemann - Nobuhide Esaki +- Nat Dunn - Roy Segall - Allan McKernan - Diana Bergholz @@ -481,11 +481,12 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - username - Pierre Lebrun - Peter Matkovsky -- 龙腾道 +- 龙腾道 - Nick Dandakis - Yusuke Kawabata - Shawn Wildermuth -- Meinhard Dam +- Elon Hung +- Juan Bermudez - Daniel Mattingley - Matt Sencenbaugh - Jaeyoung Lee @@ -494,16 +495,15 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Wakana Seki - Jere Sjöroos - Donald Fischer -- Eric +- Eric - tyler madsen - Joe Gregory - Masahiro Tanaka -- Tyler +- Tyler - Jim Raden - Haim Yulzari - Asaf Yishai - Jon Hobbs-Smith -- Pierre Vanhulst - Zoran Knezevic - Bernhard E. Reiter - Guy Gavergun @@ -514,9 +514,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Wen-Tien Chang - Stephen Hartley - Victor Tolbert -- Lars Andreas Ness -- Benjamin Listwon -- Elon Hung +- Keisuke Kita

Backers via OpenCollective

From 4f6f39a26cfc0d78d6b09fd6d3802d45aabb758e Mon Sep 17 00:00:00 2001 From: vue-bot Date: Sat, 4 Sep 2021 16:12:51 +0200 Subject: [PATCH 03/31] chore: update sponsors [ci skip] (#12256) Co-authored-by: Evan You --- BACKERS.md | 19 ++++++++++++------- README.md | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 84eec2c99dd..1b3c4a28a0d 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -17,8 +17,8 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

- - + +

@@ -67,6 +67,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + @@ -82,11 +87,6 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - - - - - @@ -288,6 +288,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + diff --git a/README.md b/README.md index d501a63099b..38ce31f1b68 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

- - + +

@@ -77,6 +77,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + @@ -92,11 +97,6 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - - - - - @@ -293,6 +293,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + From 515467a618479792abedf01a7b1dcef2ac2a17ed Mon Sep 17 00:00:00 2001 From: Roy Eden Date: Wed, 8 Sep 2021 06:23:49 -0300 Subject: [PATCH 04/31] feat(compiler): condenses staticClass whitespace (fix #12113) (#12195) * feat(compiler): template staticClass no longer preserves whitespace Template static classes used to preserve whitespace after compilation, resulting in builds that had bigger file outputs with whitespace in component's staticClass attributes fix #12113 * refactor(refactor(web-compiler): removed ignore in regex): Removed ignore flag in regex fix #12113 * test(ssr-string.spec.js): Removed newline character, as whitespace is purged in static classes There's no need to escape newlines in static classes, as they're now replaced with a single whitespace character fix #12113 * test(directives/class.spec.js): Added whitespace to test fix #12113 * Apply suggestions from code review Co-authored-by: Eduardo San Martin Morote --- src/platforms/web/compiler/modules/class.js | 2 +- test/ssr/ssr-string.spec.js | 2 +- test/unit/features/directives/class.spec.js | 33 +++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/platforms/web/compiler/modules/class.js b/src/platforms/web/compiler/modules/class.js index dcb5a229c2b..378c959c9d7 100644 --- a/src/platforms/web/compiler/modules/class.js +++ b/src/platforms/web/compiler/modules/class.js @@ -23,7 +23,7 @@ function transformNode (el: ASTElement, options: CompilerOptions) { } } if (staticClass) { - el.staticClass = JSON.stringify(staticClass) + el.staticClass = JSON.stringify(staticClass.replace(/\s+/g, ' ').trim()) } const classBinding = getBindingAttr(el, 'class', false /* getStatic */) if (classBinding) { diff --git a/test/ssr/ssr-string.spec.js b/test/ssr/ssr-string.spec.js index b4f962872f5..33094be9c33 100644 --- a/test/ssr/ssr-string.spec.js +++ b/test/ssr/ssr-string.spec.js @@ -1351,7 +1351,7 @@ describe('SSR: renderToString', () => { ` }, result => { - expect(result).toContain(`
`) + expect(result).toContain(`
`) done() }) }) diff --git a/test/unit/features/directives/class.spec.js b/test/unit/features/directives/class.spec.js index 0ee3380ca9a..38a25988d2a 100644 --- a/test/unit/features/directives/class.spec.js +++ b/test/unit/features/directives/class.spec.js @@ -152,6 +152,39 @@ describe('Directive v-bind:class', () => { }).then(done) }) + // css static classes should only contain a single space in between, + // as all the text inside of classes is shipped as a JS string + // and this could lead to useless spacing in static classes + it('condenses whitespace in staticClass', done => { + const vm = new Vue({ + template: '
', + }).$mount() + expect(vm.$el.className).toBe('test1 test2 test3 test4 test5 test6') + done() + }) + + it('condenses whitespace in staticClass merge in a component', done => { + const vm = new Vue({ + template: ` + + + `, + data: { + componentClass1: 'componentClass1', + }, + components: { + component1: { + template: '
' + }, + } + }).$mount() + expect(vm.$el.className).toBe('test staticClass componentClass1') + vm.componentClass1 = 'c1' + waitForUpdate(() => { + expect(vm.$el.className).toBe('test staticClass c1') + }).then(done) + }) + // a vdom patch edge case where the user has several un-keyed elements of the // same tag next to each other, and toggling them. it('properly remove staticClass for toggling un-keyed children', done => { From c785df83774fe6a71e13e916197d1e2bb8ef454e Mon Sep 17 00:00:00 2001 From: vue-bot Date: Mon, 13 Sep 2021 17:02:21 +0200 Subject: [PATCH 05/31] chore: update backers [ci skip] (#12257) --- BACKERS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 1b3c4a28a0d..7ff927bee67 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -458,7 +458,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Felix Mok -- Jeffrey Rennie +- Keisuke Kita - Meinhard Dam - Роман Латкин - Alex Riviere @@ -488,7 +488,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Peter Matkovsky - 龙腾道 - Nick Dandakis -- Yusuke Kawabata +- Jeffrey Rennie - Shawn Wildermuth - Elon Hung - Juan Bermudez @@ -519,7 +519,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Wen-Tien Chang - Stephen Hartley - Victor Tolbert -- Keisuke Kita +- Yusuke Kawabata

Backers via OpenCollective

From 30a43afa10e3ae461edc1152beb11b1e61dc4469 Mon Sep 17 00:00:00 2001 From: vue-bot Date: Tue, 14 Sep 2021 15:59:16 +0200 Subject: [PATCH 06/31] chore: update sponsors [ci skip] (#12278) --- BACKERS.md | 12 ++++++++++++ README.md | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/BACKERS.md b/BACKERS.md index 7ff927bee67..d7aa900e962 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -294,6 +294,13 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + + + @@ -357,6 +364,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + diff --git a/README.md b/README.md index 38ce31f1b68..8d6bba08e92 100644 --- a/README.md +++ b/README.md @@ -299,6 +299,13 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + + + From 531b7619b137aecd71441e1ea53dae3066d71bc8 Mon Sep 17 00:00:00 2001 From: Ziwen Mei <67939848+Rudeus3Greyrat@users.noreply.github.com> Date: Wed, 22 Sep 2021 21:58:08 +0800 Subject: [PATCH 07/31] chore: fix typo in test (#12291) --- test/ssr/ssr-basic-renderer.spec.js | 2 +- test/unit/features/component/component-scoped-slot.spec.js | 2 +- test/unit/features/directives/on.spec.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/ssr/ssr-basic-renderer.spec.js b/test/ssr/ssr-basic-renderer.spec.js index 09ce8e7dd46..04c8d80e6a7 100644 --- a/test/ssr/ssr-basic-renderer.spec.js +++ b/test/ssr/ssr-basic-renderer.spec.js @@ -52,7 +52,7 @@ describe('SSR: basicRenderer', () => { }) // #5941 - it('should work peoperly when accessing $ssrContext in root component', done => { + it('should work properly when accessing $ssrContext in root component', done => { let ssrContext renderToString(new Vue({ template: ` diff --git a/test/unit/features/component/component-scoped-slot.spec.js b/test/unit/features/component/component-scoped-slot.spec.js index 8e9d584ae3e..a77b055ccd6 100644 --- a/test/unit/features/component/component-scoped-slot.spec.js +++ b/test/unit/features/component/component-scoped-slot.spec.js @@ -1327,7 +1327,7 @@ describe('Component scoped slot', () => { }) // #11652 - it('should update when swtching between two components with slot and without slot', done => { + it('should update when switching between two components with slot and without slot', done => { const Child = { template: `
` } diff --git a/test/unit/features/directives/on.spec.js b/test/unit/features/directives/on.spec.js index 7c252031172..df9ab8db8e9 100644 --- a/test/unit/features/directives/on.spec.js +++ b/test/unit/features/directives/on.spec.js @@ -218,7 +218,7 @@ describe('Directive v-on', () => { }) // ctrl, shift, alt, meta - it('should support system modifers', () => { + it('should support system modifiers', () => { vm = new Vue({ el, template: ` From 87bff5a9e01988315f7a49d5a01abe120c79800b Mon Sep 17 00:00:00 2001 From: vue-bot Date: Tue, 5 Oct 2021 23:02:30 +0200 Subject: [PATCH 08/31] chore: update backers [ci skip] (#12308) --- BACKERS.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index d7aa900e962..8c057f2c642 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -462,26 +462,27 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Yoshitaka M - Peter Imburg - Johnny Ray Austin -- errorrik - Wasim Khamlichi

Backers via Patreon

-- Felix Mok +- Kevin López Brante - Keisuke Kita +- Mok Wang Quan +- Jeffrey Rennie - Meinhard Dam - Роман Латкин - Alex Riviere - WhereJuly - Fontis - Jack +- Artur Bańka - Traversy Media - Pierre Baron - Donghai Gai - Aleksander Figiel -- Dennis Zanetti - wickedwei - Sunny Yuen - Jules @@ -492,6 +493,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Roy Segall - Allan McKernan - Diana Bergholz +- Philip John Basile - Riki Fridrich - Alfonso Herrera - Bichinger Software & Consulting @@ -499,8 +501,8 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Pierre Lebrun - Peter Matkovsky - 龙腾道 -- Nick Dandakis -- Jeffrey Rennie +- Theo Ephraim +- Yusuke Kawabata - Shawn Wildermuth - Elon Hung - Juan Bermudez @@ -531,7 +533,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Wen-Tien Chang - Stephen Hartley - Victor Tolbert -- Yusuke Kawabata +- Nick Dandakis

Backers via OpenCollective

From 0368ba4f37ef1ef28eb785261ab76a68f7fa03dd Mon Sep 17 00:00:00 2001 From: vue-bot Date: Wed, 6 Oct 2021 15:25:57 +0200 Subject: [PATCH 09/31] chore: update sponsors [ci skip] (#12310) --- BACKERS.md | 7 ++++++- README.md | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 8c057f2c642..f4ae5df7381 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -296,10 +296,15 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - + + + + + + diff --git a/README.md b/README.md index 8d6bba08e92..2155719dbb5 100644 --- a/README.md +++ b/README.md @@ -301,10 +301,15 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - + + + + + + From e3d81c6f9add81188c47a7f35015ec6836c18f3e Mon Sep 17 00:00:00 2001 From: vue-bot Date: Tue, 19 Oct 2021 00:59:47 +0200 Subject: [PATCH 10/31] chore: update sponsors [ci skip] (#12332) --- BACKERS.md | 15 +++++++++++++++ README.md | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/BACKERS.md b/BACKERS.md index f4ae5df7381..c021793383a 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -305,6 +305,16 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + + + + + + @@ -374,6 +384,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + diff --git a/README.md b/README.md index 2155719dbb5..f6e561ea914 100644 --- a/README.md +++ b/README.md @@ -310,6 +310,16 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + + + + + + From abfbf2d43054e15f7a6b90f252b50555e7f816a2 Mon Sep 17 00:00:00 2001 From: vue-bot Date: Wed, 3 Nov 2021 02:56:26 +0100 Subject: [PATCH 11/31] chore: update sponsors [ci skip] (#12339) --- BACKERS.md | 5 +++++ README.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/BACKERS.md b/BACKERS.md index c021793383a..febfd9f2a18 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -315,6 +315,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + diff --git a/README.md b/README.md index f6e561ea914..c7c86be3db5 100644 --- a/README.md +++ b/README.md @@ -320,6 +320,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + From 93bd4406ac4b07339a9c623f7e4ceaa11bfdbf40 Mon Sep 17 00:00:00 2001 From: 180909 Date: Sun, 7 Nov 2021 06:43:57 +0800 Subject: [PATCH 12/31] fix typos (#12348) --- packages/weex-vue-framework/index.js | 2 +- src/platforms/weex/entry-framework.js | 2 +- test/unit/features/component/component-async.spec.js | 2 +- test/unit/features/directives/on.spec.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/weex-vue-framework/index.js b/packages/weex-vue-framework/index.js index 487c97be7ef..8fab9f5373b 100644 --- a/packages/weex-vue-framework/index.js +++ b/packages/weex-vue-framework/index.js @@ -28,7 +28,7 @@ function createInstanceContext ( data: data }; - // Each instance has a independent `Vue` module instance + // Each instance has an independent `Vue` module instance var Vue = instance.Vue = createVueModuleInstance(instanceId, weex); // DEPRECATED diff --git a/src/platforms/weex/entry-framework.js b/src/platforms/weex/entry-framework.js index a23775d4db5..60c43373428 100644 --- a/src/platforms/weex/entry-framework.js +++ b/src/platforms/weex/entry-framework.js @@ -22,7 +22,7 @@ export function createInstanceContext ( data } - // Each instance has a independent `Vue` module instance + // Each instance has an independent `Vue` module instance const Vue = instance.Vue = createVueModuleInstance(instanceId, weex) // DEPRECATED diff --git a/test/unit/features/component/component-async.spec.js b/test/unit/features/component/component-async.spec.js index 1e492f7f617..8ce085de313 100644 --- a/test/unit/features/component/component-async.spec.js +++ b/test/unit/features/component/component-async.spec.js @@ -7,7 +7,7 @@ describe('Component async', () => { const oldClearTimeout = window.clearTimeout; // will contain pending timeouts set during the test iteration - // will contain the id of the timeout as the key, and the the millisecond timeout as the value + // will contain the id of the timeout as the key, and the millisecond timeout as the value // this helps to identify the timeout that is still pending let timeoutsPending = {}; diff --git a/test/unit/features/directives/on.spec.js b/test/unit/features/directives/on.spec.js index df9ab8db8e9..353d3df5372 100644 --- a/test/unit/features/directives/on.spec.js +++ b/test/unit/features/directives/on.spec.js @@ -31,7 +31,7 @@ describe('Directive v-on', () => { expect(event.type).toBe('click') }) - it('should bind event to a inline statement', () => { + it('should bind event to an inline statement', () => { vm = new Vue({ el, template: '
', From 478d189618f27515d93419cd61866f841e5a6832 Mon Sep 17 00:00:00 2001 From: vue-bot Date: Wed, 10 Nov 2021 05:19:18 +0100 Subject: [PATCH 13/31] chore: update backers [ci skip] (#12345) --- BACKERS.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index febfd9f2a18..251de623b7c 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -486,16 +486,14 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Yoshitaka M - Peter Imburg -- Johnny Ray Austin - Wasim Khamlichi

Backers via Patreon

-- Kevin López Brante +- Theo Ephraim - Keisuke Kita -- Mok Wang Quan - Jeffrey Rennie - Meinhard Dam - Роман Латкин @@ -522,12 +520,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Riki Fridrich - Alfonso Herrera - Bichinger Software & Consulting -- username - Pierre Lebrun - Peter Matkovsky - 龙腾道 -- Theo Ephraim -- Yusuke Kawabata +- Nick Dandakis +- Mok Wang Quan - Shawn Wildermuth - Elon Hung - Juan Bermudez @@ -558,7 +555,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Wen-Tien Chang - Stephen Hartley - Victor Tolbert -- Nick Dandakis +- Yusuke Kawabata

Backers via OpenCollective

From f1f218f800dfdcf9ece9a28965d5efa91c826bb5 Mon Sep 17 00:00:00 2001 From: vue-bot Date: Wed, 10 Nov 2021 05:19:29 +0100 Subject: [PATCH 14/31] chore: update sponsors [ci skip] (#12349) --- BACKERS.md | 10 +++++----- README.md | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 251de623b7c..77dbbfac751 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -67,11 +67,6 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - - - - - @@ -320,6 +315,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + diff --git a/README.md b/README.md index c7c86be3db5..2114d6d29db 100644 --- a/README.md +++ b/README.md @@ -77,11 +77,6 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - - - - - @@ -325,6 +320,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + From 05d05c0e69f446c9bb4ee911fb9004bd386c76ce Mon Sep 17 00:00:00 2001 From: Si Nguyen Date: Tue, 16 Nov 2021 20:09:25 +0700 Subject: [PATCH 15/31] chore: comment typo [skip ci] (#12359) --- src/shared/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/util.js b/src/shared/util.js index 9f240c77b14..3168a1ff9c0 100644 --- a/src/shared/util.js +++ b/src/shared/util.js @@ -35,7 +35,7 @@ export function isPrimitive (value: any): boolean %checks { /** * Quick object check - this is primarily used to tell - * Objects from primitive values when we know the value + * objects from primitive values when we know the value * is a JSON-compliant type. */ export function isObject (obj: mixed): boolean %checks { From 86f8b52822c7cd6a9b4cc14755c69c51bb289107 Mon Sep 17 00:00:00 2001 From: Si Nguyen Date: Wed, 17 Nov 2021 16:16:58 +0700 Subject: [PATCH 16/31] chore: fix typo (#12360) [skip ci] --- test/unit/features/global-api/set-delete.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/features/global-api/set-delete.spec.js b/test/unit/features/global-api/set-delete.spec.js index d1c7f3d8709..59e75ae4dbe 100644 --- a/test/unit/features/global-api/set-delete.spec.js +++ b/test/unit/features/global-api/set-delete.spec.js @@ -14,7 +14,7 @@ describe('Global API: set/delete', () => { }).then(done) }) - it('should update a observing object', done => { + it('should update an observing object', done => { const vm = new Vue({ template: '
{{foo.x}}
', data: { foo: { x: 1 }} @@ -26,7 +26,7 @@ describe('Global API: set/delete', () => { }).then(done) }) - it('should update a observing array', done => { + it('should update an observing array', done => { const vm = new Vue({ template: '
{{k}}-{{v}}
', data: { list: ['a', 'b', 'c'] } From e78568ec20f7b34bbf655231df49b438c6279dbd Mon Sep 17 00:00:00 2001 From: MalikIdreesHasanKhan Date: Wed, 17 Nov 2021 22:21:43 +0530 Subject: [PATCH 17/31] chore: typo [skip ci] (#12364) --- packages/weex-template-compiler/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/weex-template-compiler/build.js b/packages/weex-template-compiler/build.js index 7739a4b5c74..68976949e79 100644 --- a/packages/weex-template-compiler/build.js +++ b/packages/weex-template-compiler/build.js @@ -1516,7 +1516,7 @@ function parse ( } }, comment: function comment (text, start, end) { - // adding anyting as a sibling to the root node is forbidden + // adding anything as a sibling to the root node is forbidden // comments should still be allowed, but ignored if (currentParent) { var child = { From 1c4fc0e6b02e5c9a86793d3a892ab2df81131641 Mon Sep 17 00:00:00 2001 From: vue-bot Date: Tue, 23 Nov 2021 03:59:51 +0100 Subject: [PATCH 18/31] chore: update sponsors [ci skip] (#12366) Co-authored-by: Evan You --- BACKERS.md | 7 +++++++ README.md | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/BACKERS.md b/BACKERS.md index 77dbbfac751..3a272b57be6 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -321,6 +321,13 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + + + diff --git a/README.md b/README.md index 2114d6d29db..2b6e22c4698 100644 --- a/README.md +++ b/README.md @@ -326,6 +326,13 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + + + From c1740aca77170d0bc5ff7972bd05933ed307321c Mon Sep 17 00:00:00 2001 From: Evan You Date: Fri, 3 Dec 2021 14:22:23 +0800 Subject: [PATCH 19/31] chore: update backers.md --- BACKERS.md | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 3a272b57be6..f29bdde7b60 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -21,7 +21,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

- +

Platinum via Patreon

@@ -79,7 +79,12 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - + + + + + + @@ -506,16 +511,16 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Роман Латкин - Alex Riviere - WhereJuly -- Fontis -- Jack +- Fontis +- Jack - Artur Bańka - Traversy Media - Pierre Baron - Donghai Gai - Aleksander Figiel -- wickedwei +- wickedwei - Sunny Yuen -- Jules +- Jules - Zeth Odderskov - Thomas Wiedemann - Nobuhide Esaki @@ -529,7 +534,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Bichinger Software & Consulting - Pierre Lebrun - Peter Matkovsky -- 龙腾道 +- 龙腾道 - Nick Dandakis - Mok Wang Quan - Shawn Wildermuth @@ -543,11 +548,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Wakana Seki - Jere Sjöroos - Donald Fischer -- Eric +- Eric - tyler madsen - Joe Gregory - Masahiro Tanaka -- Tyler +- Tyler - Jim Raden - Haim Yulzari - Asaf Yishai From 519d52a5d325faaf326678cfc096a1ffb4d4b22f Mon Sep 17 00:00:00 2001 From: Evan You Date: Fri, 10 Dec 2021 11:31:11 +0800 Subject: [PATCH 20/31] chore: update sponsor link --- BACKERS.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BACKERS.md b/BACKERS.md index f29bdde7b60..34c7f838c62 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -83,7 +83,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - + @@ -496,6 +496,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

Generous Backers via Patreon ($50+)

+ - Yoshitaka M - Peter Imburg - Wasim Khamlichi @@ -504,6 +505,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

Backers via Patreon

+ - Theo Ephraim - Keisuke Kita - Jeffrey Rennie From 00839f87d190c032884b0478e86b175f47a128b5 Mon Sep 17 00:00:00 2001 From: vue-bot Date: Wed, 15 Dec 2021 11:35:24 +0100 Subject: [PATCH 21/31] chore: update sponsors [ci skip] (#12382) Co-authored-by: Evan You --- BACKERS.md | 22 +++++++++++----------- README.md | 23 ++++++++++++++--------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 34c7f838c62..15fd5105a62 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -21,7 +21,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

- +

Platinum via Patreon

@@ -40,23 +40,18 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - - - - - - - + + @@ -67,6 +62,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + @@ -78,13 +78,13 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - + - - + + diff --git a/README.md b/README.md index 2b6e22c4698..cb1f3ca32b8 100644 --- a/README.md +++ b/README.md @@ -50,23 +50,18 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - - - - - - - + + @@ -77,6 +72,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + @@ -88,8 +88,13 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - - + + + + + + + From 6e22f770bcd1f51f1cf8cee4720839d61e3b18fc Mon Sep 17 00:00:00 2001 From: Evan You Date: Fri, 17 Dec 2021 14:43:02 +0800 Subject: [PATCH 22/31] chore: update sponsor links --- BACKERS.md | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 15fd5105a62..079b36af87b 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -21,7 +21,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

- +

Platinum via Patreon

@@ -83,7 +83,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - + diff --git a/README.md b/README.md index cb1f3ca32b8..9bd0e700016 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

- +

Platinum Sponsors

@@ -93,7 +93,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - + From 4c3d1e91fae9344d3453a694aac6f0fc54c94cba Mon Sep 17 00:00:00 2001 From: vue-bot Date: Tue, 4 Jan 2022 02:22:46 +0100 Subject: [PATCH 23/31] [automated] Patreon sponsors update (#12406) * chore: update sponsors [ci skip] * Apply suggestions from code review Co-authored-by: Evan You --- BACKERS.md | 11 ++++++++--- README.md | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 079b36af87b..e63fdd878c5 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -21,7 +21,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

- +

Platinum via Patreon

@@ -87,6 +87,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + @@ -321,8 +326,8 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - - + + diff --git a/README.md b/README.md index 9bd0e700016..b68af3fd385 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

- +

Platinum Sponsors

@@ -97,6 +97,11 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + + + + + @@ -326,8 +331,8 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - - + + From d47cc19e201c425801b8ac40ec32d279ca42a508 Mon Sep 17 00:00:00 2001 From: vue-bot Date: Wed, 5 Jan 2022 11:25:05 +0100 Subject: [PATCH 24/31] chore: update backers [ci skip] (#12408) --- BACKERS.md | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index e63fdd878c5..50b1023efaa 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -501,65 +501,63 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu

Generous Backers via Patreon ($50+)

- - Yoshitaka M - Peter Imburg +- Johnny Ray Austin - Wasim Khamlichi

Backers via Patreon

- -- Theo Ephraim +- Dave Mount - Keisuke Kita +- Santiago Arizti +- Sven Güntner +- Theo Ephraim +- Mok Wang Quan - Jeffrey Rennie - Meinhard Dam - Роман Латкин - Alex Riviere - WhereJuly -- Fontis -- Jack -- Artur Bańka -- Traversy Media +- Fontis +- Jack - Pierre Baron - Donghai Gai - Aleksander Figiel -- wickedwei +- wickedwei - Sunny Yuen -- Jules +- Jules - Zeth Odderskov - Thomas Wiedemann - Nobuhide Esaki - Nat Dunn -- Roy Segall - Allan McKernan - Diana Bergholz -- Philip John Basile - Riki Fridrich - Alfonso Herrera - Bichinger Software & Consulting - Pierre Lebrun - Peter Matkovsky -- 龙腾道 -- Nick Dandakis -- Mok Wang Quan +- 龙腾道 +- Rodolfo Cavallari +- Yusuke Kawabata - Shawn Wildermuth - Elon Hung - Juan Bermudez - Daniel Mattingley -- Matt Sencenbaugh - Jaeyoung Lee - David Kaplan - David Ang - Wakana Seki - Jere Sjöroos - Donald Fischer -- Eric +- Eric - tyler madsen - Joe Gregory - Masahiro Tanaka -- Tyler +- Tyler - Jim Raden - Haim Yulzari - Asaf Yishai @@ -574,7 +572,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Wen-Tien Chang - Stephen Hartley - Victor Tolbert -- Yusuke Kawabata +- Nick Dandakis

Backers via OpenCollective

From 2317eaf4ef46a884ac307f4ae1cc7dbb7e0537ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 09:23:09 +0100 Subject: [PATCH 25/31] build(deps): bump follow-redirects from 1.13.0 to 1.14.7 (#12419) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6d58f393d2e..12cc00d2dbf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3453,9 +3453,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.0.4" follow-redirects@^1.0.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" - integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" From 9f968af556b58cfed2aaf2cd2f00a82bc6e2077e Mon Sep 17 00:00:00 2001 From: vue-bot Date: Sat, 5 Feb 2022 08:08:02 +0100 Subject: [PATCH 26/31] chore: update backers [ci skip] (#12456) --- BACKERS.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index 50b1023efaa..668303f18f2 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -505,13 +505,17 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Peter Imburg - Johnny Ray Austin - Wasim Khamlichi +- Hayden Bickerton

Backers via Patreon

+- Anun +- Victor Tolbert +- Shawn Bird - Dave Mount -- Keisuke Kita +- Rodolfo Cavallari - Santiago Arizti - Sven Güntner - Theo Ephraim @@ -523,6 +527,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - WhereJuly - Fontis - Jack +- Artur Bańka - Pierre Baron - Donghai Gai - Aleksander Figiel @@ -539,9 +544,9 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Alfonso Herrera - Bichinger Software & Consulting - Pierre Lebrun -- Peter Matkovsky +- James Macon - 龙腾道 -- Rodolfo Cavallari +- Nick Dandakis - Yusuke Kawabata - Shawn Wildermuth - Elon Hung @@ -571,8 +576,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu - Barbara Liau - Wen-Tien Chang - Stephen Hartley -- Victor Tolbert -- Nick Dandakis +- Peter Matkovsky

Backers via OpenCollective

From 23760b5c7a350484ef1eee18f8c615027a8a8ad9 Mon Sep 17 00:00:00 2001 From: Evan You Date: Mon, 7 Feb 2022 13:22:17 +0800 Subject: [PATCH 27/31] chore: update README/BACKERS [ci skip] --- .github/CONTRIBUTING.md | 10 +- BACKERS.md | 581 +--------------------------------------- README.md | 356 +----------------------- 3 files changed, 10 insertions(+), 937 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0c03779a886..5368b5481bc 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -124,15 +124,7 @@ The default test script will do the following: lint with ESLint -> type check wi ## Financial Contribution -As a pure community-driven project without major corporate backing, we also welcome financial contributions via Patreon and OpenCollective. - -- [Become a backer or sponsor on Patreon](https://www.patreon.com/evanyou) -- [Become a backer or sponsor on OpenCollective](https://opencollective.com/vuejs) -- [One-time donation via PayPal or crypto-currencies](https://vuejs.org/support-vuejs/#One-time-Donations) - -### What's the difference between Patreon and OpenCollective funding? - -Funds donated via Patreon go directly to support Evan You's full-time work on Vue.js. Funds donated via OpenCollective are managed with transparent expenses and will be used for compensating work and expenses for core team members or sponsoring community events. Your name/logo will receive proper recognition and exposure by donating on either platform. +As a pure community-driven project without major corporate backing, we also welcome financial contributions via GitHub Sponsors and OpenCollective. Please consult the [Sponsor Page](https://vuejs.org/sponsor/) for more details. ## Credits diff --git a/BACKERS.md b/BACKERS.md index 668303f18f2..fa66d206698 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -1,584 +1,9 @@

Sponsors & Backers

-Vue.js is an MIT-licensed open source project. It's an independent project with its ongoing development made possible entirely thanks to the support by these awesome [backers](https://github.com/vuejs/vue/blob/dev/BACKERS.md). If you'd like to join them, please consider: - -- [Become a backer or sponsor on Patreon](https://www.patreon.com/evanyou). -- [Become a backer or sponsor on OpenCollective](https://opencollective.com/vuejs). -- [One-time donation via PayPal or crypto-currencies.](https://vuejs.org/support-vuejs/#One-time-Donations) - -#### What's the difference between Patreon and OpenCollective? - -Funds donated via Patreon go directly to support Evan You's full-time work on Vue.js. Funds donated via OpenCollective are managed with transparent expenses and will be used for compensating work and expenses for core team members or sponsoring community events. Your name/logo will receive proper recognition and exposure by donating on either platform. - -

- -

Special Sponsors

- - +Vue.js is an MIT-licensed open source project with its ongoing development made possible entirely by the support of the awesome sponsors and backers listed in this file. If you'd like to join them, please consider [ sponsor Vue's development](https://vuejs.org/sponsor/).

- - + + sponsors

- - - -

Platinum via Patreon

- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - -

Platinum Sponsors (China)

- - - - - - - - -
- - - - - - - - - - - -
- - -

Platinum via OpenCollective

- - - - -

Gold via Patreon

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - -

Gold via OpenCollective

- - - - - - - - - - - - - -

Silver via Patreon

- -- Matt Mullenweg - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - -

Silver via OpenCollective

- - - - - - - - - - - - -

Bronze via Patreon

- - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - -

Bronze via OpenCollective

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Generous Backers via Patreon ($50+)

- - -- Yoshitaka M -- Peter Imburg -- Johnny Ray Austin -- Wasim Khamlichi -- Hayden Bickerton - - -

Backers via Patreon

- - -- Anun -- Victor Tolbert -- Shawn Bird -- Dave Mount -- Rodolfo Cavallari -- Santiago Arizti -- Sven Güntner -- Theo Ephraim -- Mok Wang Quan -- Jeffrey Rennie -- Meinhard Dam -- Роман Латкин -- Alex Riviere -- WhereJuly -- Fontis -- Jack -- Artur Bańka -- Pierre Baron -- Donghai Gai -- Aleksander Figiel -- wickedwei -- Sunny Yuen -- Jules -- Zeth Odderskov -- Thomas Wiedemann -- Nobuhide Esaki -- Nat Dunn -- Allan McKernan -- Diana Bergholz -- Riki Fridrich -- Alfonso Herrera -- Bichinger Software & Consulting -- Pierre Lebrun -- James Macon -- 龙腾道 -- Nick Dandakis -- Yusuke Kawabata -- Shawn Wildermuth -- Elon Hung -- Juan Bermudez -- Daniel Mattingley -- Jaeyoung Lee -- David Kaplan -- David Ang -- Wakana Seki -- Jere Sjöroos -- Donald Fischer -- Eric -- tyler madsen -- Joe Gregory -- Masahiro Tanaka -- Tyler -- Jim Raden -- Haim Yulzari -- Asaf Yishai -- Jon Hobbs-Smith -- Zoran Knezevic -- Bernhard E. Reiter -- Guy Gavergun -- Matt Jones -- Niannian Modisette -- Matsumoto Takamasa -- Barbara Liau -- Wen-Tien Chang -- Stephen Hartley -- Peter Matkovsky - - -

Backers via OpenCollective

- - diff --git a/README.md b/README.md index b68af3fd385..5a3f576d716 100644 --- a/README.md +++ b/README.md @@ -7,365 +7,21 @@ Version License Chat -
- Build Status

-

Supporting Vue.js

+## This repo is for Vue 2 -Vue.js is an MIT-licensed open source project with its ongoing development made possible entirely by the support of these awesome [backers](https://github.com/vuejs/vue/blob/dev/BACKERS.md). If you'd like to join them, please consider: +You are looking at the repository for Vue 2. The repo for Vue 3 is [vuejs/core](https://github.com/vuejs/core). -- [Become a backer or sponsor on Patreon](https://www.patreon.com/evanyou). -- [Become a backer or sponsor on Open Collective](https://opencollective.com/vuejs). -- [One-time donation via PayPal or crypto-currencies](https://vuejs.org/support-vuejs/#One-time-Donations). +## Sponsors -#### What's the difference between Patreon and OpenCollective? - -Funds donated via Patreon go directly to support Evan You's full-time work on Vue.js. Funds donated via OpenCollective are managed with transparent expenses and will be used for compensating work and expenses for core team members or sponsoring community events. Your name/logo will receive proper recognition and exposure by donating on either platform. - -

Special Sponsors

- +Vue.js is an MIT-licensed open source project with its ongoing development made possible entirely by the support of these awesome [backers](https://github.com/vuejs/core/blob/main/BACKERS.md). If you'd like to join them, please consider [ sponsor Vue's development](https://vuejs.org/sponsor/).

- - + + sponsors

- - - -

Platinum Sponsors

- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - -

Platinum Sponsors (China)

- - - - - - - - -
- - - - - - - - - - - -
- - -

Gold Sponsors

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - -

Sponsors via Open Collective

- -

Platinum

- - - - -

Gold

- - - - - - - - - - - --- From 712ae57dc7891f8029901fc8b7a3b342e70ac89e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 19:21:01 +0100 Subject: [PATCH 28/31] build(deps-dev): bump lodash from 4.17.19 to 4.17.21 (#12066) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 12cc00d2dbf..24a4d0c9c8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5247,15 +5247,10 @@ lodash@4.17.5: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" integrity sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw== -lodash@^4.0.1, lodash@^4.16.6, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== - -lodash@^4.17.4: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== +lodash@^4.0.1, lodash@^4.16.6, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-symbols@^1.0.2: version "1.0.2" From 6aa11872c88481dfa2da151536317176c48f226c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 19:38:12 +0100 Subject: [PATCH 29/31] build(deps): bump ajv from 6.6.2 to 6.12.6 (#12468) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/yarn.lock b/yarn.lock index 24a4d0c9c8f..0477ff0359f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -945,11 +945,11 @@ ajv-keywords@^3.1.0: integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo= ajv@^6.1.0, ajv@^6.5.3, ajv@^6.5.5, ajv@^6.6.1: - version "6.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" - integrity sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g== + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== dependencies: - fast-deep-equal "^2.0.1" + fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.4.1" uri-js "^4.2.2" @@ -3246,15 +3246,15 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fast-levenshtein@~2.0.4: version "2.0.6" @@ -8076,9 +8076,9 @@ upath@^1.0.5: integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw== uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" From 65a333fcb43737c73a66a088cea17361963e5f66 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 3 May 2022 08:47:12 +0800 Subject: [PATCH 30/31] chore: update sponsor img link [ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a3f576d716..ed68ab8bbbc 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ You are looking at the repository for Vue 2. The repo for Vue 3 is [vuejs/core]( Vue.js is an MIT-licensed open source project with its ongoing development made possible entirely by the support of these awesome [backers](https://github.com/vuejs/core/blob/main/BACKERS.md). If you'd like to join them, please consider [ sponsor Vue's development](https://vuejs.org/sponsor/).

- + sponsors

From 8d3fce029f20a73d5d0b1ff10cbf6fa73c989e62 Mon Sep 17 00:00:00 2001 From: Jinjiang Date: Wed, 13 Jul 2022 09:46:39 +0800 Subject: [PATCH 31/31] chore: fix v2 links in comments (#12653) [ci skip] --- examples/todomvc/app.js | 4 ++-- packages/vue-server-renderer/build.dev.js | 2 +- packages/vue-template-compiler/browser.js | 2 +- packages/weex-template-compiler/build.js | 2 +- packages/weex-vue-framework/factory.js | 6 +++--- src/compiler/codegen/index.js | 2 +- src/core/instance/proxy.js | 4 ++-- src/core/instance/state.js | 2 +- src/platforms/web/runtime/index.js | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/todomvc/app.js b/examples/todomvc/app.js index f8bfeb1ea61..7a1a65486a3 100644 --- a/examples/todomvc/app.js +++ b/examples/todomvc/app.js @@ -55,7 +55,7 @@ var app = new Vue({ }, // computed properties - // https://vuejs.org/guide/computed.html + // https://v2.vuejs.org/v2/guide/computed.html computed: { filteredTodos: function () { return filters[this.visibility](this.todos) @@ -129,7 +129,7 @@ var app = new Vue({ // a custom directive to wait for the DOM to be updated // before focusing on the input field. - // https://vuejs.org/guide/custom-directive.html + // https://v2.vuejs.org/v2/guide/custom-directive.html directives: { 'todo-focus': function (el, binding) { if (binding.value) { diff --git a/packages/vue-server-renderer/build.dev.js b/packages/vue-server-renderer/build.dev.js index 8235936b2bd..f4a575aba89 100644 --- a/packages/vue-server-renderer/build.dev.js +++ b/packages/vue-server-renderer/build.dev.js @@ -5157,7 +5157,7 @@ function genFor ( state.warn( "<" + (el.tag) + " v-for=\"" + alias + " in " + exp + "\">: component lists rendered with " + "v-for should have explicit keys. " + - "See https://vuejs.org/guide/list.html#key for more info.", + "See https://v2.vuejs.org/v2/guide/list.html#Maintaining-State for more info.", el.rawAttrsMap['v-for'], true /* tip */ ); diff --git a/packages/vue-template-compiler/browser.js b/packages/vue-template-compiler/browser.js index 92d3b5d913a..6ffad539827 100644 --- a/packages/vue-template-compiler/browser.js +++ b/packages/vue-template-compiler/browser.js @@ -4444,7 +4444,7 @@ state.warn( "<" + (el.tag) + " v-for=\"" + alias + " in " + exp + "\">: component lists rendered with " + "v-for should have explicit keys. " + - "See https://vuejs.org/guide/list.html#key for more info.", + "See https://v2.vuejs.org/v2/guide/list.html#Maintaining-State for more info.", el.rawAttrsMap['v-for'], true /* tip */ ); diff --git a/packages/weex-template-compiler/build.js b/packages/weex-template-compiler/build.js index 68976949e79..ba0e498cbc6 100644 --- a/packages/weex-template-compiler/build.js +++ b/packages/weex-template-compiler/build.js @@ -3489,7 +3489,7 @@ function genFor ( state.warn( "<" + (el.tag) + " v-for=\"" + alias + " in " + exp + "\">: component lists rendered with " + "v-for should have explicit keys. " + - "See https://vuejs.org/guide/list.html#key for more info.", + "See https://v2.vuejs.org/v2/guide/list.html#Maintaining-State for more info.", el.rawAttrsMap['v-for'], true /* tip */ ); diff --git a/packages/weex-vue-framework/factory.js b/packages/weex-vue-framework/factory.js index 4cb547b5250..6fad6da8755 100644 --- a/packages/weex-vue-framework/factory.js +++ b/packages/weex-vue-framework/factory.js @@ -2010,7 +2010,7 @@ if (process.env.NODE_ENV !== 'production') { 'referenced during render. Make sure that this property is reactive, ' + 'either in the data option, or for class-based components, by ' + 'initializing the property. ' + - 'See: https://vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties.', + 'See: https://v2.vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties', target ); }; @@ -2020,7 +2020,7 @@ if (process.env.NODE_ENV !== 'production') { "Property \"" + key + "\" must be accessed with \"$data." + key + "\" because " + 'properties starting with "$" or "_" are not proxied in the Vue instance to ' + 'prevent conflicts with Vue internals. ' + - 'See: https://vuejs.org/v2/api/#data', + 'See: https://v2.vuejs.org/v2/api/#data', target ); }; @@ -4900,7 +4900,7 @@ function initData (vm) { data = {}; process.env.NODE_ENV !== 'production' && warn( 'data functions should return an object:\n' + - 'https://vuejs.org/v2/guide/components.html#data-Must-Be-a-Function', + 'https://v2.vuejs.org/v2/guide/components.html#data-Must-Be-a-Function', vm ); } diff --git a/src/compiler/codegen/index.js b/src/compiler/codegen/index.js index acb3ca9118c..cb6d1f9f1e6 100644 --- a/src/compiler/codegen/index.js +++ b/src/compiler/codegen/index.js @@ -204,7 +204,7 @@ export function genFor ( state.warn( `<${el.tag} v-for="${alias} in ${exp}">: component lists rendered with ` + `v-for should have explicit keys. ` + - `See https://vuejs.org/guide/list.html#key for more info.`, + `See https://v2.vuejs.org/v2/guide/list.html#Maintaining-State for more info.`, el.rawAttrsMap['v-for'], true /* tip */ ) diff --git a/src/core/instance/proxy.js b/src/core/instance/proxy.js index b1884f7118c..74c19cf601a 100644 --- a/src/core/instance/proxy.js +++ b/src/core/instance/proxy.js @@ -19,7 +19,7 @@ if (process.env.NODE_ENV !== 'production') { 'referenced during render. Make sure that this property is reactive, ' + 'either in the data option, or for class-based components, by ' + 'initializing the property. ' + - 'See: https://vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties.', + 'See: https://v2.vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties', target ) } @@ -29,7 +29,7 @@ if (process.env.NODE_ENV !== 'production') { `Property "${key}" must be accessed with "$data.${key}" because ` + 'properties starting with "$" or "_" are not proxied in the Vue instance to ' + 'prevent conflicts with Vue internals. ' + - 'See: https://vuejs.org/v2/api/#data', + 'See: https://v2.vuejs.org/v2/api/#data', target ) } diff --git a/src/core/instance/state.js b/src/core/instance/state.js index 64d03649121..edcb13167e7 100644 --- a/src/core/instance/state.js +++ b/src/core/instance/state.js @@ -119,7 +119,7 @@ function initData (vm: Component) { data = {} process.env.NODE_ENV !== 'production' && warn( 'data functions should return an object:\n' + - 'https://vuejs.org/v2/guide/components.html#data-Must-Be-a-Function', + 'https://v2.vuejs.org/v2/guide/components.html#data-Must-Be-a-Function', vm ) } diff --git a/src/platforms/web/runtime/index.js b/src/platforms/web/runtime/index.js index fe29b22aeb1..fa645696533 100644 --- a/src/platforms/web/runtime/index.js +++ b/src/platforms/web/runtime/index.js @@ -67,7 +67,7 @@ if (inBrowser) { console[console.info ? 'info' : 'log']( `You are running Vue in development mode.\n` + `Make sure to turn on production mode when deploying for production.\n` + - `See more tips at https://vuejs.org/guide/deployment.html` + `See more tips at https://v2.vuejs.org/v2/guide/deployment.html` ) } }, 0)