@maka/meteor-sdk 0.2.6 → 0.2.7

package/isopackets/combined/npm/node_modules/meteor/babel-compiler/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-19gk8ik1laok",
+  "name": "package-new-f7zc3uwzqd",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/boilerplate-generator/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-1cilc0ofj7n",
+  "name": "package-new-11u4nyz3m9h",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/constraint-solver/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-nmm4d6phk2",
+  "name": "package-new-19xm9ai37ix",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/ddp-client/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-1putse4drfa",
+  "name": "package-new-v6ef0vjx4rg",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/ecmascript/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-3yr3ldqleqo",
+  "name": "package-new-19jq08w84he",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/ecmascript-runtime/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-g0p3mjd9xem",
+  "name": "package-new-2joq5lmn8iv",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/ecmascript-runtime-client/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-6vlz23amok6",
+  "name": "package-new-1b0zb0554sz",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/ecmascript-runtime-server/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-fjo86g7rsh",
+  "name": "package-new-1yhi9f1h0dr",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/fetch/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-do0zmzqfdtv",
+  "name": "package-new-g0ym7mkawu",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/inter-process-messaging/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-ni9wfpqalta",
+  "name": "package-new-1qllbsq0y73",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/logging/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-xlb9mzz4j1",
+  "name": "package-new-1v2yf9qqbze",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/logic-solver/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-af7rda3rf3k",
+  "name": "package-new-1o46fz1ku6f",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/meteor/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-fkoxbzqrvrc",
+  "name": "package-new-1pc9xzx5fzs",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/modules/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-cbf3elisryv",
+  "name": "package-new-17beqs9hinb",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/modules-runtime/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-14j0m0s71m4",
+  "name": "package-new-n8k3j4ylx3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/npm-mongo/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-wcdgdfqbzqi",
+  "name": "package-new-12nqeukaw3u",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/package-version-parser/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-11b302e551qi",
+  "name": "package-new-1t0jc7k23ytg",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/promise/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-gddyphm3avb",
+  "name": "package-new-d6edvk3v9nl",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/react-fast-refresh/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-blaoyieb3zd",
+  "name": "package-new-8e8v01oivjc",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/socket-stream-client/node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-1c3i33z42bi",
+  "name": "package-new-3efvozmolln",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/meteor-sdk",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Programmatic Node API over the Meteor build tool (bundle/run/create/etc.) -- for driving Meteor's build system from plain Node code instead of shelling out to a meteor CLI (there isn't one anymore; see README.md). \"dependencies\" is generated by scripts/write-tool-package-json.js from scripts/dev-bundle-tool-package.js at the monorepo root -- do not hand-edit that field, edit that file and re-run the script instead.",
   "main": "src/index.js",
   "exports": {

package/tools/isobuild/meteor-npm.js

@@ -731,6 +731,8 @@ var updateExistingNpmDirectory = async function (packageName, newPackageNpmDir,
     npmTree.dependencies[name] = { version };
   });
 
+  reconcileGitDependencies(npmTree, installedDependenciesTree);
+
   let minInstalledTree;
   try {
     minInstalledTree = minimizeDependencyTree(installedDependenciesTree);
@@ -838,6 +840,72 @@ var updateExistingNpmDirectory = async function (packageName, newPackageNpmDir,
                        npmDependencies);
 };
 
+// Git-URL dependencies could never satisfy the strict string comparison
+// in updateExistingNpmDirectory: Npm.depends declares the spec the
+// author wrote (e.g. "git+https://github.com/org/repo#v1.2.3") while
+// npm's lockfile records what it resolved (e.g.
+// "git+ssh://git@github.com/org/repo.git#<commit-sha>"). The result was
+// a FULL reinstall of the package's npm deps -- git clone included --
+// on every single build, and during `run` the .npm/package churn could
+// re-fire the file watcher, restarting the app in a loop ("ddp-server:
+// updating npm dependencies ..." flapping forever).
+//
+// Reconcile before comparing: a declared git dep is satisfied by an
+// installed copy from the same repository when the declared ref is
+// consistent with what's installed -- a commit-sha ref must prefix the
+// resolved sha, a "v1.2.3"/"1.2.3" tag must equal the installed
+// package's own version, and a symbolic ref (branch) is accepted as-is
+// (it can move upstream, but reinstalling every build is strictly
+// worse; pin by tag or sha for reproducibility). On a match the
+// declared version is rewritten to the installed resolved URL so the
+// strict subtree comparison passes; on a mismatch (e.g. the tag was
+// bumped) nothing is rewritten and the normal update runs.
+function parseGitUrl(url) {
+  if (typeof url !== "string") {
+    return null;
+  }
+  const m = url.match(
+    /^git\+(?:https?|ssh|git|file):\/\/(?:[^@/]+@)?([^#?]+?)(?:\.git)?(?:#(.*))?$/i
+  );
+  if (! m) {
+    return null;
+  }
+  return { repo: m[1].toLowerCase(), ref: m[2] || null };
+}
+
+function reconcileGitDependencies(npmTree, installedTree) {
+  _.each(npmTree.dependencies, (dep, name) => {
+    const declared = parseGitUrl(dep.version);
+    if (! declared) {
+      return;
+    }
+    const installed = installedTree.dependencies &&
+      installedTree.dependencies[name];
+    const resolved = installed && parseGitUrl(installed.resolved);
+    if (! resolved || resolved.repo !== declared.repo) {
+      return;
+    }
+    const ref = declared.ref;
+    let refSatisfied;
+    if (! ref) {
+      refSatisfied = true;
+    } else if (/^[0-9a-f]{7,40}$/i.test(ref)) {
+      refSatisfied = !! resolved.ref &&
+        resolved.ref.toLowerCase().startsWith(ref.toLowerCase());
+    } else if (/^v?\d+(\.\d+)*([-+.].*)?$/.test(ref)) {
+      refSatisfied = !! installed.version &&
+        ref.replace(/^v/, "") === installed.version;
+    } else {
+      refSatisfied = true;
+    }
+    if (refSatisfied) {
+      dep.version = minimizeDependencyTree({
+        dependencies: { [name]: installed },
+      }).dependencies[name].version;
+    }
+  });
+}
+
 function isSubtreeOf(subsetTree, supersetTree, predicate) {
   if (subsetTree === supersetTree) {
     return true;