diff --git a/.circleci/config.yml b/.circleci/config.yml index 898d03d..3892e24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ defaults: &defaults DOCKER_NAMESPACE: "reactioncommerce" DOCKER_NAME: "identity" docker: - - image: circleci/node:12.14.0-stretch + - image: circleci/node:12.16.1-stretch jobs: install-dependencies: diff --git a/.meteor/packages b/.meteor/packages index 40544b8..61cc70d 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -9,13 +9,13 @@ static-html # Define static page content in .html files standard-minifier-css@1.6.0 # CSS minifier run for production mode standard-minifier-js@2.6.0 # JS minifier run for production mode es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers -ecmascript@0.14.0 # Enable ECMAScript2015+ syntax in app code -shell-server@0.4.0 # Server-side component of the `meteor shell` command -webapp@1.8.0 # Serves a Meteor app over HTTP +ecmascript@0.14.3 # Enable ECMAScript2015+ syntax in app code +shell-server@0.5.0 # Server-side component of the `meteor shell` command +webapp@1.9.1 # Serves a Meteor app over HTTP server-render@0.3.1 # Support for server-side rendering tracker@1.2.0 # Meteor transparent reactive programming library check@1.3.1 # Meteor Auth Packages -accounts-base@1.5.0 -accounts-password@1.5.2 +accounts-base@1.6.0 +accounts-password@1.6.0 diff --git a/.meteor/release b/.meteor/release index c6ae8ec..3ea2652 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.9 +METEOR@1.10.2 diff --git a/.meteor/versions b/.meteor/versions index 35dc30f..ad4d081 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,13 +1,13 @@ -accounts-base@1.5.0 -accounts-password@1.5.3 +accounts-base@1.6.0 +accounts-password@1.6.0 allow-deny@1.1.0 -babel-compiler@7.5.1 +babel-compiler@7.5.3 babel-runtime@1.5.0 base64@1.0.12 binary-heap@1.0.11 blaze-tools@1.0.10 -boilerplate-generator@1.6.0 -caching-compiler@1.2.1 +boilerplate-generator@1.7.0 +caching-compiler@1.2.2 caching-html-compiler@1.1.3 callback-hook@1.3.0 check@1.3.1 @@ -15,11 +15,11 @@ ddp@1.4.0 ddp-client@2.3.3 ddp-common@1.4.0 ddp-rate-limiter@1.0.7 -ddp-server@2.3.0 +ddp-server@2.3.1 deps@1.0.12 diff-sequence@1.1.1 -dynamic-import@0.5.1 -ecmascript@0.14.1 +dynamic-import@0.5.2 +ecmascript@0.14.3 ecmascript-runtime@0.7.0 ecmascript-runtime-client@0.10.0 ecmascript-runtime-server@0.9.0 @@ -31,25 +31,25 @@ geojson-utils@1.0.10 html-tools@1.0.11 htmljs@1.0.11 id-map@1.1.0 -inter-process-messaging@0.1.0 +inter-process-messaging@0.1.1 localstorage@1.2.0 logging@1.1.20 meteor@1.9.3 minifier-css@1.5.0 minifier-js@2.6.0 -minimongo@1.4.5 +minimongo@1.6.0 modern-browsers@0.1.5 modules@0.15.0 modules-runtime@0.12.0 -mongo@1.8.0 +mongo@1.10.0 mongo-decimal@0.1.1 mongo-dev-server@1.1.0 mongo-id@1.0.7 npm-bcrypt@0.9.3 -npm-mongo@3.3.0 +npm-mongo@3.7.1 ordered-dict@1.1.0 promise@0.11.2 -random@1.1.0 +random@1.2.0 rate-limit@1.0.9 reactive-var@1.0.11 reload@1.3.0 @@ -58,15 +58,15 @@ routepolicy@1.1.0 server-render@0.3.1 service-configuration@1.0.11 sha@1.0.9 -shell-server@0.4.0 -socket-stream-client@0.2.2 +shell-server@0.5.0 +socket-stream-client@0.3.0 spacebars-compiler@1.1.3 -srp@1.0.12 +srp@1.1.0 standard-minifier-css@1.6.0 standard-minifier-js@2.6.0 static-html@1.2.2 templating-tools@1.1.2 tracker@1.2.0 underscore@1.0.10 -webapp@1.8.2 +webapp@1.9.1 webapp-hashing@1.0.9 diff --git a/.nvmrc b/.nvmrc index 65d83ce..66df3b7 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -12.14.0 +12.16.1 diff --git a/Dockerfile b/Dockerfile index cc7687c..2535abb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -24,7 +24,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 " @@ -43,7 +43,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 diff --git a/Dockerfile-dev b/Dockerfile-dev index 588de24..0ccea15 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -1,4 +1,4 @@ -FROM reactioncommerce/meteor:1.9.0-v1 +FROM reactioncommerce/meteor:1.10.2-v1 # hadolint ignore=DL3002 USER root diff --git a/package-lock.json b/package-lock.json index d01023f..7df2142 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1008,6 +1008,15 @@ "tweetnacl": "^0.14.3" } }, + "bl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz", + "integrity": "sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1023,9 +1032,9 @@ "integrity": "sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg==" }, "bson": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.3.tgz", - "integrity": "sha512-TdiJxMVnodVS7r0BdL42y/pqC9cL2iKynVwA0Ho3qbsQYr428veL3l7BQyuqiw+Q5SqqoT0m4srSY/BlZ9AxXg==" + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.4.tgz", + "integrity": "sha512-S/yKGU1syOMzO86+dGpg2qGoDL0zvzcb262G+gqEy6TgP6rt6z6qxSFX/8X6vLC91P7G7C3nLs0+bvDzmvBA3Q==" }, "bunyan": { "version": "1.8.12", @@ -1358,6 +1367,11 @@ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, + "denque": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", + "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==" + }, "detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", @@ -3629,9 +3643,9 @@ } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "minipass": { "version": "2.9.0", @@ -3651,11 +3665,11 @@ } }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" } }, "moment": { @@ -3675,11 +3689,13 @@ } }, "mongodb": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.3.5.tgz", - "integrity": "sha512-6NAv5gTFdwRyVfCz+O+KDszvjpyxmZw+VlmqmqKR2GmpkeKrKFRv/ZslgTtZba2dc9JYixIf99T5Gih7TIWv7Q==", + "version": "3.5.7", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.7.tgz", + "integrity": "sha512-lMtleRT+vIgY/JhhTn1nyGwnSMmJkJELp+4ZbrjctrnBxuLbj6rmLuJFz8W2xUzUqWmqoyVxJLYuC58ZKpcTYQ==", "requires": { - "bson": "^1.1.1", + "bl": "^2.2.0", + "bson": "^1.1.4", + "denque": "^1.4.1", "require_optional": "^1.0.1", "safe-buffer": "^5.1.2", "saslprep": "^1.0.0" @@ -4218,9 +4234,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "strip-json-comments": { "version": "2.0.1", diff --git a/package.json b/package.json index aba3e27..f513433 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "i18next-multiload-backend-adapter": "^0.1.1", "lodash": "^4.17.15", "meteor-node-stubs": "^1.0.0", - "mongodb": "3.3.5", + "mongodb": "3.5.7", "node-fetch": "^2.6.0", "prop-types": "^15.7.2", "query-string": "^6.9.0",