Merge branch 'devel' into jam-methods

.circleci/config.yml

@@ -79,7 +79,7 @@ run_save_node_bin: &run_save_node_bin
 build_machine_environment: &build_machine_environment
   # Specify that we want an actual machine (ala Circle 1.0), not a Docker image.
   docker:
-    - image: meteor/circleci:2023.12.1-android-34-node-18
+    - image: meteor/circleci:2024.09.11-android-34-node-20
   resource_class: large
   environment:
     # This multiplier scales the waitSecs for selftests.
@@ -345,6 +345,9 @@ jobs:
             if [ -f ./tmp/test-groups/2.txt ]; then TEST_GROUP=$(<./tmp/test-groups/2.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^co[n-z]'; fi
             echo $TEST_GROUP;
             eval $PRE_TEST_COMMANDS;
+            export PATH="/home/circleci/.sdkman/candidates/gradle/8.7/bin:${PATH}"
+            java --version
+            gradle --version
             ./meteor self-test \
               "$TEST_GROUP" \
               --retries ${METEOR_SELF_TEST_RETRIES} \
@@ -750,7 +753,7 @@ jobs:
   Docs:
     docker:
       # This Node version should match that in the meteor/docs CircleCI config.
-      - image: meteor/circleci:2023.12.1-android-34-node-20
+      - image: meteor/circleci:2024.09.11-android-34-node-20
     resource_class: large
     environment:
       CHECKOUT_METEOR_DOCS: /home/circleci/test_docs
@@ -759,7 +762,13 @@ jobs:
       - run:
           name: Cloning "meteor" Repository's current branch
           command: |
-            git clone --branch $CIRCLE_BRANCH https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
+            if [[ -n "$CIRCLE_PULL_REQUEST" ]]; then
+              PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's|.*/pull/\([0-9]*\)|\1|')
+              PR_BRANCH=$(curl -s https://api.github.com/repos/meteor/meteor/pulls/$PR_NUMBER | jq -r .head.ref)
+              git clone --branch $PR_BRANCH https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
+            else
+              git clone --branch $CIRCLE_BRANCH https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
+            fi
       # Run almost the same steps the meteor/docs repository runs, minus deploy.
       - run:
           name: Generating Meteor documentation for JSDoc testing

.envrc

@@ -15,8 +15,8 @@ function @meteor {
    "$ROOT_DIR/meteor" "$@"
 }
 
-function @test-package {
-   @meteor test-packages "$@" --exclude-archs=web.browser.legacy,web.cordova
+function @get-ready {
+  @meteor --get-ready
 }
 
 function @test-packages {
@@ -36,10 +36,18 @@ function @generate-dev-bundle {
   "$ROOT_DIR/scripts/generate-dev-bundle.sh"
 }
 
+function @init-submodule {
+  git submodule update --init --recursive
+}
+
 #################
 # Documentation #
 #################
 
+function @docs-start {
+  npm run docs:dev --prefix "$ROOT_DIR/v3-docs/docs"
+}
+
 function @docs-migration-start {
   npm run docs:dev --prefix "$ROOT_DIR/v3-docs/v3-migration-docs"
 }

.github/labeler.yml

@@ -115,6 +115,10 @@ Project:Dynamic Import:
 
 Project:Docs:
   - docs/**/*
+  - v3-docs/**/*
 
 Project:Guide:
   - guide/**/*
+
+github_actions:
+  - ./github/**/*

CONTRIBUTING.md

@@ -72,7 +72,7 @@ Current Core Team:
 
 ### Tracking project work
 
-Right now, the best place to track the work being done on Meteor is to take a look at the latest release milestone [here](https://github.com/meteor/meteor/milestones).  Also, the [Meteor Roadmap](https://docs.meteor.com/roadmap.html) contains high-level information on the current priorities of the project.
+Right now, the best place to track the work being done on Meteor is to take a look at the latest release milestone [here](https://github.com/meteor/meteor/milestones).  Also, the [Meteor Roadmap](https://docs.meteor.com/about/roadmap.html) contains high-level information on the current priorities of the project.
 
 ## Reporting a bug in Meteor
 <a name="reporting-bug"></a>
@@ -134,7 +134,7 @@ for more details on proposing changes to core code.
 Feature requests are tracked in the [Discussions](https://github.com/meteor/meteor/discussions).
 
 Meteor is a big project with [many sub-projects](https://github.com/meteor/meteor/tree/devel/packages).
-Community is welcome to help in all the sub-projects. We use our [roadmap](https://docs.meteor.com/roadmap.html) to communicate the high-level features we're currently prioritizing.
+Community is welcome to help in all the sub-projects. We use our [roadmap](https://docs.meteor.com/about/roadmap.html) to communicate the high-level features we're currently prioritizing.
 
 Every additional feature adds a maintenance cost in addition to its value. This
 cost starts with the work of writing the feature or reviewing a community pull
@@ -207,7 +207,7 @@ For more information about how to work with Meteor core, take a look at the [Dev
 
 ### Proposing your change
 
-You'll have the best chance of getting a change into core if you can build consensus in the community for it or if it is listed in the [roadmap](https://docs.meteor.com/roadmap.html). Start by creating a well specified Discussion [here](https://github.com/meteor/meteor/discussions).
+You'll have the best chance of getting a change into core if you can build consensus in the community for it or if it is listed in the [roadmap](https://docs.meteor.com/about/roadmap.html). Start by creating a well specified Discussion [here](https://github.com/meteor/meteor/discussions).
 
 Help drive discussion and advocate for your feature on the Github ticket (and perhaps the forums). The higher the demand for the feature and the greater the clarity of it's specification will determine the likelihood of a core contributor prioritizing your feature by flagging it with the `ready` label.
 

History.md

@@ -2,4 +2,4 @@
 
 This content was moved to [history.md](./docs/history.md).
 
-Previously the changelog was available to be edited here but it was always published in [https://docs.meteor.com/changelog.html](https://docs.meteor.com/changelog.html).
+Previously the changelog was available to be edited here but it was always published in [https://docs.meteor.com/history.html](https://docs.meteor.com/history.html).

README.md

@@ -10,7 +10,7 @@
 
 [![Travis CI Status](https://api.travis-ci.com/meteor/meteor.svg?branch=devel)](https://app.travis-ci.com/github/meteor/meteor)
 [![CircleCI Status](https://circleci.com/gh/meteor/meteor.svg?style=svg)](https://app.circleci.com/pipelines/github/meteor/meteor?branch=devel)
-[![built with Meteor](https://img.shields.io/badge/Meteor-3.0.1-green?logo=meteor&logoColor=white)](https://meteor.com)
+[![built with Meteor](https://img.shields.io/badge/Meteor-3.0.3-green?logo=meteor&logoColor=white)](https://meteor.com)
 ![node-current](https://img.shields.io/node/v/meteor)
 ![Discord](https://img.shields.io/discord/1247973371040239676)
 ![Twitter Follow](https://img.shields.io/twitter/follow/meteorjs?style=social)
@@ -24,7 +24,7 @@ Meteor is an **ultra-simple** environment for building **modern** web applicatio
 <hr>
 
 - [Official Website](https://www.meteor.com)
-- [Installation](https://www.meteor.com/developers/install)
+- [Installation](https://docs.meteor.com/about/install.html)
 - [Documentation](https://docs.meteor.com/#/full/)
 
 <hr>
@@ -51,7 +51,7 @@ Use the same code whether you’re developing for web, iOS, Android, or desktop
 
 How about trying a tutorial to get started with your favorite technology?
 
-| [<img align="left" width="25" src="https://upload.wikimedia.org/wikipedia/commons/a/a7/React-icon.svg"> React](https://react-tutorial.meteor.com/) |
+| [<img align="left" width="25" src="https://upload.wikimedia.org/wikipedia/commons/a/a7/React-icon.svg"> React](https://docs.meteor.com/tutorials/react/) |
 | - |
 | [<img align="left" width="25" src="https://progsoft.net/images/blaze-css-icon-3e80acb3996047afd09f1150f53fcd78e98c1e1b.png"> Blaze](https://blaze-tutorial.meteor.com/) |
 | [<img align="left" width="25" src="https://vuejs.org/images/logo.png"> Vue](https://vue-tutorial.meteor.com/) |
@@ -86,7 +86,7 @@ meteor
 
 * Deploy on [Meteor Cloud](https://www.meteor.com/cloud)
 * Discuss on [Forums](https://forums.meteor.com/)
-* Join the Meteor community Slack by clicking this [invite link](https://join.slack.com/t/meteor-community/shared_invite/enQtODA0NTU2Nzk5MTA3LWY5NGMxMWRjZDgzYWMyMTEyYTQ3MTcwZmU2YjM5MTY3MjJkZjQ0NWRjOGZlYmIxZjFlYTA5Mjg4OTk3ODRiOTc).
+* Join the Meteor Discord by clicking this [invite link](https://discord.gg/hZkTCaVjmT).
 * Announcement list. Subscribe in the [footer](https://www.meteor.com/).
 
 
@@ -107,4 +107,4 @@ To uninstall Meteor:
     rm -rf ~/.meteor 
     sudo rm /usr/local/bin/meteor
     ```
-To find more information about installation, [read here](https://docs.meteor.com/install.html#uninstall).
+To find more information about installation, [read here](https://docs.meteor.com/about/install.html#uninstall).

docs/scripts/legacy-warning.js

@@ -0,0 +1,35 @@
+/* global hexo */
+
+hexo.extend.filter.register('after_render:html', function (str) {
+  const warningMessage = `
+    <div class="warning-banner">
+      <p>
+        ⚠️ You're browsing the documentation for an old version of Meteor.js.
+        Check out the <a href="https://docs.meteor.com" target="_blank">v3 docs</a> and <a href="https://v3-migration-docs.meteor.com/" target="_blank">migration guide</a>.
+      </p>
+    </div>
+  `;
+
+  const css = `
+    <style>
+      .warning-banner {
+        text-align: center;
+        background-color: #fff3cd;
+        border: 1px solid #ffeeba;
+        color: #856404;
+        margin-bottom: 20px;
+      }
+      .warning-banner a {
+        color: #0056b3;
+        text-decoration: underline;
+      }
+      .warning-banner a:hover {
+        color: #003d82;
+      }
+    </style>
+  `;
+
+  const injectedContent = css + warningMessage;
+
+  return str.replace(/<div class="content">/, `<div class="content" data-injected>${injectedContent}`);
+});

docs/source/api/collections.md

@@ -837,6 +837,7 @@ const handle = cursor.observeChanges({
 setTimeout(() => handle.stop(), 5000);
 ```
 
+{% apibox "Mongo.getCollection" %}
 {% apibox "Mongo.ObjectID" %}
 
 `Mongo.ObjectID` follows the same API as the [Node MongoDB driver

guide/source/collections.md

@@ -104,7 +104,7 @@ This example from the Todos app defines a schema with a few simple rules:
 3. We specify the `incompleteCount` is a number, which on insertion is set to `0` if not otherwise specified.
 4. We specify that the `userId`, which is optional, must be a string that looks like the ID of a user document.
 
-We're using the SimpleSchema for Meteor related funcitonality, like IDs, but we encourage you to create custom regEx expressions for security reasons, for fields like `email` or `name`. Check out the [Simple Schema docs](https://github.com/longshotlabs/simpl-schema#regex) for more information.
+We're using the SimpleSchema for Meteor related functionality, like IDs, but we encourage you to create custom regEx expressions for security reasons, for fields like `email` or `name`. Check out the [Simple Schema docs](https://github.com/longshotlabs/simpl-schema#regex) for more information.
 
 We attach the schema to the namespace of `Lists` directly, which allows us to check objects against this schema directly whenever we want, such as in a form or [Method](methods.html). In the [next section](#schemas-on-write) we'll see how to use this schema automatically when writing to the collection.
 

meteor

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=20.15.1.1
+BUNDLE_VERSION=20.18.0.1
 
 
 # OS Check. Put here because here is where we download the precompiled

npm-packages/eslint-plugin-meteor/scripts/dev-bundle-server-package.js

@@ -9,7 +9,7 @@ var packageJson = {
   private: true,
   dependencies: {
     promise: "8.1.0",
-    "@meteorjs/reify": "0.24.0",
+    "@meteorjs/reify": "0.25.3",
     "@babel/parser": "7.17.0",
     "@types/underscore": "1.11.4",
     underscore: "1.13.6",

npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js

@@ -10,13 +10,13 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "10.7.0",
+    npm: "10.8.2",
     pacote: "https://github.com/meteor/pacote/tarball/a81b0324686e85d22c7688c47629d4009000e8b8",
     "node-gyp": "9.4.0",
     "@mapbox/node-pre-gyp": "1.0.11",
-    typescript: "5.4.5",
-    "@meteorjs/babel": "7.19.0-beta.3",
-    "@meteorjs/reify": "0.24.0",
+    typescript: "5.6.2",
+    "@meteorjs/babel": "7.20.0",
+    "@meteorjs/reify": "0.25.3",
     // So that Babel can emit require("@babel/runtime/helpers/...") calls.
     "@babel/runtime": "7.15.3",
     // For backwards compatibility with isopackets that still depend on

npm-packages/meteor-babel/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meteorjs/babel",
   "author": "Meteor <[email protected]>",
-  "version": "7.20.0-beta.5",
+  "version": "7.20.0",
   "license": "MIT",
   "type": "commonjs",
   "description": "Babel wrapper package for use with Meteor",
@@ -42,7 +42,7 @@
     "@babel/template": "^7.16.7",
     "@babel/traverse": "^7.17.0",
     "@babel/types": "^7.17.0",
-    "@meteorjs/reify": "0.25.2",
+    "@meteorjs/reify": "0.25.3",
     "babel-preset-meteor": "^7.10.0",
     "babel-preset-minify": "^0.5.1",
     "convert-source-map": "^1.6.0",