From 616ebc3503d85294364fbde74a2112a86f70b1ec Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Mon, 19 Jun 2017 10:37:46 -0700 Subject: [PATCH 1/3] Move babelrc into package.json --- .babelrc | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .babelrc diff --git a/.babelrc b/.babelrc deleted file mode 100644 index e18013c87f5..00000000000 --- a/.babelrc +++ /dev/null @@ -1,14 +0,0 @@ -{ - "plugins": [ - "lodash", - ["module-resolver", { - "root": ["./"], - "alias": { - "underscore": "lodash", - "@reactioncommerce/reaction-ui": "./imports/plugins/core/ui/client/components", - "@reactioncommerce/reaction-router": "./imports/plugins/core/router/lib" - } - }] - ], - "presets": ["es2015", "react", "stage-2"] -} From eb11a4ebd7374fc2c61b9bd97a1b13a705e8ebf1 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Mon, 19 Jun 2017 10:37:57 -0700 Subject: [PATCH 2/3] Updated dependencies --- .meteor/versions | 8 ++++---- package.json | 31 ++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index 97aa63b8e46..08803df174b 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -2,7 +2,7 @@ accounts-base@1.3.0 accounts-facebook@1.2.0 accounts-google@1.2.0 accounts-oauth@1.1.15 -accounts-password@1.3.6 +accounts-password@1.3.7 accounts-twitter@1.3.0 alanning:roles@1.2.16 aldeed:autoform@5.8.1 @@ -67,7 +67,7 @@ dispatch:run-as-user@1.1.1 dynamic-import@0.1.1 ecmascript@0.8.0 ecmascript-runtime@0.4.1 -ecmascript-runtime-client@0.4.1 +ecmascript-runtime-client@0.4.2 ecmascript-runtime-server@0.4.1 ejson@1.0.13 email@1.2.3 @@ -108,7 +108,7 @@ meteorhacks:ssr@2.2.0 meteorhacks:subs-manager@1.6.4 minifier-css@1.2.16 minifier-js@2.1.0 -minimongo@1.2.0 +minimongo@1.2.1 mobile-experience@1.0.4 mobile-status-bar@1.0.14 modules@0.9.1 @@ -119,7 +119,7 @@ mongo-id@1.0.6 mongo-livedata@1.0.12 mrt:later@1.6.1 natestrauser:select2@4.0.3 -npm-bcrypt@0.9.2 +npm-bcrypt@0.9.3 npm-mongo@2.2.24 oauth@1.1.13 oauth-encryption@1.2.1 diff --git a/package.json b/package.json index 4d30f2d83eb..4b512f0c98b 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@reactioncommerce/authorize-net": "^1.0.8", "@reactioncommerce/nodemailer": "^5.0.4", "accounting-js": "^1.1.1", - "autoprefixer": "^6.7.7", + "autoprefixer": "^7.1.1", "autosize": "^3.0.20", "babel-runtime": "^6.23.0", "bcrypt": "^1.0.2", @@ -44,8 +44,8 @@ "griddle-react": "0.7.1", "handlebars": "^4.0.6", "history": "^4.6.1", - "i18next": "7.1.3", - "i18next-browser-languagedetector": "^1.0.1", + "i18next": "8.4.2", + "i18next-browser-languagedetector": "^2.0.0", "i18next-localstorage-cache": "^1.1.0", "i18next-sprintf-postprocessor": "^0.2.2", "immutable": "^3.8.1", @@ -54,22 +54,22 @@ "later": "^1.2.0", "lodash": "^4.17.4", "lodash.pick": "^4.4.0", - "meteor-node-stubs": "^0.2.6", + "meteor-node-stubs": "^0.2.11", "moment": "^2.18.1", "moment-timezone": "^0.5.11", - "nexmo": "^1.2.0", + "nexmo": "^2.0.2", "node-geocoder": "^3.16.0", "nodemailer-wellknown": "^0.2.1", "nouislider-algolia-fork": "^10.0.0", "npm-shrinkwrap": "^6.0.2", "path-to-regexp": "^1.7.0", "paypal-rest-sdk": "^1.7.1", - "postcss": "^5.2.16", - "postcss-js": "^0.3.0", + "postcss": "^6.0.2", + "postcss-js": "^1.0.0", "prerender-node": "^2.7.0", "prop-types": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.8.tgz", "query-parse": "^1.0.0", - "radium": "^0.18.2", + "radium": "^0.19.1", "react": "15.4.2", "react-addons-create-fragment": "15.4.2", "react-addons-pure-render-mixin": "15.4.2", @@ -101,7 +101,7 @@ "tether-drop": "^1.4.2", "tether-tooltip": "^1.2.0", "transliteration": "1.6.2", - "twilio": "^2.11.1", + "twilio": "^3.4.0", "url": "^0.11.0", "velocity-animate": "^1.5.0", "velocity-react": "^1.2.1" @@ -144,5 +144,18 @@ "^meteor/aldeed:simple-schema": "/imports/test-utils/__mocks__/meteor/aldeed-simple-schema", "^meteor/(.*)": "/imports/test-utils/__mocks__/meteor/$1" } + }, + "babel": { + "plugins": [ + "lodash", ["module-resolver", { + "root": ["./"], + "alias": { + "underscore": "lodash", + "@reactioncommerce/reaction-ui": "./imports/plugins/core/ui/client/components", + "@reactioncommerce/reaction-router": "./imports/plugins/core/router/lib" + } + }] + ], + "presets": ["es2015", "react", "stage-2"] } } From b7a45ba7b0109f44e0f224f2048f1d21171aa58a Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Wed, 21 Jun 2017 06:34:52 -0700 Subject: [PATCH 3/3] Define missing options variable --- imports/plugins/core/taxes/client/settings/custom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imports/plugins/core/taxes/client/settings/custom.js b/imports/plugins/core/taxes/client/settings/custom.js index 9d22131c8e3..04171ac4909 100644 --- a/imports/plugins/core/taxes/client/settings/custom.js +++ b/imports/plugins/core/taxes/client/settings/custom.js @@ -136,7 +136,7 @@ Template.customTaxRates.helpers({ if ((shop !== null ? shop.locales.countries[selectedCountry].states : void 0) === null) { return false; } - options = []; + const options = []; if (shop && typeof shop.locales.countries[selectedCountry].states === "object") { for (const state in shop.locales.countries[selectedCountry].states) { if ({}.hasOwnProperty.call(shop.locales.countries[selectedCountry].states, state)) {