@maka/meteor-sdk 0.2.10 → 0.2.11

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

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-1kpsk4y03rr",
+  "name": "package-new-aon0csck5nc",
   "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-xg8du3zbrol",
+  "name": "package-new-7itqfmhxkkg",
   "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-mhlbtt2fnfc",
+  "name": "package-new-qgt8go4v4cs",
   "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-f24lx9gefxh",
+  "name": "package-new-fbqyehtl14",
   "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-9bziul8lrot",
+  "name": "package-new-1nlaexi6t2",
   "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-9xqggeva6vs",
+  "name": "package-new-13bd6omdq4x",
   "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-1ils6fgco69",
+  "name": "package-new-1le53rxf2hi",
   "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-fz7zd0zppze",
+  "name": "package-new-1a1df3n6xd4",
   "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-1bo66emam3qj",
+  "name": "package-new-1ldgtyhcd5n",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/isopackets/combined/npm/node_modules/meteor/fetch/node_modules/node-fetch/.meteor-portable-2.json

@@ -0,0 +1 @@
+true

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

@@ -1,5 +1,5 @@
 {
-  "name": "package-new-153hmyzmzzo",
+  "name": "package-new-14v72dpcwfz",
   "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-xqdz4rb997l",
+  "name": "package-new-8wlu1ysez5",
   "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-13pz8f1aynj",
+  "name": "package-new-33r4gwibq95",
   "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-197wm78nwi7",
+  "name": "package-new-2wo7c94bv9g",
   "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-17en99ibbmv",
+  "name": "package-new-z9yv54fjb0r",
   "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-1cp3re039w9",
+  "name": "package-new-1grd8lv1qrj",
   "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-1wkg0541fwq",
+  "name": "package-new-1qdbcf9ihki",
   "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-b5a9l27ykfp",
+  "name": "package-new-y4wyssce4p",
   "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-1f74r589ogwk",
+  "name": "package-new-ilz08vtgbji",
   "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-1v9u2tnhfn",
+  "name": "package-new-1w7r6hcpr0b",
   "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-lsdjl8inhw",
+  "name": "package-new-x51xwlmyyae",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/meteor-sdk",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "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/src/bootstrap.js

@@ -120,18 +120,22 @@ function ensureMainModuleShim() {
   };
 }
 
-// Kick off the persistent npm-deps cache prewarm (see tools/isobuild/
-// meteor-npm.js): restore every bundled package's node_modules from
-// ~/.meteor-npm-cache in parallel, so the first build after a fresh SDK
-// install doesn't pay a serial `npm install` per package. Deliberately
-// NOT awaited -- each restore holds the same cross-process lock
-// updateDependencies() takes, so a build racing ahead of the prewarm
-// simply waits on (or wins) the per-package lock; firing it before
-// ensureRuntimeReady() lets even the isopacket builds overlap with it.
+// Restore every bundled package's node_modules from ~/.meteor-npm-cache
+// in parallel (see tools/isobuild/meteor-npm.js), so the first build
+// after a fresh SDK install doesn't pay a serial `npm install` per
+// package. Restore-only here (no npm spawns) -- fast even across all
+// ~140 bundled packages -- but still MUST be awaited before
+// ensureRuntimeReady() touches any package: a createAppRunner() run
+// sets up its file watcher soon after bootstrap, and a background swap
+// racing that watcher's dependency-graph capture is exactly the bug
+// that caused a per-package restart storm (see project.js's
+// runAppNpmDepsPrewarm, which hit this for the app-scoped install
+// stage -- same class of race, same fix). Memoized so a later
+// bootstrap() call (already a no-op after the first) never re-runs it.
 let npmDepsCachePrewarm = null;
-function startNpmDepsCachePrewarm() {
+function npmDepsCachePrewarmPromise() {
   if (npmDepsCachePrewarm) {
-    return;
+    return npmDepsCachePrewarm;
   }
   try {
     const meteorNpm = require("../tools/isobuild/meteor-npm.js");
@@ -143,6 +147,7 @@ function startNpmDepsCachePrewarm() {
     // Best-effort: the build's own per-package install path still works.
     npmDepsCachePrewarm = Promise.resolve();
   }
+  return npmDepsCachePrewarm;
 }
 
 // Idempotent: safe to call from every public SDK entry point. The actual
@@ -177,7 +182,7 @@ async function bootstrap(options) {
   require("../tools/tool-env/install-babel.js");
   ensureAsyncLocalStorage();
   consoleAdapter.patch();
-  startNpmDepsCachePrewarm();
+  await npmDepsCachePrewarmPromise();
   await ensureRuntimeReady(options && options.offline);
   bootstrapped = true;
 }

package/src/project.js

@@ -70,13 +70,25 @@ async function loadProject(projectDir) {
   // the exact core-package set the build will need, so cache MISSES can
   // be npm-installed too -- in parallel (small pool; concurrent npm
   // processes contend on npm's shared content cache) and BEFORE the
-  // build's serial per-package walk, which also keeps those installs'
-  // .npm churn from re-firing the app runner's file watcher mid-build.
-  // Un-awaited: every prewarm operation holds the same cross-process
-  // per-package lock updateDependencies() takes, so the build below
-  // simply waits on (or wins) each package's lock. Best-effort by
-  // design -- on any failure the build installs serially as before.
-  startAppNpmDepsPrewarm(standardProjectDir);
+  // build's serial per-package walk.
+  //
+  // MUST be awaited, not fire-and-forget: prepareProjectForBuild()
+  // below captures each package's WatchSet (which includes
+  // npm-shrinkwrap.json) for the run/build that follows. For a one-shot
+  // bundle() an un-awaited prewarm only risked harmless redundant work
+  // with the real build's own on-demand install (the per-package lock
+  // serializes it). But createAppRunner()'s WATCHED run reacts to any
+  // change in that WatchSet -- including the prewarm's own (correct)
+  // .npm swap -- by restarting the build, which calls loadProject()
+  // again, which fired ANOTHER un-awaited prewarm pass for whatever
+  // wasn't done yet, repeating once per package (observed: a restart
+  // storm that ground through all ~25 core packages one at a time,
+  // matching the exact original "updating npm dependencies" report).
+  // Awaiting here means every relevant package's deps are settled
+  // before any watcher is ever created, so there is nothing left for
+  // it to race. Best-effort either way -- on any failure below the
+  // build's own on-demand install path still runs, just slower.
+  await runAppNpmDepsPrewarm(standardProjectDir);
 
   await runCaptured("preparing project", () =>
     projectContext.prepareProjectForBuild()
@@ -85,7 +97,7 @@ async function loadProject(projectDir) {
   return new Project(projectContext);
 }
 
-function startAppNpmDepsPrewarm(standardProjectDir) {
+async function runAppNpmDepsPrewarm(standardProjectDir) {
   try {
     const files = require("../tools/fs/files");
     const versionsFile = files.pathJoin(
@@ -101,12 +113,10 @@ function startAppNpmDepsPrewarm(standardProjectDir) {
       return;
     }
     const meteorNpm = require("../tools/isobuild/meteor-npm.js");
-    Promise.resolve(
-      meteorNpm.prewarmNpmDepsCache(
-        path.resolve(__dirname, "..", "packages"),
-        { onlyPackages: names, installOnMiss: true }
-      )
-    ).catch(() => {});
+    await meteorNpm.prewarmNpmDepsCache(
+      path.resolve(__dirname, "..", "packages"),
+      { onlyPackages: names, installOnMiss: true }
+    );
   } catch (e) {
     // Best-effort: the build's own per-package install path still works.
   }