From f02fd5723bded80c6ca07e2881914875cf16ced3 Mon Sep 17 00:00:00 2001 From: Eric Dobbertin Date: Wed, 6 Feb 2019 15:10:25 -0600 Subject: [PATCH 1/4] chore: handle packages with modules Signed-off-by: Eric Dobbertin --- src/next.config.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/next.config.js b/src/next.config.js index 73b491a32b..c3bdf04223 100644 --- a/src/next.config.js +++ b/src/next.config.js @@ -36,6 +36,11 @@ module.exports = { enforce: "pre" }); + webpackConfig.module.rules.push({ + test: /\.mjs$/, + type: "javascript/auto" + }); + return webpackConfig; } }; From 9baa2a333fa3d1ac1073f3b4b156a7cedf176fe3 Mon Sep 17 00:00:00 2001 From: Eric Dobbertin Date: Wed, 6 Feb 2019 15:10:55 -0600 Subject: [PATCH 2/4] chore: mark no side effects for Webpack tree shaking Signed-off-by: Eric Dobbertin --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index be26b68149..45a289ac24 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "url": "https://reactioncommerce.com" }, "license": "GPL-3.0", + "sideEffects": false, "scripts": { "dev": "NODE_ENV=development node ./src/server.js", "build": "yarn run build-clean && NODE_ENV=production IS_BUILDING_NEXTJS=1 next build src", From 6f281742112aab9cab996b4e7b504d3da2203a0f Mon Sep 17 00:00:00 2001 From: Eric Dobbertin Date: Tue, 12 Feb 2019 18:54:02 -0600 Subject: [PATCH 3/4] feat: update to latest component library Signed-off-by: Eric Dobbertin --- package.json | 2 +- yarn.lock | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 45a289ac24..ccabdc4458 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@material-ui/core": "^3.1.0", - "@reactioncommerce/components": "^0.61.0", + "@reactioncommerce/components": "^0.63.0", "@reactioncommerce/components-context": "^1.1.0", "@segment/snippet": "^4.3.1", "apollo-cache-inmemory": "^1.1.11", diff --git a/yarn.lock b/yarn.lock index 6bfcf393e6..cb5f1f1ef2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -852,6 +852,13 @@ core-js "^2.5.3" regenerator-runtime "^0.11.1" +"@babel/runtime@^7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a" + integrity sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA== + dependencies: + regenerator-runtime "^0.12.0" + "@babel/template@7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0.tgz#c2bc9870405959c89a9c814376a2ecb247838c80" @@ -1024,10 +1031,12 @@ dependencies: hoist-non-react-statics "^3.2.0" -"@reactioncommerce/components@^0.61.0": - version "0.61.0" - resolved "https://registry.yarnpkg.com/@reactioncommerce/components/-/components-0.61.0.tgz#6a29d2ddd08f992ed2879cc66590216183eb9bdd" +"@reactioncommerce/components@^0.63.0": + version "0.63.0" + resolved "https://registry.yarnpkg.com/@reactioncommerce/components/-/components-0.63.0.tgz#ae900ef9105363c7fd40c7cb04f9af112d5cd61e" + integrity sha512-eNvyjYA+uRJQwGOTuujMoGWGHJ2enZhnacInDCUM732ZcDFuwpRHpx8PTbrMxgBk7Ig4o86qRmqauoz3g30xTw== dependencies: + "@babel/runtime" "^7.3.1" "@material-ui/core" "^3.1.0" accounting-js "^1.1.1" lodash.debounce "^4.0.8" @@ -1035,7 +1044,7 @@ lodash.isempty "^4.4.0" lodash.isequal "^4.5.0" lodash.uniqueid "^4.0.1" - mdi-material-ui "^5.4.0" + mdi-material-ui "^5.8.0" react-is "^16.4.1" react-select "^2.0.0" @@ -5771,6 +5780,11 @@ mdi-material-ui@^5.4.0: version "5.4.0" resolved "https://registry.yarnpkg.com/mdi-material-ui/-/mdi-material-ui-5.4.0.tgz#355526e342414bb5a320bd35cdbd4b653fadea18" +mdi-material-ui@^5.8.0: + version "5.9.0" + resolved "https://registry.yarnpkg.com/mdi-material-ui/-/mdi-material-ui-5.9.0.tgz#88d662a0c618224e8150d02b3f7f2ab2569803a0" + integrity sha512-+3vYdXmh3zS/FhIb/0+fGLoplgVGxOtK6zxP7hhDZ9nVYxhSP85n+Uh/g5qLb/W1mXihOxEGkcKS2p+dxYBg6w== + meant@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.0.tgz#cb6286e3b7af9315f16118fdc224726ed38074bb" From 6b97ebf6ff9cd9aa2ed9be50b29f2871570ed982 Mon Sep 17 00:00:00 2001 From: Eric Dobbertin Date: Wed, 13 Feb 2019 11:24:09 -0600 Subject: [PATCH 4/4] chore: resolve deprecation warnings Changes should not have any effect other than removing warnings from the browser console Signed-off-by: Eric Dobbertin --- src/components/AccountDropdown/AccountDropdown.js | 4 ++-- src/lib/stores/index.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/AccountDropdown/AccountDropdown.js b/src/components/AccountDropdown/AccountDropdown.js index 30c8da399b..2045e72513 100644 --- a/src/components/AccountDropdown/AccountDropdown.js +++ b/src/components/AccountDropdown/AccountDropdown.js @@ -73,14 +73,14 @@ class AccountDropdown extends Component {
{authStore.isAuthenticated ? - :
-
diff --git a/src/lib/stores/index.js b/src/lib/stores/index.js index 67e1b0cd1d..0e16767413 100644 --- a/src/lib/stores/index.js +++ b/src/lib/stores/index.js @@ -5,7 +5,7 @@ import CartStore from "./CartStore"; import RoutingStore from "./RoutingStore"; import UIStore from "./UIStore"; -configure({ enforceActions: true }); +configure({ enforceActions: "observed" }); const authStore = new AuthStore("meteorToken"); const cartStore = new CartStore();