From e3da16481622e8091cf910636d36923a745cf486 Mon Sep 17 00:00:00 2001 From: Brent Hoover Date: Mon, 21 Feb 2022 18:49:50 +0800 Subject: [PATCH] feat: upgrade to meteor 2.5/node 14.18.1 Signed-off-by: Brent Hoover --- .meteor/packages | 16 +++++++-------- .meteor/release | 2 +- .meteor/versions | 52 ++++++++++++++++++++++++------------------------ .nvmrc | 2 +- Dockerfile | 4 ++-- Dockerfile-dev | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index d769291f12..e30542fd25 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -7,34 +7,34 @@ # Core Meteor Packages ### -meteor-base@1.5.0 # Packages every Meteor app needs to have +meteor-base@1.5.1 # 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.15.2 # Enable ECMAScript2015+ syntax in app code +ecmascript@0.16.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.12.0 +mongo@1.13.0 reactive-var@1.0.11 reactive-dict@1.3.0 check@1.3.1 http@2.0.0 ddp-rate-limiter@1.1.0 underscore@1.0.10 -logging@1.2.0 +logging@1.3.1 reload@1.3.1 ejson@1.1.1 less@2.8.0 mdg:validated-method shell-server@0.5.0 -dynamic-import@0.7.0 -standard-minifier-js@2.6.0 +dynamic-import@0.7.2 +standard-minifier-js@2.7.1 # Meteor Auth Packages -accounts-base@2.0.0 +accounts-base@2.2.0 # Community Packages aldeed:autoform@6.2.0 @@ -47,4 +47,4 @@ orionsoft:graphql-compiler # Custom Packages jquery -hot-module-replacement@0.3.0 +hot-module-replacement@0.4.0 diff --git a/.meteor/release b/.meteor/release index 2a30e8fa53..55995295e6 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@2.3 +METEOR@2.5 diff --git a/.meteor/versions b/.meteor/versions index d5714f5f04..83d2e52bdf 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,11 +1,11 @@ -accounts-base@2.0.0 +accounts-base@2.2.0 aldeed:autoform@6.3.0 aldeed:collection2@3.4.1 aldeed:template-extension@4.1.0 allow-deny@1.1.0 audit-argument-checks@1.0.7 -autoupdate@1.7.0 -babel-compiler@7.6.2 +autoupdate@1.8.0 +babel-compiler@7.7.0 babel-runtime@1.5.0 base64@1.0.12 binary-heap@1.0.11 @@ -19,27 +19,27 @@ browser-policy-content@1.1.1 browser-policy-framing@1.1.0 caching-compiler@1.2.2 caching-html-compiler@1.2.1 -callback-hook@1.3.0 +callback-hook@1.4.0 check@1.3.1 ddp@1.4.0 ddp-client@2.5.0 ddp-common@1.4.0 ddp-rate-limiter@1.1.0 -ddp-server@2.4.0 +ddp-server@2.5.0 deps@1.0.12 diff-sequence@1.1.1 -dynamic-import@0.7.0 -ecmascript@0.15.2 -ecmascript-runtime@0.7.0 -ecmascript-runtime-client@0.11.1 -ecmascript-runtime-server@0.10.1 +dynamic-import@0.7.2 +ecmascript@0.16.0 +ecmascript-runtime@0.8.0 +ecmascript-runtime-client@0.12.1 +ecmascript-runtime-server@0.11.0 ejson@1.1.1 es5-shim@4.8.0 fetch@0.1.1 gadicc:blaze-react-component@1.4.3 geojson-utils@1.0.10 hot-code-push@1.0.4 -hot-module-replacement@0.3.0 +hot-module-replacement@0.4.0 html-tools@1.1.2 htmljs@1.1.1 http@2.0.0 @@ -51,26 +51,26 @@ launch-screen@1.3.0 less@2.8.0 livedata@1.0.18 localstorage@1.2.0 -logging@1.2.0 +logging@1.3.1 mdg:validated-method@1.2.0 -meteor@1.9.3 +meteor@1.10.0 meteor-base@1.5.1 meteorhacks:subs-manager@1.6.4 -minifier-css@1.5.4 -minifier-js@2.6.0 +minifier-css@1.6.0 +minifier-js@2.7.1 minimongo@1.7.0 mobile-experience@1.1.0 mobile-status-bar@1.1.0 -modern-browsers@0.1.5 -modules@0.16.0 +modern-browsers@0.1.7 +modules@0.17.0 modules-runtime@0.12.0 -modules-runtime-hot@0.13.0 +modules-runtime-hot@0.14.0 momentjs:moment@2.29.1 -mongo@1.12.0 +mongo@1.13.0 mongo-decimal@0.1.2 mongo-dev-server@1.1.0 mongo-id@1.0.8 -npm-mongo@3.9.0 +npm-mongo@3.9.1 observe-sequence@1.0.18 ordered-dict@1.1.0 orionsoft:graphql-compiler@0.0.4 @@ -78,19 +78,19 @@ promise@0.12.0 raix:eventemitter@1.0.0 random@1.2.0 rate-limit@1.0.9 -react-fast-refresh@0.1.1 +react-fast-refresh@0.2.0 reactive-dict@1.3.0 reactive-var@1.0.11 reload@1.3.1 retry@1.1.0 -routepolicy@1.1.0 -service-configuration@1.1.0 +routepolicy@1.1.1 +service-configuration@1.3.0 session@1.2.0 shell-server@0.5.0 socket-stream-client@0.4.0 spacebars@1.2.0 spacebars-compiler@1.3.0 -standard-minifier-js@2.6.1 +standard-minifier-js@2.7.1 templating@1.4.1 templating-compiler@1.4.1 templating-runtime@1.5.0 @@ -98,9 +98,9 @@ templating-tools@1.2.1 tmeasday:check-npm-versions@1.0.2 tmeasday:publish-counts@0.8.0 tracker@1.2.0 -typescript@4.3.2 +typescript@4.4.0 ui@1.0.13 underscore@1.0.10 url@1.3.2 -webapp@1.11.1 +webapp@1.13.0 webapp-hashing@1.1.0 diff --git a/.nvmrc b/.nvmrc index 66df3b7ab2..31102b28de 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -12.16.1 +14.18.1 diff --git a/Dockerfile b/Dockerfile index 35aa4b6486..7d7f7b6333 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM reactioncommerce/meteor:2.0.0-v1 as builder +FROM reactioncommerce/meteor:2.5.1-v1 as builder ENV APP_SOURCE_DIR /usr/local/src/appsrc ENV APP_BUNDLE_DIR /usr/local/src/build @@ -27,7 +27,7 @@ RUN printf "\\n[-] Building Meteor application...\\n" \ ############################################################################## FROM node:14-slim -LABEL maintainer="Reaction Commerce " +LABEL maintainer="Mailchimp Open Commerce " # grab the dependencies and built app from the previous temporary builder image COPY --chown=node --from=builder /usr/local/src/build/bundle /usr/local/src/app diff --git a/Dockerfile-dev b/Dockerfile-dev index 0ccea15cdc..434a90a6be 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -1,4 +1,4 @@ -FROM reactioncommerce/meteor:1.10.2-v1 +FROM reactioncommerce/meteor:2.5.0-v1 # hadolint ignore=DL3002 USER root