Import Meteor pseudo-globals (reactioncommerce#1115)

* Import Meteor pseudo-globals

Add Meteor pseudo-globals as recommended in
https://guide.meteor.com/v1.3/structure.html#importing-meteor-globals

* Import Meteor pseudo-globals

client/modules/accounts/helpers/helpers.js

@@ -1,5 +1,6 @@
 import { _ } from "lodash";
 import { ServiceConfigHelper } from "./util";
+import { Template } from "meteor/templating";
 
 export const LoginFormSharedHelpers = {
 

client/modules/accounts/helpers/templates.js

@@ -1,5 +1,7 @@
 import { Reaction, i18next, i18nextDep } from "/client/api";
 import * as Collections from "/lib/collections";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 Template.registerHelper("getGravatar", function (currentUser, size) {
   const options = {

client/modules/accounts/helpers/util.js

@@ -1,4 +1,5 @@
 import { _ } from "lodash";
+import { Template } from "meteor/templating";
 
 function capitalize(str) {
   const finalString = str === null ? "" : String(str);

client/modules/accounts/helpers/validation.js

@@ -1,3 +1,4 @@
+import { Meteor } from "meteor/meteor";
 
 const validationMethods = {
   /**

client/modules/accounts/templates/addressBook/add/add.js

@@ -1,5 +1,8 @@
 import { i18next } from "/client/api";
 import * as Collections from "/lib/collections";
+import { Session } from "meteor/session";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 Template.addressBookAdd.helpers({
   thisAddress: function () {
@@ -23,6 +26,7 @@ Template.addressBookAdd.helpers({
         }
       }
     }
+
     if (Session.get("address")) {
       thisAddress.postal = Session.get("address").zipcode;
       thisAddress.country = Session.get("address").countryCode;

client/modules/accounts/templates/addressBook/addressBook.js

@@ -1,5 +1,8 @@
+import { Meteor } from "meteor/meteor";
+import { ReactiveVar } from "meteor/reactive-var";
 import { i18next } from "/client/api";
 import * as Collections from "/lib/collections";
+import { Template } from "meteor/templating";
 
 /*
  * Template.checkoutAddressBook

client/modules/accounts/templates/addressBook/edit/edit.js

@@ -1,4 +1,5 @@
 import { i18next } from "/client/api";
+import { Meteor } from "meteor/meteor";
 
 /*
  * update address book (cart) form handling

client/modules/accounts/templates/addressBook/form/form.js

@@ -1,5 +1,8 @@
+import { Session } from "meteor/session";
+import { Meteor } from "meteor/meteor";
 import { Countries } from "/client/collections";
 import * as Collections from "/lib/collections";
+import { Template } from "meteor/templating";
 
 Template.addressBookForm.helpers({
 
@@ -9,23 +12,23 @@ Template.addressBookForm.helpers({
   countryOptions: function () {
     return Countries.find().fetch();
   },
-  statesForCountry: function() {
-    var locale, options, ref, selectedCountry, shop, state;
-    shop = Collections.Shops.findOne();
-    selectedCountry = Session.get('addressBookCountry') || AutoForm.getFieldValue('country');
+  statesForCountry: function () {
+    let locale;
+    const shop = Collections.Shops.findOne();
+    const selectedCountry = Session.get("addressBookCountry") || AutoForm.getFieldValue("country");
     if (!selectedCountry) {
       return false;
     }
-    if ((shop != null ? shop.locales.countries[selectedCountry].states : void 0) == null) {
+    if ((shop !== null ? shop.locales.countries[selectedCountry].states : void 0) === null) {
       return false;
     }
     options = [];
-    ref = shop != null ? shop.locales.countries[selectedCountry].states : void 0;
-    for (state in ref) {
+    const ref = shop !== null ? shop.locales.countries[selectedCountry].states : void 0;
+    for (let state in ref) {
       locale = ref[state];
       options.push({
-        'label': locale.name,
-        'value': state
+        label: locale.name,
+        value: state
       });
     }
     return options;
@@ -57,7 +60,7 @@ Template.addressBookForm.helpers({
 });
 
 Template.addressBookForm.events({
-  'change [name="country"]': function() {
-    return Session.set('addressBookCountry', AutoForm.getFieldValue('country'));
+  "change [name='country']": function () {
+    return Session.set("addressBookCountry", AutoForm.getFieldValue("country"));
   }
 });

client/modules/accounts/templates/addressBook/grid/grid.js

@@ -1,4 +1,6 @@
 import * as Collections from "/lib/collections";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 /*
  * handles display of addressBook grid

client/modules/accounts/templates/dashboard/dashboard.js

@@ -1,6 +1,8 @@
+import { Meteor } from "meteor/meteor";
 import _ from "lodash";
 import { Reaction, i18next } from "/client/api";
 import { ServiceConfigHelper } from "../../helpers/util";
+import { Template } from "meteor/templating";
 
 /**
  * Accounts helpers

client/modules/accounts/templates/dropdown/dropdown.js

@@ -1,5 +1,8 @@
 import { Reaction, Logger } from "/client/api";
 import { Tags } from "/lib/collections";
+import { Session } from "meteor/session";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 Template.loginDropdown.events({
 

client/modules/accounts/templates/forgot/forgot.js

@@ -1,5 +1,6 @@
 import { i18next } from "/client/api";
 import { LoginFormSharedHelpers } from "/client/modules/accounts/helpers";
+import { Template } from "meteor/templating";
 
 Template.loginFormResetPasswordView.events({
 

client/modules/accounts/templates/inline/inline.js

@@ -1,3 +1,6 @@
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
+
 /**
  * Inline login form for instance where guest login is needed.
  */

client/modules/accounts/templates/login/loginForm.js

@@ -1,3 +1,6 @@
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
+
 // ============================================================================
 // Login form
 //

client/modules/accounts/templates/members/member.js

@@ -1,5 +1,7 @@
 import { Reaction } from "/client/api";
 import { Packages, Shops } from "/lib/collections";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 const getPermissionMap = (permissions) => {
   const permissionMap = {};

client/modules/accounts/templates/members/memberForm.js

@@ -1,4 +1,6 @@
 import { Reaction, i18next } from "/client/api";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 /**
  * memberForm events

client/modules/accounts/templates/profile/profile.js

@@ -1,4 +1,6 @@
 import * as Collections from "/lib/collections";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 /**
  * onCreated: Account Profile View

client/modules/accounts/templates/signIn/signIn.js

@@ -1,4 +1,6 @@
 import { LoginFormSharedHelpers } from "/client/modules/accounts/helpers";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 /**
  * onCreated: Login form sign in view

client/modules/accounts/templates/signUp/signUp.js

@@ -1,4 +1,5 @@
 import { LoginFormSharedHelpers } from "/client/modules/accounts/helpers";
+import { Template } from "meteor/templating";
 
 /**
  * onCreated: Login form sign up view

client/modules/accounts/templates/updatePassword/updatePassword.js

@@ -1,5 +1,6 @@
 import { i18next } from "/client/api";
 import { LoginFormSharedHelpers } from "/client/modules/accounts/helpers";
+import { Template } from "meteor/templating";
 
 ModalHelper = {
   closeModal: function (template) {

client/modules/core/accounts.js

@@ -1,4 +1,5 @@
 import { Accounts } from "meteor/accounts-base";
+import { Session } from "meteor/session";
 // import { amplify } from "meteor/amplify";
 
 /*

client/modules/core/helpers/apps.js

@@ -1,5 +1,6 @@
 import { Reaction, Logger } from "/client/api";
 import { Packages } from "/lib/collections";
+import { Template } from "meteor/templating";
 
 /**
  *

client/modules/core/helpers/globals.js

@@ -1,3 +1,7 @@
+import { Session } from "meteor/session";
+import { Meteor } from "meteor/meteor";
+// import { Roles } from "meteor/roles";
+
 // Reaction Globals
 //
 // These should all be removed. PR's happily accepted.

client/modules/core/helpers/layout.js

@@ -2,6 +2,8 @@ import Logger from "/client/modules/logger";
 import { Reaction } from "../";
 import * as Collections from "/lib/collections";
 import { _ } from "lodash";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 /**
  * reactionTemplate helper

client/modules/core/helpers/permissions.js

@@ -1,4 +1,6 @@
 import { Reaction } from "../";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 /*
  * Methods for the reaction permissions

client/modules/core/helpers/templates.js

@@ -2,6 +2,8 @@ import { i18next } from "/client/modules/i18n";
 import { Reaction } from "../";
 import * as Collections from "/lib/collections";
 import * as Schemas from "/lib/collections/schemas";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 /*
  *

client/modules/core/main.js

@@ -1,4 +1,6 @@
 import { Meteor } from "meteor/meteor";
+import { Session } from "meteor/session";
+import { check } from "meteor/check";
 import { Tracker } from "meteor/tracker";
 import Logger from "/client/modules/logger";
 import { Countries } from "/client/collections";

client/modules/core/startup.js

@@ -1,6 +1,7 @@
 import { Tracker } from "meteor/tracker";
 import Logger from "/client/modules/logger";
 import Reaction from "./main";
+import { Meteor } from "meteor/meteor";
 
 // @see https://developer.mozilla.org/en-US/docs/Web/API/Page_Visibility_API
 let hidden;

client/modules/i18n/helpers.js

@@ -2,6 +2,8 @@ import accounting from "accounting-js";
 import { i18next } from "/client/modules/i18n";
 import { localeDep, i18nextDep } from  "./main";
 import { Reaction, Logger } from "/client/api";
+import { Session } from "meteor/session";
+import { Meteor } from "meteor/meteor";
 
 /**
  * i18n

client/modules/i18n/templates/header/i18n.js

@@ -1,5 +1,6 @@
 import { Reaction } from "/client/api";
 import { Shops } from "/lib/collections";
+import { Session } from "meteor/session";
 
 /**
  * i18nChooser helpers

client/modules/i18n/templates/i18nSettings.js

@@ -2,6 +2,8 @@ import i18next from "i18next";
 import { Countries } from "/client/collections";
 import { Reaction } from "/client/api";
 import { Shops } from "/lib/collections";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 Template.i18nSettings.helpers({
   shop() {

client/modules/router/main.js

@@ -4,6 +4,9 @@ import { Reaction } from "/client/api";
 import { Logger } from "/client/modules/logger";
 import { Packages, Shops } from "/lib/collections";
 import { MetaData } from "/lib/api/router/metadata";
+import { Session } from "meteor/session";
+import { Meteor } from "meteor/meteor";
+import { Tracker } from "meteor/tracker";
 
 
 // init flow-router

imports/plugins/core/checkout/client/helpers/cart.js

@@ -1,4 +1,5 @@
 import { Cart } from "/lib/collections";
+import { Template } from "meteor/templating";
 
 /*
  * Template helpers for cart

imports/plugins/core/checkout/client/templates/cartDrawer/cartDrawer.js

@@ -1,5 +1,8 @@
 import { Reaction } from "/client/api";
 import { Cart } from "/lib/collections";
+import { Session } from "meteor/session";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 /**
  * cartDrawer helpers

imports/plugins/core/checkout/client/templates/cartDrawer/cartItems/cartItems.js

@@ -1,6 +1,7 @@
 import Swiper from "swiper";
 import { Media, Products } from "/lib/collections";
 import { _ } from "lodash";
+import { Template } from "meteor/templating";
 
 /**
  * Add swiper to cartDrawerItems

imports/plugins/core/checkout/client/templates/cartDrawer/cartSubTotals/cartSubTotals.js

@@ -1,4 +1,5 @@
 import { Cart } from "/lib/collections";
+import { Template } from "meteor/templating";
 
 /**
  * cartSubTotals helpers

imports/plugins/core/checkout/client/templates/cartIcon/cartIcon.js

@@ -1,5 +1,6 @@
 import { Reaction } from "/client/api";
 import { Cart } from "/lib/collections";
+import { Template } from "meteor/templating";
 
 /**
  * cartIcon helpers

imports/plugins/core/checkout/client/templates/cartPanel/cartPanel.js

@@ -1,4 +1,5 @@
 import { Reaction } from "/client/api";
+import { Session } from "meteor/session";
 
 /**
  * cartPanel events

imports/plugins/core/checkout/client/templates/checkout/checkout.js

@@ -1,6 +1,7 @@
 import { Reaction } from "/client/api";
 import { Cart } from "/lib/collections";
-
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 import "./checkout.html";
 
 //
@@ -13,6 +14,7 @@ Template.cartCheckout.helpers({
     if (Reaction.Subscriptions.Cart.ready()) {
       return Cart.findOne();
     }
+    return {};
   }
 });
 

imports/plugins/core/checkout/client/templates/checkout/completed/completed.js

@@ -1,5 +1,8 @@
+import { Meteor } from "meteor/meteor";
+import { Session } from "meteor/session";
 import { Reaction, i18next } from "/client/api";
 import { Orders } from "/lib/collections";
+import { Template } from "meteor/templating";
 
 /**
  * cartCompleted helpers
@@ -18,6 +21,7 @@ Template.cartCompleted.helpers({
         });
       }
     }
+    return {};
   },
   orderStatus: function () {
     if (this.workflow.status === "new") {
@@ -32,6 +36,7 @@ Template.cartCompleted.helpers({
         cartId: this._id
       });
     }
+    return {};
   }
 });
 
@@ -41,8 +46,9 @@ Template.cartCompleted.helpers({
  * adds email to order
  */
 Template.cartCompleted.events({
-  "click #update-order": function (event, template) {
-    const email = template.find("input[name=email]").value;
+  "click #update-order": function () {
+    let templateInstance = Template.instance();
+    const email = templateInstance.find("input[name=email]").value;
     check(email, String);
     const cartId = Reaction.Router.getQueryParam("_id");
     return Meteor.call("orders/addOrderEmail", cartId, email);

imports/plugins/core/checkout/client/templates/checkout/login/login.js

@@ -1,5 +1,7 @@
 import { Reaction } from "/client/api";
 import { Cart } from "/lib/collections";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 
 /**
  * checkoutLoginCompleted