Feature/meteor 2.13.3 (#154)

* Update project to meteor v2.13.3

* Fix counters

* Update packages

* Fix akryum:vue-component

see meteor-vue/vue-meteor#437

* Update jszip

* Add a makefile

* Update changelog

* Update docker files

* Update changelog

* Fix counter

* Add atomic update, like before

* Remove useless file

* Update changelg

* Add minio

* Update changelog

Author: jbl2024

.meteor/packages

@@ -6,41 +6,41 @@
 
 [email protected]             # Packages every Meteor app needs to have
 [email protected]       # Packages for a great mobile UX
-mongo@1.12.0                   # The database Meteor supports right now
-[email protected].11            # Reactive variable for tracker
-tracker@1.2.0                 # Meteor's client-side reactive programming library
+mongo@1.16.7                   # The database Meteor supports right now
+[email protected].12            # Reactive variable for tracker
+tracker@1.3.2                 # Meteor's client-side reactive programming library
 
-standard-minifier-css@1.7.3   # CSS minifier run for production mode
-standard-minifier-js@2.6.1    # JS minifier run for production mode
+standard-minifier-css@1.9.2   # CSS minifier run for production mode
+standard-minifier-js@2.8.1    # JS minifier run for production mode
 [email protected]                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.15.3              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.16.7              # Enable ECMAScript2015+ syntax in app code
 [email protected]            # Server-side component of the `meteor shell` command
 
-static-html
-akryum:vue-component
-[email protected]
+[email protected]
+[email protected]
 aldeed:simple-schema
 akryum:vue-sass
 vuejs:blaze-integration
-accounts-password@2.0.1
+accounts-password@2.3.4
 reywood:publish-composite
-[email protected].0
+[email protected].1
 konecty:user-presence
-ostrio:files
+ostrio:files@2.3.3
 meteorhacks:inject-initial
 alanning:roles
 matb33:collection-hooks
-email@2.1.1
+email@2.2.5
 gadicohen:headers
 mdg:validated-method
 meteortesting:mocha
 xolvio:cleaner
 practicalmeteor:sinon
-msavin:sjobs
+msavin:sjobs@4.3.2
 aldeed:collection2-core
 sakulstra:aggregate
 jquery
-service-configuration@1.1.0
+service-configuration@1.3.1
 latelier-oidc
 latelier-accounts-oidc
-[email protected]
+[email protected]
+bslocombe:vue-component

.meteor/release

@@ -1 +1 @@
-METEOR@2.3.6
+METEOR@2.13.3

.meteor/versions

@@ -1,45 +1,45 @@
-[email protected]
-[email protected]
-[email protected]
-akryum:[email protected]
+[email protected]
+[email protected]
+[email protected]
 akryum:[email protected]
 akryum:[email protected]
 akryum:[email protected]
 alanning:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
-[email protected].0
-autoupdate@1.7.0
-babel-compiler@7.7.0
-[email protected].0
+[email protected].1
+autoupdate@1.8.0
+babel-compiler@7.10.4
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
+bslocombe:[email protected]
 [email protected]
 [email protected]
-callback-hook@1.3.1
-[email protected].1
+callback-hook@1.5.1
+[email protected].2
 [email protected]
-[email protected].0
-ddp-client@2.5.0
+[email protected].1
+ddp-client@2.6.1
 [email protected]
-ddp-rate-limiter@1.1.0
-ddp-server@2.4.1
+ddp-rate-limiter@1.2.0
+ddp-server@2.6.2
 [email protected]
-[email protected].1
-[email protected].1
-ecmascript@0.15.3
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.11.1
-ecmascript-runtime-server@0.10.1
-[email protected].1
-email@2.1.1
+[email protected].2
+[email protected].3
+ecmascript@0.16.7
+ecmascript-runtime@0.8.1
+ecmascript-runtime-client@0.12.1
+ecmascript-runtime-server@0.11.0
+[email protected].3
+email@2.2.5
 [email protected]
-[email protected].1
+[email protected].3
 gadicohen:[email protected]
-[email protected].10
+[email protected].11
 [email protected]
 [email protected]
 [email protected]
@@ -54,71 +54,72 @@ [email protected]
 [email protected]
 lmieulet:[email protected]
 [email protected]
-logging@1.2.0
-matb33:collection-hooks@1.1.4
-mdg:validated-method@1.2.0
+logging@1.3.2
+matb33:collection-hooks@1.3.0
+mdg:validated-method@1.3.0
 mdg:[email protected]
-meteor@1.9.3
+meteor@1.11.3
 [email protected]
 meteorhacks:[email protected]
 meteortesting:[email protected]
 meteortesting:[email protected]
 meteortesting:[email protected]
-minifier-css@1.5.4
-minifier-js@2.6.1
-minimongo@1.7.0
+minifier-css@1.6.4
+minifier-js@2.7.5
+minimongo@1.9.3
 [email protected]
 [email protected]
-[email protected].7
-modules@0.16.0
-modules-runtime@0.12.0
-mongo@1.12.0
-[email protected].2
+[email protected].9
+modules@0.19.0
+modules-runtime@0.13.1
+mongo@1.16.7
+[email protected].3
 [email protected]
 [email protected]
-msavin:sjobs@3.1.1
-npm-mongo@3.9.1
-oauth@2.0.0
-[email protected].1
-[email protected].20
+msavin:sjobs@4.3.2
+npm-mongo@4.16.0
+oauth@2.2.0
+[email protected].2
+[email protected].21
 [email protected]
 ostrio:[email protected]
-ostrio:files@1.14.3
+ostrio:files@2.3.3
 peerlibrary:[email protected]
 peerlibrary:[email protected]
 practicalmeteor:[email protected]_1
 practicalmeteor:[email protected]_2
-[email protected].0
+[email protected].2
 raix:[email protected]
-[email protected].0
-rate-limit@1.0.9
-react-fast-refresh@0.1.1
-[email protected].0
-[email protected].11
+[email protected].1
+rate-limit@1.1.1
+react-fast-refresh@0.2.7
+[email protected].1
+[email protected].12
 [email protected]
 [email protected]
-reywood:publish-composite@1.7.3
+reywood:publish-composite@1.8.3
 [email protected]
-sakulstra:[email protected].3
-service-configuration@1.1.0
-[email protected].0
+sakulstra:[email protected].4
+service-configuration@1.3.1
+[email protected].1
 [email protected]
 [email protected]
-socket-stream-client@0.4.0
+socket-stream-client@0.5.1
 [email protected]
 [email protected]
-standard-minifier-css@1.7.3
-standard-minifier-js@2.6.1
+standard-minifier-css@1.9.2
+standard-minifier-js@2.8.1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 tmeasday:[email protected]
-tracker@1.2.0
-[email protected].10
+tracker@1.3.2
+[email protected].13
 [email protected]
 vuejs:[email protected]
-webapp@1.11.1
-[email protected].0
+webapp@1.13.5
+[email protected].1
 xolvio:[email protected]
+zodern:[email protected]

CHANGELOG.md

@@ -7,10 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Added
+- Makefile: simplify local & docker dev usage
 
 ### Changed
+- Update to Meteor 2.13.3
+- Dockerfiles: 
+  - update meteor version
+  - use meteor nodejs14 extended support version
+  - set architecture to linux/amd64 platform in docker compose
+- Update meteor packages:
+  - msavin:sjobs*               upgraded from 3.1.1 to 4.3.2   
+  - sakulstra:aggregate         upgraded from 1.4.3 to 1.4.4
+  - ostrio:files*               upgraded from 1.14.3 to 2.3.3
+  - matb33:collection-hooks     upgraded from 1.1.4 to 1.3.0
+  - mdg:validated-method        upgraded from 1.2.0 to 1.3.0
+  - observe-sequence            upgraded from 1.0.20 to 1.0.21
+  - reywood:publish-composite   upgraded from 1.7.3 to 1.8.3
+  - zodern:types                added, version 1.0.10
+  - akryum:vue-component        moved to bslocombe:vue-component@0.16.1
+    - see https://github.com/meteor-vue/vue-meteor/issues/437#issuecomment-1543296641
+ - Update npm packages:
+  - jszip                       upgraded from 3.7.1 to 3.10.1
 
 ### Deleted
+- Remove useless vador.yml file
 
 ## [3.4.9 2022-11-20]
 

Dockerfile

@@ -1,5 +1,5 @@
 # The tag here should match the Meteor version of your app, per .meteor/release
-FROM geoffreybooth/meteor-base:2.3.6 as build
+FROM geoffreybooth/meteor-base:2.13.3 as build
 # Copy app package.json and package-lock.json into container
 COPY ./package*.json $APP_SOURCE_FOLDER/
 
@@ -12,7 +12,7 @@ RUN METEOR_DISABLE_OPTIMISTIC_CACHING=1 bash "$SCRIPTS_FOLDER/build-meteor-bundl
 
 
 # Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 1.9
-FROM node:14.17.6-alpine
+FROM meteor/node:14.21.4-alpine3.17
 ENV PANDOC_VERSION 2.10.1
 ENV APP_BUNDLE_FOLDER /opt/bundle
 ENV SCRIPTS_FOLDER /docker
@@ -21,7 +21,7 @@ ENV SCRIPTS_FOLDER /docker
 RUN apk --no-cache --virtual .node-gyp-compilation-dependencies add \
 	g++ \
 	make \
-	python \
+	python3 \
 	curl \
 	# And runtime dependencies, which we keep
 	&& apk --no-cache add \

Dockerfile.dev

@@ -1,13 +1,13 @@
 # Adapted from https://github.com/disney/meteor-base/issues/48
 # Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 1.10.2
-FROM node:14.17.6-alpine
+FROM meteor/node:14.21.4-alpine3.17
 
 # Setup environment variables that will be available to the instance
-ENV METEOR_VERSION 2.3.6
+ENV METEOR_VERSION 2.13.3
 ENV PANDOC_VERSION 2.10.1
 RUN apk add --update --no-cache bash curl
 # Here we're running https://github.com/staeke/meteor-alpine/ with a few tweaks
-RUN export TEMP_PACKAGES="alpine-sdk libc6-compat python graphicsmagick curl linux-headers" && \
+RUN export TEMP_PACKAGES="alpine-sdk libc6-compat python3 graphicsmagick curl linux-headers" && \
     apk add --update --no-cache $TEMP_PACKAGES && \
     curl https://install.meteor.com/?release=${METEOR_VERSION} | sh && \
     cd /root/.meteor/packages/meteor-tool/*/mt-os.linux.x86_64 && \
@@ -21,7 +21,7 @@ RUN export TEMP_PACKAGES="alpine-sdk libc6-compat python graphicsmagick curl lin
     ln -s $(which npm) && \
     ln -s $(which npx) && \
     cd ../mongodb/bin && \
-    rm mongo mongod && \
+    rm mongos mongod && \
     cd ../../lib && \
     npm rebuild && \
     cd ~ && \

Makefile

@@ -0,0 +1,75 @@
+# Define default shell
+SHELL := /bin/bash
+
+# Local commands
+start:
+	npm run start
+
+start-dev:
+	npm run start-dev
+
+test:
+	npm run test
+
+test-run:
+	npm run test-run
+
+test-app:
+	npm run test-app
+
+visualize:
+	npm run visualize
+
+lint:
+	npm run lint
+
+pretest:
+	npm run pretest
+
+# Docker commands
+docker-start-dev:
+	docker-compose --file docker-compose.dev.yml exec app npm run start-dev
+
+docker-test:
+	docker-compose --file docker-compose.dev.yml exec app npm run test
+
+docker-test-run:
+	docker-compose --file docker-compose.dev.yml exec app npm run test-run
+
+docker-test-app:
+	docker-compose --file docker-compose.dev.yml exec app npm run test-app
+
+docker-visualize:
+	docker-compose --file docker-compose.dev.yml exec app npm run visualize
+
+docker-lint:
+	docker-compose --file docker-compose.dev.yml exec app npm run lint
+
+docker-pretest:
+	docker-compose --file docker-compose.dev.yml exec app npm run pretest
+
+docker-up:
+	docker-compose --file docker-compose.dev.yml up --build
+
+# Add a help command to list available targets
+help:
+	@echo "Available commands:"
+	@echo "  start       Run the app locally with development settings and MAIL_URL"
+	@echo "  start-dev   Run the app locally for development"
+	@echo "  test        Run local tests once"
+	@echo "  test-run    Continuously run local tests"
+	@echo "  test-app    Run full-app local tests"
+	@echo "  visualize   Visualize local production bundle"
+	@echo "  lint        Lint the local codebase"
+	@echo "  pretest     Run lint as pretest locally"
+	@echo ""
+	@echo "  docker-start-dev  Start the development environment in Docker"
+	@echo "  docker-test       Run tests in the Docker container"
+	@echo "  docker-test-run   Continuously run tests in the Docker container"
+	@echo "  docker-test-app   Run full-app tests in the Docker container"
+	@echo "  docker-visualize  Visualize production bundle in Docker"
+	@echo "  docker-lint       Lint the codebase in Docker"
+	@echo "  docker-pretest    Run lint as pretest in Docker"
+	@echo "  docker-up         Start docker dev venv"
+
+.PHONY: start start-dev test test-run test-app visualize lint pretest docker-start-dev docker-test docker-test-run docker-test-app docker-visualize docker-lint docker-pretest docker-up help