Skip to content

Commit

Permalink
Merge pull request #280 from reactioncommerce/feat-aldeed-update-meteor
Browse files Browse the repository at this point in the history
feat: update to Meteor 1.10.2
  • Loading branch information
willopez authored May 18, 2020
2 parents 3f460a3 + 72088cc commit 1b1541b
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 81 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ defaults: &defaults
DOCKER_NAMESPACE: "reactioncommerce"
DOCKER_NAME: "admin"
docker:
- image: circleci/node:12.14.0-stretch
- image: circleci/node:12.16.1-stretch

jobs:
install-dependencies:
Expand All @@ -23,7 +23,7 @@ jobs:
- reaction-admin-v3-node-modules-{{ .Branch }}
- run:
name: Install the same NPM version that Meteor uses
command: sudo npm i -g npm@6.4.1
command: sudo npm i -g npm@6.14.0
- run:
name: Install NPM dependencies
command: npm -v && npm ci
Expand Down
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ METEOR_DISABLE_OPTIMISTIC_CACHING=1
METEOR_WATCH_POLLING_INTERVAL_MS=10000
MONGO_OPLOG_URL=mongodb://mongo.reaction.localhost:27017/local
MONGO_URL=mongodb://mongo.reaction.localhost:27017/reaction
NODE_ENV=development
PORT=4080
OAUTH2_ADMIN_URL=http://hydra.reaction.localhost:4445
OAUTH2_IDP_PUBLIC_CHANGE_PASSWORD_URL=http://localhost:4100/account/change-password?email=EMAIL&from=FROM
Expand Down
12 changes: 6 additions & 6 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
###

[email protected] # Packages every Meteor app needs to have
mobile-experience@1.0.5 # Packages for a great mobile UX
mobile-experience@1.1.0 # Packages for a great mobile UX
[email protected] # Compile .html files into Meteor Blaze views
[email protected] # ECMAScript 5 compatibility for older browsers.
[email protected].0 # Enable ECMAScript2015+ syntax in app code
[email protected].3 # Enable ECMAScript2015+ syntax in app code
[email protected] # ensure meteor method argument validation
[email protected] # security-related policies enforced by newer browsers
juliancwirko:[email protected] # CSS post-processing plugin (replaces standard-minifier-css)
[email protected] # ReactiveDict whose contents are preserved across Hot Code Push
[email protected] # Meteor transparent reactive programming library
mongo@1.8.0
mongo@1.10.0
[email protected]
[email protected]
[email protected]
Expand All @@ -29,12 +29,12 @@ [email protected]
[email protected]
[email protected]
mdg:validated-method
shell-server@0.4.0
[email protected].1
shell-server@0.5.0
[email protected].2
[email protected]

# Meteor Auth Packages
accounts-base@1.5.0
accounts-base@1.6.0

# Community Packages
aldeed:[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.9
METEOR@1.10.2
40 changes: 20 additions & 20 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
accounts-base@1.5.0
accounts-base@1.6.0
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].3
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
boilerplate-generator@1.6.0
boilerplate-generator@1.7.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
[email protected].1
[email protected].1
[email protected].2
[email protected].3
[email protected]
[email protected]
[email protected]
Expand All @@ -43,10 +43,10 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
juliancwirko:[email protected]
launch-screen@1.1.1
launch-screen@1.2.0
[email protected]
[email protected]
[email protected]
Expand All @@ -57,24 +57,24 @@ [email protected]
meteorhacks:[email protected]
[email protected]
[email protected]
minimongo@1.4.5
mobile-experience@1.0.5
mobile-status-bar@1.0.14
minimongo@1.6.0
mobile-experience@1.1.0
mobile-status-bar@1.1.0
[email protected]
[email protected]
[email protected]
momentjs:moment@2.24.0
mongo@1.8.0
momentjs:moment@2.25.2
mongo@1.10.0
[email protected]
[email protected]
[email protected]
npm-mongo@3.3.0
npm-mongo@3.7.1
[email protected]
[email protected]
orionsoft:[email protected]
[email protected]
raix:[email protected]
random@1.1.0
random@1.2.0
[email protected]
[email protected]
[email protected]
Expand All @@ -83,8 +83,8 @@ [email protected]
[email protected]
[email protected]
[email protected]
shell-server@0.4.0
socket-stream-client@0.2.2
shell-server@0.5.0
socket-stream-client@0.3.0
[email protected]
[email protected]
[email protected]
Expand All @@ -97,6 +97,6 @@ tmeasday:[email protected]
[email protected]
[email protected]
[email protected]
url@1.2.0
webapp@1.8.2
url@1.3.0
webapp@1.9.1
[email protected]
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.14.0
12.16.1
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM reactioncommerce/meteor:1.9.0-v1 as builder
FROM reactioncommerce/meteor:1.10.2-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.14.0-slim
FROM node:12.16.1-slim

LABEL maintainer="Reaction Commerce <[email protected]>"

Expand All @@ -44,7 +44,7 @@ WORKDIR /usr/local/src/app/programs/server/
RUN npm install --production --no-audit

# Also install mongodb pkg needed by the waitForMongo script
RUN npm install -E --no-save mongodb@3.3.5
RUN npm install -E --no-save mongodb@3.5.7

WORKDIR /usr/local/src/app

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM reactioncommerce/meteor:1.9.0-v1
FROM reactioncommerce/meteor:1.10.2-v1

# hadolint ignore=DL3002
USER root
Expand Down
Loading

0 comments on commit 1b1541b

Please sign in to comment.