Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Meteor 2.0, React 16.14.0 and enable HMR #344

Merged
merged 8 commits into from
Feb 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@ meteor-base@1.4.0 # Packages every Meteor app needs to have
mobile-experience@1.1.0 # Packages for a great mobile UX
blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.14.3 # Enable ECMAScript2015+ syntax in app code
ecmascript@0.15.0 # Enable ECMAScript2015+ syntax in app code
audit-argument-checks@1.0.7 # ensure meteor method argument validation
browser-policy@1.1.0 # security-related policies enforced by newer browsers
juliancwirko:postcss@1.3.0 # CSS post-processing plugin (replaces standard-minifier-css)
session@1.2.0 # ReactiveDict whose contents are preserved across Hot Code Push
tracker@1.2.0 # Meteor transparent reactive programming library
mongo@1.10.0
mongo@1.10.1
reactive-var@1.0.11
reactive-dict@1.3.0
check@1.3.1
http@1.4.2
ddp-rate-limiter@1.0.9
underscore@1.0.10
logging@1.1.20
reload@1.3.0
logging@1.2.0
reload@1.3.1
ejson@1.1.1
less@2.8.0
mdg:validated-method
shell-server@0.5.0
dynamic-import@0.5.2
dynamic-import@0.6.0
standard-minifier-js@2.6.0

# Meteor Auth Packages
accounts-base@1.7.0
accounts-base@1.8.0

# Community Packages
aldeed:autoform@6.2.0
Expand All @@ -47,3 +47,4 @@ orionsoft:graphql-compiler

# Custom Packages
jquery
hot-module-replacement
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.11.1
METEOR@2.0
39 changes: 21 additions & 18 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
accounts-base@1.7.0
accounts-base@1.8.0
aldeed:autoform@6.3.0
aldeed:collection2@3.2.0
aldeed:collection2@3.2.1
aldeed:template-extension@4.1.0
allow-deny@1.1.0
audit-argument-checks@1.0.7
autoupdate@1.6.0
babel-compiler@7.5.3
autoupdate@1.7.0
babel-compiler@7.6.0
babel-runtime@1.5.0
base64@1.0.12
binary-heap@1.0.11
Expand All @@ -15,33 +15,34 @@ blaze-tools@1.0.10
boilerplate-generator@1.7.1
browser-policy@1.1.0
browser-policy-common@1.0.11
browser-policy-content@1.1.0
browser-policy-content@1.1.1
browser-policy-framing@1.1.0
caching-compiler@1.2.2
caching-html-compiler@1.1.3
callback-hook@1.3.0
check@1.3.1
ddp@1.4.0
ddp-client@2.3.3
ddp-client@2.4.0
ddp-common@1.4.0
ddp-rate-limiter@1.0.9
ddp-server@2.3.2
deps@1.0.12
diff-sequence@1.1.1
dynamic-import@0.5.2
ecmascript@0.14.3
dynamic-import@0.6.0
ecmascript@0.15.0
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.11.0
ecmascript-runtime-server@0.10.0
ejson@1.1.1
es5-shim@4.8.0
fetch@0.1.1
gadicc:blaze-react-component@1.4.2
gadicc:blaze-react-component@1.4.3
geojson-utils@1.0.10
hot-code-push@1.0.4
hot-module-replacement@0.2.0
html-tools@1.0.11
htmljs@1.0.11
http@1.4.2
http@1.4.3
id-map@1.1.0
inter-process-messaging@0.1.1
jquery@1.11.11
Expand All @@ -50,22 +51,23 @@ launch-screen@1.2.0
less@2.8.0
livedata@1.0.18
localstorage@1.2.0
logging@1.1.20
logging@1.2.0
mdg:validated-method@1.2.0
meteor@1.9.3
meteor-base@1.4.0
meteorhacks:subs-manager@1.6.4
minifier-css@1.5.3
minifier-js@2.6.0
minimongo@1.6.0
minimongo@1.6.1
mobile-experience@1.1.0
mobile-status-bar@1.1.0
modern-browsers@0.1.5
modules@0.15.0
modules@0.16.0
modules-runtime@0.12.0
modules-runtime-hot@0.13.0
momentjs:moment@2.25.2
mongo@1.10.0
mongo-decimal@0.1.1
mongo@1.10.1
mongo-decimal@0.1.2
mongo-dev-server@1.1.0
mongo-id@1.0.7
npm-mongo@3.8.1
Expand All @@ -76,9 +78,10 @@ promise@0.11.2
raix:eventemitter@0.1.3
random@1.2.0
rate-limit@1.0.9
react-fast-refresh@0.1.0
reactive-dict@1.3.0
reactive-var@1.0.11
reload@1.3.0
reload@1.3.1
retry@1.1.0
routepolicy@1.1.0
service-configuration@1.0.11
Expand All @@ -98,5 +101,5 @@ tracker@1.2.0
ui@1.0.13
underscore@1.0.10
url@1.3.1
webapp@1.9.1
webapp-hashing@1.0.9
webapp@1.10.0
webapp-hashing@1.1.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM reactioncommerce/meteor:1.10.2-v1 as builder
FROM reactioncommerce/meteor:2.0.0-v1 as builder

ENV APP_SOURCE_DIR /usr/local/src/appsrc
ENV APP_BUNDLE_DIR /usr/local/src/build
Expand All @@ -25,7 +25,7 @@ RUN printf "\\n[-] Building Meteor application...\\n" \
##############################################################################
# final build stage - create the final production image
##############################################################################
FROM node:12.16.1-slim
FROM node:12.20.1-slim

LABEL maintainer="Reaction Commerce <engineering@reactioncommerce.com>"

Expand Down
3 changes: 2 additions & 1 deletion imports/plugins/core/orders/client/components/OrderAppBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ OrderAppBar.propTypes = {
classes: PropTypes.object,
order: PropTypes.shape({
_id: PropTypes.string.isRequired,
status: PropTypes.string
status: PropTypes.string,
fulfillmentGroups: PropTypes.array
})
};

Expand Down
Loading