From 5aa81fd841f7d295813598620e3db22f723020e6 Mon Sep 17 00:00:00 2001 From: Kostya Kurilov Date: Wed, 31 Oct 2018 16:29:15 +0300 Subject: [PATCH 1/3] Ability to rewrite settings on import --- lib/bundler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bundler.js b/lib/bundler.js index 1ebb323..e800589 100644 --- a/lib/bundler.js +++ b/lib/bundler.js @@ -120,8 +120,8 @@ function bundle(options) { }); // A necessary code snippet so the Meteor client can work properly - var runtimeconfig = "__meteor_runtime_config__ = " + - JSON.stringify(config["runtime"], null, 2) + ";\n\n"; + var runtimeconfig = "__meteor_runtime_config__ = Object.assign(" + + JSON.stringify(config["runtime"], null, 2) + ", window.__meteor_runtime_config__);\n\n"; // In case we bundle into node_modules, ensue its existence if (!options.destination || config.generateNodeModules) { From e6eb1f21d3ae3d10c97ff99a81f73270fcae977b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 27 Oct 2018 17:36:39 +0000 Subject: [PATCH 2/3] Update dependency merge to v1.2.1 --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5af6785..18cc6e5 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "commander": "2.17.1", "execa": "0.10.0", "find-root": "1.1.0", - "merge": "1.2.0", + "merge": "1.2.1", "rimraf": "2.6.2", "tmp": "0.0.33" }, diff --git a/yarn.lock b/yarn.lock index 9812356..4787667 100644 --- a/yarn.lock +++ b/yarn.lock @@ -429,9 +429,9 @@ loose-envify@^1.0.0: dependencies: js-tokens "^3.0.0" -merge@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" +merge@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" From cee6d7086938ff3fde8c0f86b6fa5d10c6d6cc8a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 Nov 2018 16:54:35 +0000 Subject: [PATCH 3/3] Update dependency commander to v2.19.0 --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 18cc6e5..fc06657 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "babel-core": "6.26.3", - "commander": "2.17.1", + "commander": "2.19.0", "execa": "0.10.0", "find-root": "1.1.0", "merge": "1.2.1", diff --git a/yarn.lock b/yarn.lock index 4787667..c4ebc2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -161,9 +161,9 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -commander@2.17.1: - version "2.17.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" +commander@2.19.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" commander@2.9.0: version "2.9.0"