Merge branch 'release-3.0' into feature/logging-chalk-5

.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:android-30-node-18
+    - image: meteor/circleci:2023.12.1-android-34-node-18
   resource_class: large
   environment:
     # This multiplier scales the waitSecs for selftests.
@@ -178,7 +178,7 @@ jobs:
           command: |
             eval $PRE_TEST_COMMANDS;
             cd dev_bundle/lib
-            ../../meteor npm install @types/node@18.11.9 --save-dev
+            ../../meteor npm install @types/node@20.10.5 --save-dev
             # Ensure that meteor/tools has no TypeScript errors.
             ../../meteor npm install -g typescript
             cd ../../
@@ -390,7 +390,7 @@ jobs:
             ./meteor self-test \
               "$TEST_GROUP" \
               --retries ${METEOR_SELF_TEST_RETRIES} \
-              --exclude "${SELF_TEST_EXCLUDE}|--svelte|--vue|--typescript|--apollo|--solid|--full" \
+              --exclude "${SELF_TEST_EXCLUDE}" \
               --headless \
               --junit ./tmp/results/junit/3.xml \
               --without-tag "custom-warehouse"
@@ -474,7 +474,7 @@ jobs:
             ./meteor self-test \
               "$TEST_GROUP" \
               --retries ${METEOR_SELF_TEST_RETRIES} \
-              --exclude "${SELF_TEST_EXCLUDE}|modules - test app" \
+              --exclude "${SELF_TEST_EXCLUDE}" \
               --headless \
               --junit ./tmp/results/junit/5.xml \
               --without-tag "custom-warehouse"
@@ -750,7 +750,7 @@ jobs:
   Docs:
     docker:
       # This Node version should match that in the meteor/docs CircleCI config.
-      - image: meteor/circleci:android-28-node-12
+      - image: meteor/circleci:2023.12.1-android-34-node-20
     resource_class: large
     environment:
       CHECKOUT_METEOR_DOCS: /home/circleci/test_docs

.envrc

@@ -0,0 +1,32 @@
+#!/bin/env zsh
+
+#
+# Commands and shortcuts for Meteor core development, you can load these in your terminal by running `source .envrc`.
+# Or by adding `[[ -s .envrc ]] && source .envrc` to your `.zshrc` or `.bashrc`.
+#
+
+export ROOT_DIR=$(git rev-parse --show-toplevel)
+
+function @meteor {
+   "$ROOT_DIR/meteor" "$@"
+}
+
+function @test-package {
+   @meteor test-packages "$@" --exclude-archs=web.browser.legacy,web.cordova
+}
+
+function @test-packages {
+  TINYTEST_FILTER="$1" @meteor test-packages --exclude-archs=web.browser.legacy,web.cordova
+}
+
+function @test-self {
+  @meteor self-test "$@"
+}
+
+function @check-syntax {
+  node "$ROOT_DIR/scripts/admin/check-legacy-syntax/check-syntax.js"
+}
+
+function @generate-dev-bundle {
+  "$ROOT_DIR/scripts/generate-dev-bundle.sh"
+}

.github/CODEOWNERS

@@ -0,0 +1 @@
+@henriquealbert @denihs @fredmaiaarantes @nachocodoner

.github/workflows/check-code-style.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14.x
+          node-version: 20.x
       - run: npm ci
       - name: Run ESLint@8
         run: npx eslint@8 "./npm-packages/meteor-installer/**/*.js"

.github/workflows/check-syntax.yml

@@ -7,9 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
       - run: cd scripts/admin/check-legacy-syntax && npm ci
       - name: Check syntax
-        run: cd scripts/admin/check-legacy-syntax && node check-syntax.js 
+        run: cd scripts/admin/check-legacy-syntax && node check-syntax.js

.github/workflows/docs.yml

@@ -11,13 +11,13 @@ jobs:
         working-directory: docs/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 12.x
       - name: Build the Docs
         run: npm ci && npm run build
       - name: Deploy to Netlify for preview
-        uses: nwtgck/actions-netlify@v1.2.4
+        uses: nwtgck/actions-netlify@v2.1.0
         with:
           publish-dir: './docs/public/'
           production-branch: devel

.github/workflows/guide.yml

@@ -11,13 +11,13 @@ jobs:
         working-directory: guide/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 12.x
       - name: Build the Guide
         run: npm ci && npm run build
       - name: Deploy to Netlify for preview
-        uses: nwtgck/actions-netlify@v1.2.4
+        uses: nwtgck/actions-netlify@v2.1.0
         with:
           publish-dir: './guide/public'
           production-branch: devel

.github/workflows/meteor-selftest-windows.yml

@@ -0,0 +1,55 @@
+name: Meteor Selftest Windows
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    branches:
+      - release-3.0
+  push:
+    branches:
+      - release-3.0
+
+env:
+  METEOR_PRETTY_OUTPUT: 0
+  SELF_TEST_TOOL_NODE_FLAGS: ' '
+  TOOL_NODE_FLAGS: --expose-gc
+  TIMEOUT_SCALE_FACTOR: 20
+  METEOR_HEADLESS: true
+  SELF_TEST_EXCLUDE: '^NULL-LEAVE-THIS-HERE-NULL$'
+
+jobs:
+  test:
+    runs-on: windows-2019-meteor
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 20.x
+
+      - name: Install dependencies
+        shell: pwsh
+        run: |
+          $env:PATH = "C:\Program Files\7-Zip;$env:PATH"
+          .\scripts\windows\ci\install.ps1
+
+      - name: Run tests
+        shell: pwsh
+        run: |
+          $env:PATH = "C:\Program Files\7-Zip;$env:PATH"
+          .\scripts\windows\ci\test.ps1
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            .\dev_bundle
+            .\.babel-cache
+            .\.meteor
+          key: ${{ runner.os }}-meteor-${{ hashFiles('**/package-lock.json') }}

.github/workflows/npm-eslint-plugin-meteor.yml

@@ -16,15 +16,12 @@ jobs:
     defaults:
       run:
         working-directory: npm-packages/eslint-plugin-meteor
-    strategy:
-      matrix:
-        node-version: [16.x, 18.x]
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 20.x
           cache: npm
       - run: npm ci
       - run: npm test

.github/workflows/npm-meteor-babel.yml

@@ -16,15 +16,12 @@ jobs:
     defaults:
       run:
         working-directory: npm-packages/meteor-babel
-    strategy:
-      matrix:
-        node-version: [16.x, 18.x]
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 14.x
           cache: npm
       - run: npm ci
       - run: npm run test

.github/workflows/npm-meteor-promise.yml

@@ -18,11 +18,11 @@ jobs:
         working-directory: npm-packages/meteor-promise
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [14.x]
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: npm

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "packages/non-core/blaze"]
     path = packages/non-core/blaze
-    url = https://github.com/meteor/blaze.git
+    url = https://github.com/meteor/blaze.git
+[submodule "npm-packages/cordova-plugin-meteor-webapp/src/ios/GCDWebServer"]
+	path = npm-packages/cordova-plugin-meteor-webapp/src/ios/GCDWebServer
+	url = https://github.com/meteor/GCDWebServer.git
+	branch = master

.travis.yml

@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "18.16.0"
+  - "20.10.0"
 cache:
   directories:
     - ".meteor"