Make compatible 2.8

npm-packages/meteor-promise/fiber_pool.js

@@ -1,4 +1,5 @@
 var assert = require("assert");
+const { AsyncResource } = require("async_hooks");
 
 function FiberPool(targetFiberCount) {
   assert.ok(this instanceof FiberPool);
@@ -26,7 +27,6 @@ function FiberPool(targetFiberCount) {
           // continue waiting for the next entry object.
           continue;
         }
-
         // Ensure this Fiber is no longer in the pool once it begins to
         // execute an entry.
         assert.strictEqual(fiberStack.indexOf(fiber), -1);
@@ -40,10 +40,10 @@ function FiberPool(targetFiberCount) {
         }
 
         try {
-          entry.resolve(entry.callback.apply(
+          entry.resolve(entry._ar.runInAsyncScope(() => entry.callback.apply(
             entry.context || null,
             entry.args || []
-          ));
+          )));
         } catch (error) {
           entry.reject(error);
         }
@@ -79,7 +79,7 @@ function FiberPool(targetFiberCount) {
   this.run = function (entry, Promise) {
     assert.strictEqual(typeof entry, "object");
     assert.strictEqual(typeof entry.callback, "function");
-
+    entry._ar = new AsyncResource("FiberPoolJob");
     if (typeof Promise.Fiber !== "function") {
       return new Promise(function (resolve) {
         resolve(entry.callback.apply(
@@ -95,7 +95,6 @@ function FiberPool(targetFiberCount) {
       entry.resolve = resolve;
       entry.reject = reject;
     });
-
     fiber.run(entry);
 
     return promise;

npm-packages/meteor-promise/package.json

@@ -1,7 +1,7 @@
 {
   "name": "meteor-promise",
   "author": "Ben Newman <[email protected]>",
-  "version": "0.9.1",
+  "version": "0.9.1-2",
   "description": "ES6 Promise polyfill with Fiber support",
   "keywords": [
     "meteor",

npm-packages/meteor-promise/promise_server.js

@@ -3,6 +3,7 @@ var fiberPool = require("./fiber_pool.js").makePool();
 
 exports.makeCompatible = function (Promise, Fiber) {
   var es6PromiseThen = Promise.prototype.then;
+  Promise.prototype.es6PromiseThen = es6PromiseThen;
 
   if (typeof Fiber === "function") {
     Promise.Fiber = Fiber;
@@ -16,6 +17,9 @@ exports.makeCompatible = function (Promise, Fiber) {
     var Promise = this.constructor;
     var Fiber = Promise.Fiber;
 
+    if (Promise.noYieldOnFiberlessThen && Fiber && !Fiber.current) {
+      return es6PromiseThen.call(this, onResolved, onRejected);
+    }
     if (typeof Fiber === "function" &&
         ! this._meteorPromiseAlreadyWrapped) {
       onResolved = wrapCallback(onResolved, Promise);
@@ -84,7 +88,6 @@ exports.makeCompatible = function (Promise, Fiber) {
       run = process.domain.bind(run);
       throwInto = process.domain.bind(throwInto);
     }
-
     // The overridden es6PromiseThen function is adequate here because these
     // two callbacks do not need to run in a Fiber.
     es6PromiseThen.call(promise, function (result) {

packages/accounts-base/accounts_server.js

@@ -465,6 +465,9 @@ export class AccountsServer extends AccountsCommon {
     if (user) {
       attempt.user = user;
     }
+    if (result.options) {
+      attempt.options = result.options;
+    }
 
     // _validateLogin may mutate `attempt` by adding an error and changing allowed
     // to false, but that's the only change it can make (and the user's callbacks
@@ -1804,21 +1807,23 @@ const setupUsersCollection = users => {
   });
 
   /// DEFAULT INDEXES ON USERS
-  users.createIndex('username', { unique: true, sparse: true });
-  users.createIndex('emails.address', { unique: true, sparse: true });
-  users.createIndex('services.resume.loginTokens.hashedToken',
-    { unique: true, sparse: true });
-  users.createIndex('services.resume.loginTokens.token',
-    { unique: true, sparse: true });
-  // For taking care of logoutOtherClients calls that crashed before the
-  // tokens were deleted.
-  users.createIndex('services.resume.haveLoginTokensToDelete',
-    { sparse: true });
-  // For expiring login tokens
-  users.createIndex("services.resume.loginTokens.when", { sparse: true });
-  // For expiring password tokens
-  users.createIndex('services.password.reset.when', { sparse: true });
-  users.createIndex('services.password.enroll.when', { sparse: true });
+  Meteor.startup(() => {
+    users.createIndex('username', { unique: true, sparse: true });
+    users.createIndex('emails.address', { unique: true, sparse: true });
+    users.createIndex('services.resume.loginTokens.hashedToken',
+      { unique: true, sparse: true });
+    users.createIndex('services.resume.loginTokens.token',
+      { unique: true, sparse: true });
+    // For taking care of logoutOtherClients calls that crashed before the
+    // tokens were deleted.
+    users.createIndex('services.resume.haveLoginTokensToDelete',
+      { sparse: true });
+    // For expiring login tokens
+    users.createIndex("services.resume.loginTokens.when", { sparse: true });
+    // For expiring password tokens
+    users.createIndex('services.password.reset.when', { sparse: true });
+    users.createIndex('services.password.enroll.when', { sparse: true });
+  });
 };
 
 
@@ -1840,4 +1845,3 @@ const generateCasePermutationsForString = string => {
   }
   return permutations;
 }
-

packages/accounts-base/accounts_tests.js

@@ -710,7 +710,7 @@ Tinytest.add(
   'accounts - verify setAdditionalFindUserOnExternalLogin hook can provide user',
   test => {
       // create test user, without a google service
-      const testEmail = "[email protected]"
+      const testEmail = "[email protected]" + Random.id();
       const uid0 = Accounts.createUser({email: testEmail})
 
       // Verify that user is found from email and service merged

packages/accounts-base/client_main.js

@@ -7,7 +7,7 @@ import {
  * @namespace Accounts
  * @summary The namespace for all client-side accounts-related methods.
  */
-Accounts = new AccountsClient();
+const Accounts = new AccountsClient();
 
 /**
  * @summary A [Mongo.Collection](#collections) containing user documents.
@@ -20,9 +20,5 @@ Meteor.users = Accounts.users;
 export {
   Accounts,
   AccountsClient,
-  AccountsTest,
-  // For backwards compatibility. Note that exporting an object as the
-  // default export is *not* the same as exporting its properties as named
-  // exports, as was previously assumed.
-  exports as default,
+  AccountsTest
 };

packages/accounts-base/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'A user account system',
-  version: '2.2.5',
+  version: '2.2.6-2',
 });
 
 Package.onUse(api => {

packages/accounts-base/server_main.js

@@ -4,7 +4,7 @@ import { AccountsServer } from "./accounts_server.js";
  * @namespace Accounts
  * @summary The namespace for all server-side accounts-related methods.
  */
-Accounts = new AccountsServer(Meteor.server);
+const Accounts = new AccountsServer(Meteor.server);
 
 // Users table. Don't use the normal autopublish, since we want to hide
 // some fields. Code to autopublish this is in accounts_server.js.
@@ -23,5 +23,6 @@ export {
   // accounts-base package, properties of non-entry-point modules need to
   // be re-exported in order to be accessible to modules that import the
   // accounts-base package.
-  AccountsServer
+  AccountsServer,
+  Accounts
 };

packages/accounts-password/password_server.js

@@ -1,5 +1,6 @@
 import bcrypt from 'bcrypt'
 import {Accounts} from "meteor/accounts-base";
+import Fiber from "fibers";
 
 const bcryptHash = Meteor.wrapAsync(bcrypt.hash);
 const bcryptCompare = Meteor.wrapAsync(bcrypt.compare);
@@ -997,9 +998,11 @@ Accounts.createUser = (options, callback) => {
 ///
 /// PASSWORD-SPECIFIC INDEXES ON USERS
 ///
-Meteor.users.createIndex('services.email.verificationTokens.token',
-                          { unique: true, sparse: true });
-Meteor.users.createIndex('services.password.reset.token',
-                          { unique: true, sparse: true });
-Meteor.users.createIndex('services.password.enroll.token',
-                          { unique: true, sparse: true });
+new Fiber(() => {
+  Meteor.users.createIndex('services.email.verificationTokens.token',
+                            { unique: true, sparse: true });
+  Meteor.users.createIndex('services.password.reset.token',
+                            { unique: true, sparse: true });
+  Meteor.users.createIndex('services.password.enroll.token',
+                            { unique: true, sparse: true });
+}).run()

packages/accounts-password/password_tests.js

@@ -366,7 +366,7 @@ if (Meteor.isClient) (() => {
     // Create user error without callback should throw error
     function (test, expect) {
       this.newUsername = `adalovelace${this.randomSuffix}`;
-      test.throws(function(){
+      test.throws(() => {
         Accounts.createUser({ username: this.newUsername, password: '' });
       }, /Password may not be empty/);
     },

packages/assets/client.js

@@ -0,0 +1,3 @@
+export function createAssets() {
+  return {};
+}

packages/assets/package.js

@@ -0,0 +1,10 @@
+Package.describe({
+  name: 'assets',
+  version: '0.0.3',
+  description: 'a simple assets package',
+});
+
+Package.onUse(function (api) {
+  api.mainModule('server.js', 'server');
+  api.mainModule('client.js', 'client');
+});

packages/assets/server.js

@@ -0,0 +1,24 @@
+
+import fs from 'fs';
+import fsPromises from 'fs/promises';
+import Fiber from 'fibers';
+import path from 'path';
+
+export function createAssets(moduleId) {
+  const basePath = path.dirname(moduleId).replace('file:', '');
+  return {
+    getText(file) {
+      return Fiber.current
+        ? Promise.await(fsPromises.readFile(path.join(basePath, file))).toString()
+        : fs.readFileSync(path.join(basePath, file)).toString();
+    },
+    getBinary(file) {
+      return Fiber.current
+        ? Promise.await(fsPromises.readFile(path.join(basePath, file))).toString()
+        : fs.readFileSync(path.join(basePath, file)).toString();
+    },
+    absoluteFilePath(file) {
+      return path.join(basePath, file);
+    }
+  }
+};

packages/autoupdate/autoupdate_server.js

@@ -56,6 +56,7 @@ Autoupdate.appId = __meteor_runtime_config__.appId = process.env.APP_ID;
 var syncQueue = new Meteor._SynchronousQueue();
 
 function updateVersions(shouldReloadClientProgram) {
+  Promise.await(WebApp.waitForReady());
   // Step 1: load the current client program on the server
   if (shouldReloadClientProgram) {
     WebAppInternals.reloadClientPrograms();

packages/babel-compiler/package.js

@@ -6,6 +6,7 @@ Package.describe({
 
 Npm.depends({
   '@meteorjs/babel': '7.16.0-beta.1',
+  'semver': '7.3.8',
   'json5': '2.1.1'
 });
 

packages/babel-runtime/babel-runtime.js

@@ -1,5 +1,5 @@
 try {
-  var babelRuntimeVersion = require("@babel/runtime/package.json").version;
+  //var babelRuntimeVersion = (await import("@babel/runtime/package.json")).version;
 } catch (e) {
   throw new Error([
     "",
@@ -10,7 +10,7 @@ try {
     ""
   ].join("\n"));
 }
-
+/*
 if (parseInt(babelRuntimeVersion, 10) < 7 ||
     (babelRuntimeVersion.indexOf("7.0.0-beta.") === 0 &&
      parseInt(babelRuntimeVersion.split(".").pop(), 10) < 56)) {
@@ -24,3 +24,4 @@ if (parseInt(babelRuntimeVersion, 10) < 7 ||
     ""
   ].join("\n"));
 }
+*/

packages/boilerplate-generator/generator.js

@@ -1,8 +1,8 @@
 import { readFile } from 'fs';
 import { create as createStream } from "combined-stream2";
 
-import WebBrowserTemplate from './template-web.browser';
-import WebCordovaTemplate from './template-web.cordova';
+import * as WebBrowserTemplate from './template-web.browser';
+import * as WebCordovaTemplate from './template-web.cordova';
 
 // Copied from webapp_server
 const readUtf8FileSync = filename => Meteor.wrapAsync(readFile)(filename, 'utf8');
@@ -118,7 +118,7 @@ export class Boilerplate {
 
     manifest.forEach(item => {
       const urlPath = urlMapper(item.url);
-      const itemObj = { url: urlPath };
+      const itemObj = { url: urlPath, type: item.type };
 
       if (inline) {
         itemObj.scriptContent = readUtf8FileSync(
@@ -132,7 +132,7 @@ export class Boilerplate {
         boilerplateBaseData.css.push(itemObj);
       }
 
-      if (item.type === 'js' && item.where === 'client' &&
+      if ((item.type === 'js' || item.type === 'module js') && item.where === 'client' &&
         // Dynamic JS modules should not be loaded eagerly in the
         // initial HTML of the app.
         !item.path.startsWith('dynamic/')) {

packages/boilerplate-generator/template-web.browser.js

@@ -62,9 +62,10 @@ export const closeTemplate = ({
   '',
 
   ...(js || []).map(file =>
-    template('  <script type="text/javascript" src="<%- src %>"<%= sri %>></script>')({
+    template('  <script type="<%- type %>" src="<%- src %>"<%= sri %>></script>')({
       src: bundledJsCssUrlRewriteHook(file.url),
       sri: sri(file.sri, sriMode),
+      type: file.type === 'module js' ? 'module' : 'text/javascript'
     })
   ),
 

packages/browser-policy-content/browser-policy-content.js

@@ -1,3 +1,4 @@
+import Fiber from 'fibers';
 // By adding this package, you get the following default policy:
 // No eval or other string-to-code, and content can only be loaded from the
 // same origin as the app (except for XHRs and websocket connections, which can
@@ -300,6 +301,7 @@ _.each(resources,
 function (resource) {
   };
 });
 
-setDefaultPolicy();
+// setDefaultPolicy eventually calls WebAppInternals.generateBoilerplate which must be in a fiber
+new Fiber(() => { setDefaultPolicy(); }).run();
 
 exports.BrowserPolicy = BrowserPolicy;

packages/context/context.js

@@ -6,10 +6,10 @@ const {
   asyncFromGen,
 } = require("@wry/context");
 
-Object.assign(exports, {
+export {
   Slot,
   bind,
   noContext,
   setTimeout,
   asyncFromGen,
-});
+}

packages/ddp-client/common/livedata_connection.js

@@ -7,6 +7,7 @@ import { Hook } from 'meteor/callback-hook';
 import { MongoID } from 'meteor/mongo-id';
 import { DDP } from './namespace.js';
 import MethodInvoker from './MethodInvoker.js';
+import { ClientStream } from "meteor/socket-stream-client";
 import {
   hasOwn,
   slice,
@@ -84,7 +85,6 @@ export class Connection {
     if (typeof url === 'object') {
       self._stream = url;
     } else {
-      const { ClientStream } = require("meteor/socket-stream-client");
       self._stream = new ClientStream(url, {
         retry: options.retry,
         ConnectionError: DDP.ConnectionError,