Merge pull request #6 from 9Morello/devel

make it up to date with upstream

.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:2024.09.2-android-34-node-20
+    - 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:2024.09.2-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

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.2-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)
@@ -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/).
 
 

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}`);
+});

meteor

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

npm-packages/meteor-installer/README.md

@@ -56,6 +56,7 @@ Set the `https_proxy` or `HTTPS_PROXY` environment variable to a valid proxy URL
 
 | NPM Package | Meteor Official Release |
 |-------------|-------------------------|
+| 3.0.3       | 3.0.3                   |
 | 3.0.2       | 3.0.2                   |
 | 3.0.1       | 3.0.1                   |
 | 3.0.0       | 3.0                     |

npm-packages/meteor-installer/config.js

@@ -1,7 +1,7 @@
 const os = require('os');
 const path = require('path');
 
-const METEOR_LATEST_VERSION = '3.0.2';
+const METEOR_LATEST_VERSION = '3.0.3';
 const sudoUser = process.env.SUDO_USER || '';
 function isRoot() {
   return process.getuid && process.getuid() === 0;

npm-packages/meteor-installer/extract.js

@@ -5,7 +5,7 @@ const Seven = require('node-7z');
 const { resolve, dirname } = require('path');
 const tar = require('tar');
 
-const { isMac } = require('./config.js');
+const { isLinux } = require('./config.js');
 
 function extractWith7Zip(tarPath, destination, onProgress) {
   return new Promise((resolve, reject) => {
@@ -49,7 +49,7 @@ function createSymlinks(symlinks, baseDir) {
 function extractWithNativeTar(tarPath, destination) {
   child_process.execSync(
     `tar -xf "${tarPath}" ${
-      !isMac() ? `--checkpoint-action=ttyout="#%u: %T \r"` : ``
+      isLinux() ? `--checkpoint-action=ttyout="#%u: %T \r"` : ``
     } -C "${destination}"`,
     {
       cwd: process.cwd(),

npm-packages/meteor-installer/install.js

@@ -211,8 +211,19 @@ function download() {
     }
 
     if (isWindows()) {
-      decompress();
-      return;
+      const hasNativeTar = fs.existsSync(
+        path.resolve('C:/Windows/System32', 'tar.exe'),
+      );
+      if (hasNativeTar) {
+        // tar works exactly the same as it's bsdtar counterpart on UNIX so continue
+        console.log(
+          'Native binary for tar is available on this version of Windows.',
+        );
+        console.log('Switching to the native tar.exe binary on Windows.');
+      } else {
+        decompress();
+        return;
+      }
     }
 
     fs.writeFileSync(startedPath, 'Meteor install started');

npm-packages/meteor-installer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meteor",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "Install Meteor",
   "main": "install.js",
   "scripts": {

packages/accounts-base/accounts-base.d.ts

@@ -47,7 +47,7 @@ export namespace Accounts {
       profile?: Meteor.UserProfile | undefined;
     },
     callback?: (error?: Error | Meteor.Error | Meteor.TypedError) => void
-  ): string;
+  ): Promise<string>;
 
   function createUserAsync(
     options: {
@@ -113,23 +113,23 @@ export namespace Accounts {
     oldPassword: string,
     newPassword: string,
     callback?: (error?: Error | Meteor.Error | Meteor.TypedError) => void
-  ): void;
+  ): Promise<void>;
 
   function forgotPassword(
     options: { email?: string | undefined },
     callback?: (error?: Error | Meteor.Error | Meteor.TypedError) => void
-  ): void;
+  ): Promise<void>;
 
   function resetPassword(
     token: string,
     newPassword: string,
     callback?: (error?: Error | Meteor.Error | Meteor.TypedError) => void
-  ): void;
+  ): Promise<void>;
 
   function verifyEmail(
     token: string,
     callback?: (error?: Error | Meteor.Error | Meteor.TypedError) => void
-  ): void;
+  ): Promise<void>;
 
   function onEmailVerificationLink(callback: Function): void;
 
@@ -143,11 +143,11 @@ export namespace Accounts {
 
   function logout(
     callback?: (error?: Error | Meteor.Error | Meteor.TypedError) => void
-  ): void;
+  ): Promise<void>;
 
   function logoutOtherClients(
     callback?: (error?: Error | Meteor.Error | Meteor.TypedError) => void
-  ): void;
+  ): Promise<void>;
 
   type PasswordSignupField = 'USERNAME_AND_EMAIL' | 'USERNAME_AND_OPTIONAL_EMAIL' | 'USERNAME_ONLY' | 'EMAIL_ONLY';
   type PasswordlessSignupField = 'USERNAME_AND_EMAIL' | 'EMAIL_ONLY';
@@ -179,9 +179,9 @@ export interface EmailTemplates {
 export namespace Accounts {
   var emailTemplates: EmailTemplates;
 
-  function addEmail(userId: string, newEmail: string, verified?: boolean): void;
+  function addEmailAsync(userId: string, newEmail: string, verified?: boolean): Promise<void>;
 
-  function removeEmail(userId: string, email: string): void;
+  function removeEmail(userId: string, email: string): Promise<void>;
 
   function onCreateUser(
     func: (options: { profile?: {} | undefined }, user: Meteor.User) => void
@@ -190,35 +190,35 @@ export namespace Accounts {
   function findUserByEmail(
     email: string,
     options?: { fields?: Mongo.FieldSpecifier | undefined }
-  ): Meteor.User | null | undefined;
+  ): Promise<Meteor.User | null | undefined>;
 
   function findUserByUsername(
     username: string,
     options?: { fields?: Mongo.FieldSpecifier | undefined }
-  ): Meteor.User | null | undefined;
+  ): Promise<Meteor.User | null | undefined>;
 
   function sendEnrollmentEmail(
     userId: string,
     email?: string,
     extraTokenData?: Record<string, unknown>,
     extraParams?: Record<string, unknown>
-  ): void;
+  ): Promise<void>;
 
   function sendResetPasswordEmail(
     userId: string,
     email?: string,
     extraTokenData?: Record<string, unknown>,
     extraParams?: Record<string, unknown>
-  ): void;
+  ): Promise<void>;
 
   function sendVerificationEmail(
     userId: string,
     email?: string,
     extraTokenData?: Record<string, unknown>,
     extraParams?: Record<string, unknown>
-  ): void;
+  ): Promise<void>;
 
-  function setUsername(userId: string, newUsername: string): void;
+  function setUsername(userId: string, newUsername: string): Promise<void>;
 
   function setPasswordAsync(
     userId: string,

packages/accounts-base/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.0.1",
+  version: "3.0.2",
 });
 
 Package.onUse((api) => {

packages/accounts-password/package.js

@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.0.1",
+  version: "3.0.2",
 });
 
 Npm.depends({

packages/email/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "3.0.100",
+  version: "3.1.0",
 });
 
 Npm.depends({

packages/meteor-tool/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'The Meteor command-line tool',
-  version: '3.0.2',
+  version: '3.0.3',
 });
 
 Package.includeTool();