From 808705c467367f1e4bd244d62f951624b3d9b3dd Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Sat, 3 Apr 2021 21:12:45 +0200 Subject: [PATCH 1/5] Make launch-screen only for Cordova & update plugin --- packages/launch-screen/package.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js index 52d688d784..1352b70175 100644 --- a/packages/launch-screen/package.js +++ b/packages/launch-screen/package.js @@ -6,17 +6,17 @@ Package.describe({ // between such packages and the build tool. name: 'launch-screen', summary: 'Default and customizable launch screen on mobile.', - version: '1.2.0' + version: '1.3.0' }); Cordova.depends({ - 'cordova-plugin-splashscreen': '5.0.3' + 'cordova-plugin-splashscreen': '6.0.0' }); Package.onUse(function(api) { - api.addFiles('mobile-launch-screen.js', 'web'); - api.addFiles('default-behavior.js', 'web'); - api.use(['blaze', 'templating'], 'web', { weak: true }); + api.addFiles('mobile-launch-screen.js', 'web.cordova'); + api.addFiles('default-behavior.js', 'web.cordova'); + api.use(['blaze', 'templating'], 'web.cordova', { weak: true }); api.export('LaunchScreen'); }); From 8c458636f1374be98a7999fa33a19decad3ca48b Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Mon, 3 May 2021 12:54:48 +0200 Subject: [PATCH 2/5] Fix $mul tests for minimongo --- packages/minimongo/minimongo_tests_client.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/minimongo/minimongo_tests_client.js b/packages/minimongo/minimongo_tests_client.js index 95526acaea..1e369c8d06 100644 --- a/packages/minimongo/minimongo_tests_client.js +++ b/packages/minimongo/minimongo_tests_client.js @@ -2234,7 +2234,7 @@ Tinytest.add('minimongo - nested array sort', test => { c.insert({ ab0x: 6, ab0x_g: 6, g_ab0x: 6, cdx: 8, cdx_cdy: 8, cdy_cdx: 2, n: 6 , a: { b: [{ x: 2.5 }] }, c: { d: [{x: 2, y: 2}, {x: 3}] }, g: 4 }); c.insert({ ab0x: 7, ab0x_g: 7, g_ab0x: 7, cdx: 4, cdx_cdy: 4, cdy_cdx: 6, n: 7 , a: { b: [{ x: 5 }] }, c: { d: [{ y: 2}, { y: 3}] }, g: 5 }); c.insert({ ab0x: 8, ab0x_g: 8, g_ab0x: 8, cdx: 5, cdx_cdy: 5, cdy_cdx: 7, n: 8 , a: { b: [{ x: 6 }, { x: 7 }] }, c: { d: [{ y: 2}, { x: 1.5, y: 2}] }, g: 6 }); - + // Test that the the documents in "cursor" contain values with the name // "field" running from 0 to the max value of that name in the collection. const testCursorMatchesField = (cursor, field) => { @@ -2254,7 +2254,7 @@ Tinytest.add('minimongo - nested array sort', test => { testCursorMatchesField(c.find({}, { sort: { 'c.d.x': 1 } }), 'cdx'); testCursorMatchesField(c.find({}, { sort: { 'c.d.x': 1, 'c.d.y': 1 } }), 'cdx_cdy'); testCursorMatchesField(c.find({}, { sort: { 'c.d.y': 1, 'c.d.x': 1 } }), 'cdy_cdx'); - + }); Tinytest.add('minimongo - sort keys', test => { @@ -2312,7 +2312,7 @@ Tinytest.add('minimongo - sort keys', test => { testKeys({'a.0.x': 1}, {a: [{x: 0}]}, [[0]]); - + testKeys({'a.0.x': 1}, {a: []}, [[undefined]]); @@ -2673,10 +2673,10 @@ Tinytest.add('minimongo - modify', test => { exception({a: false}, {$mul: {a: 10}}); exception({a: null}, {$mul: {a: 10}}); exception({}, {$mul: {_id: 1}}); - modify({a: [1, 2]}, {$mul: {'a.1': 2}}, {a: [2, 1]}); - modify({a: [1, 2]}, {$mul: {'a.1': 3}}, {a: [3, 2]}); - modify({a: [1, 2]}, {$mul: {'a.2': 10}}, {a: [1, 20]}); - modify({a: [1, 2]}, {$mul: {'a.3': 10}}, {a: [1, 2, 0]}); + modify({a: [1, 2]}, {$mul: {'a.0': 2}}, {a: [2, 2]}); + modify({a: [1, 2]}, {$mul: {'a.1': 3}}, {a: [1, 6]}); + modify({a: [1, 2]}, {$mul: {'a.1': 10}}, {a: [1, 20]}); + modify({a: [1, 2]}, {$mul: {'a.2': 10}}, {a: [1, 2, 0]}); modify({a: {b: 2}}, {$mul: {'a.b': 1}}, {a: {b: 2}}); modify({a: {b: 2}}, {$mul: {'a.c': 10}}, {a: {b: 2, c: 0}}); From 59be9d6fc01170669543fe122b0873b8249b36d2 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 6 May 2021 11:26:52 +0200 Subject: [PATCH 3/5] Sync with Blaze --- packages/non-core/blaze | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/non-core/blaze b/packages/non-core/blaze index 29fcf43a0b..5910ff535c 160000 --- a/packages/non-core/blaze +++ b/packages/non-core/blaze @@ -1 +1 @@ -Subproject commit 29fcf43a0b36776408ec177a6f1be1d6b7d370ba +Subproject commit 5910ff535cc30988126665a5ab177fc189b51c94 From 7ead20376fe557deb0ddebd16b7efb589f44b5a7 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 6 May 2021 12:31:56 +0200 Subject: [PATCH 4/5] Fix double "changes" section in 1.9 release notes --- History.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/History.md b/History.md index 3405f4f551..c5e2a155b1 100644 --- a/History.md +++ b/History.md @@ -576,8 +576,6 @@ N/A * Facebook OAuth has been updated to call v5 API endpoints. [PR #10738](https://github.com/meteor/meteor/pull/10738) -### Changes - * `Meteor.user()`, `Meteor.findUserByEmail()` and `Meteor.findUserByUserName()` can take a new `options` parameter which can be used to limit the returned fields. Useful for minimizing DB bandwidth on the server and avoiding unnecessary reactive UI updates on the client. From c1c0f73c8963ecf9abc948de4b3582549fa2655c Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Fri, 7 May 2021 17:33:51 +0900 Subject: [PATCH 5/5] Revert "Merge pull request #11371 from meteor/launchscreen-client-removal" This reverts commit f804c69a603bc2e66f22ca401c99c331fab8da70. --- packages/launch-screen/package.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js index 1352b70175..78b34858f9 100644 --- a/packages/launch-screen/package.js +++ b/packages/launch-screen/package.js @@ -6,7 +6,7 @@ Package.describe({ // between such packages and the build tool. name: 'launch-screen', summary: 'Default and customizable launch screen on mobile.', - version: '1.3.0' + version: '1.2.1' }); Cordova.depends({ @@ -14,9 +14,9 @@ Cordova.depends({ }); Package.onUse(function(api) { - api.addFiles('mobile-launch-screen.js', 'web.cordova'); - api.addFiles('default-behavior.js', 'web.cordova'); - api.use(['blaze', 'templating'], 'web.cordova', { weak: true }); + api.addFiles('mobile-launch-screen.js', 'web'); + api.addFiles('default-behavior.js', 'web'); + api.use(['blaze', 'templating'], 'web', { weak: true }); api.export('LaunchScreen'); });