From dfa30e0e35c4682e5d4bfe085e92befa58c1461a Mon Sep 17 00:00:00 2001 From: Adam Wolski Date: Wed, 13 Dec 2023 23:11:20 +0100 Subject: [PATCH] feat: add v2.14 (#150) * feat: add v2.14 * fix: ugrade node to v14.21.4 security patch --- .../continuous-integration-workflow.yml | 1 + README.md | 4 +-- .../app-with-native-dependencies.dockerfile | 4 +-- example/app/.meteor/packages | 8 ++--- example/app/.meteor/release | 2 +- example/app/.meteor/versions | 36 +++++++++---------- example/app/package-lock.json | 16 ++++----- example/app/package.json | 4 +-- example/default.dockerfile | 4 +-- support.sh | 3 ++ versions.sh | 3 +- 11 files changed, 45 insertions(+), 40 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 3097466..39d33b7 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -63,6 +63,7 @@ jobs: - '2.13' - '2.13.1' - '2.13.3' + - '2.14' steps: - name: Checkout diff --git a/README.md b/README.md index 2f95d12..d592d03 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ Copy `example/default.dockerfile` (or `example/app-with-native-dependencies.dock Edit the `Dockerfile` you copied into your project, changing the first line so that the numbers at the end match the version of Meteor of your project. You can find your project’s Meteor version in your app’s `.meteor/release` file. -For example, if your project is running under Meteor 2.13.3: +For example, if your project is running under Meteor 2.14: ```Dockerfile -FROM geoffreybooth/meteor-base:2.13.3 +FROM geoffreybooth/meteor-base:2.14 ``` This version must match an available tag from [geoffreybooth/meteor-base](https://hub.docker.com/r/geoffreybooth/meteor-base/tags). diff --git a/example/app-with-native-dependencies.dockerfile b/example/app-with-native-dependencies.dockerfile index 1e62edc..275944d 100644 --- a/example/app-with-native-dependencies.dockerfile +++ b/example/app-with-native-dependencies.dockerfile @@ -1,5 +1,5 @@ # The tag here should match the Meteor version of your app, per .meteor/release -FROM geoffreybooth/meteor-base:2.13.3 +FROM geoffreybooth/meteor-base:2.14 # Copy app package.json and package-lock.json into container COPY ./app/package*.json $APP_SOURCE_FOLDER/ @@ -12,7 +12,7 @@ COPY ./app $APP_SOURCE_FOLDER/ RUN bash $SCRIPTS_FOLDER/build-meteor-bundle.sh -# Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 2.13.3 +# Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 2.14 FROM meteor/node:14.21.4-alpine3.17 ENV APP_BUNDLE_FOLDER /opt/bundle diff --git a/example/app/.meteor/packages b/example/app/.meteor/packages index 42695f9..454e9b5 100644 --- a/example/app/.meteor/packages +++ b/example/app/.meteor/packages @@ -5,15 +5,15 @@ # but you can also edit it by hand. meteor-base@1.5.1 # Packages every Meteor app needs to have -mobile-experience@1.1.0 # Packages for a great mobile UX -mongo@1.16.7 # The database Meteor supports right now +mobile-experience@1.1.1 # Packages for a great mobile UX +mongo@1.16.8 # The database Meteor supports right now reactive-var@1.0.12 # Reactive variable for tracker standard-minifier-css@1.9.2 # CSS minifier run for production mode standard-minifier-js@2.8.1 # JS minifier run for production mode es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers -ecmascript@0.16.7 # Enable ECMAScript2015+ syntax in app code -typescript@4.9.4 # Enable TypeScript syntax in .ts and .tsx modules +ecmascript@0.16.8 # Enable ECMAScript2015+ syntax in app code +typescript@4.9.5 # Enable TypeScript syntax in .ts and .tsx modules shell-server@0.5.0 # Server-side component of the `meteor shell` command hot-module-replacement@0.5.3 # Update client in development without reloading the page diff --git a/example/app/.meteor/release b/example/app/.meteor/release index 6641d04..c500c39 100644 --- a/example/app/.meteor/release +++ b/example/app/.meteor/release @@ -1 +1 @@ -METEOR@2.13.3 +METEOR@2.14 diff --git a/example/app/.meteor/versions b/example/app/.meteor/versions index d617080..b5594f6 100644 --- a/example/app/.meteor/versions +++ b/example/app/.meteor/versions @@ -1,12 +1,12 @@ allow-deny@1.1.1 autopublish@1.0.7 autoupdate@1.8.0 -babel-compiler@7.10.4 +babel-compiler@7.10.5 babel-runtime@1.5.1 base64@1.0.12 binary-heap@1.0.11 blaze-tools@1.1.3 -boilerplate-generator@1.7.1 +boilerplate-generator@1.7.2 caching-compiler@1.2.2 caching-html-compiler@1.2.1 callback-hook@1.5.1 @@ -14,16 +14,16 @@ check@1.3.2 ddp@1.4.1 ddp-client@2.6.1 ddp-common@1.4.0 -ddp-server@2.6.2 +ddp-server@2.7.0 diff-sequence@1.1.2 dynamic-import@0.7.3 -ecmascript@0.16.7 +ecmascript@0.16.8 ecmascript-runtime@0.8.1 ecmascript-runtime-client@0.12.1 ecmascript-runtime-server@0.11.0 ejson@1.1.3 es5-shim@4.8.0 -fetch@0.1.3 +fetch@0.1.4 geojson-utils@1.0.11 hot-code-push@1.0.4 hot-module-replacement@0.5.3 @@ -32,42 +32,42 @@ htmljs@1.1.1 id-map@1.1.1 insecure@1.0.7 inter-process-messaging@0.1.1 -launch-screen@1.3.0 -logging@1.3.2 -meteor@1.11.3 +launch-screen@2.0.0 +logging@1.3.3 +meteor@1.11.4 meteor-base@1.5.1 minifier-css@1.6.4 minifier-js@2.7.5 minimongo@1.9.3 -mobile-experience@1.1.0 +mobile-experience@1.1.1 mobile-status-bar@1.1.0 -modern-browsers@0.1.9 -modules@0.19.0 +modern-browsers@0.1.10 +modules@0.20.0 modules-runtime@0.13.1 modules-runtime-hot@0.14.2 -mongo@1.16.7 +mongo@1.16.8 mongo-decimal@0.1.3 mongo-dev-server@1.1.0 mongo-id@1.0.8 -npm-mongo@4.16.0 +npm-mongo@4.17.2 ordered-dict@1.1.0 promise@0.12.2 random@1.2.1 -react-fast-refresh@0.2.7 +react-fast-refresh@0.2.8 react-meteor-data@2.5.1 reactive-var@1.0.12 reload@1.3.1 retry@1.1.0 routepolicy@1.1.1 shell-server@0.5.0 -socket-stream-client@0.5.1 +socket-stream-client@0.5.2 spacebars-compiler@1.3.1 standard-minifier-css@1.9.2 standard-minifier-js@2.8.1 static-html@1.3.2 templating-tools@1.2.2 -tracker@1.3.2 -typescript@4.9.4 +tracker@1.3.3 +typescript@4.9.5 underscore@1.0.13 -webapp@1.13.5 +webapp@1.13.6 webapp-hashing@1.1.1 diff --git a/example/app/package-lock.json b/example/app/package-lock.json index f48d32a..4cd9f92 100644 --- a/example/app/package-lock.json +++ b/example/app/package-lock.json @@ -6,16 +6,16 @@ "": { "name": "app", "dependencies": { - "@babel/runtime": "^7.23.2", - "meteor-node-stubs": "^1.2.5", + "@babel/runtime": "^7.23.6", + "meteor-node-stubs": "^1.2.7", "react": "^18.2.0", "react-dom": "^18.2.0" } }, "node_modules/@babel/runtime": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz", - "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.6.tgz", + "integrity": "sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -40,9 +40,9 @@ } }, "node_modules/meteor-node-stubs": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.5.tgz", - "integrity": "sha512-FLlOFZx3KnZ5s3yPCK+x58DyX9ewN+oQ12LcpwBXMLtzJ/YyprMQVivd6KIrahZbKJrNenPNUGuDS37WUFg+Mw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.7.tgz", + "integrity": "sha512-20bAFUhEIOD/Cos2nmvhqf2NOKpTf63WVQ+nwuaX2OFj31sU6GL4KkNylkWum8McwsH0LsMr/F+UHhduTX7KRg==", "bundleDependencies": [ "assert", "browserify-zlib", diff --git a/example/app/package.json b/example/app/package.json index e07c188..46d516c 100644 --- a/example/app/package.json +++ b/example/app/package.json @@ -8,8 +8,8 @@ "visualize": "meteor --production --extra-packages bundle-visualizer" }, "dependencies": { - "@babel/runtime": "^7.23.2", - "meteor-node-stubs": "^1.2.5", + "@babel/runtime": "^7.23.6", + "meteor-node-stubs": "^1.2.7", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/example/default.dockerfile b/example/default.dockerfile index 2e9ea1d..b0e7551 100644 --- a/example/default.dockerfile +++ b/example/default.dockerfile @@ -1,5 +1,5 @@ # The tag here should match the Meteor version of your app, per .meteor/release -FROM geoffreybooth/meteor-base:2.13.3 +FROM geoffreybooth/meteor-base:2.14 # Copy app package.json and package-lock.json into container COPY ./app/package*.json $APP_SOURCE_FOLDER/ @@ -12,7 +12,7 @@ COPY ./app $APP_SOURCE_FOLDER/ RUN bash $SCRIPTS_FOLDER/build-meteor-bundle.sh -# Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 2.13.3 +# Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 2.14 FROM meteor/node:14.21.4-alpine3.17 ENV APP_BUNDLE_FOLDER /opt/bundle diff --git a/support.sh b/support.sh index 455b7bf..29b3ff9 100644 --- a/support.sh +++ b/support.sh @@ -61,8 +61,11 @@ set_node_version() { elif [[ "$1" == 2.11.0 ]]; then node_version='14.21.3' elif [[ "$1" == 2.12 ]]; then node_version='14.21.3' elif [[ "$1" == 2.13 ]]; then node_version='14.21.4' + elif [[ "$1" == 2.14 ]]; then node_version='14.21.4' elif [[ "$1" == 2.13.1 ]]; then node_version='14.21.4' + elif [[ "$1" == 2.14 ]]; then node_version='14.21.4' elif [[ "$1" == 2.13.3 ]]; then node_version='14.21.4' + elif [[ "$1" == 2.14 ]]; then node_version='14.21.4' fi # End of versions } diff --git a/versions.sh b/versions.sh index 527e027..ef5e85d 100755 --- a/versions.sh +++ b/versions.sh @@ -52,5 +52,6 @@ meteor_versions=( \ '2.12' \ '2.13' \ '2.13.1' \ - '2.13.3' + '2.13.3' \ + '2.14' )