Skip to content

Commit b9b1eb5

Browse files
authored
Merge branch 'devel' into fix/14013
2 parents 2271cb5 + 71b735b commit b9b1eb5

File tree

9 files changed

+81
-88
lines changed

9 files changed

+81
-88
lines changed

docs/source/commandline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ Your project should be a git repository as the commit hash is going to be used t
677677
The `cache-build` option is available since Meteor 1.11.
678678
{% endpullquote %}
679679

680-
With the argument `--container-size` you can change your app's container size using the deploy command. The valid arguments are: `tiny`, `compact`, `standard`, `double`, `quad`, `octa`, and `dozen`. One more thing to note here is that the `--container-size` flag can only be used when the `--plan` option is already specified, otherwise using the `--container-size` option will throw an error with the message : `Error deploying application: Internal error`. To see more about the difference and prices of each one you can check [here](https://www.meteor.com/cloud#pricing-section).
680+
With the argument `--container-size` you can change your app's container size using the deploy command. The valid arguments are: `tiny`, `compact`, `standard`, `double`, `quad`, `octa`, and `dozen`. One more thing to note here is that the `--container-size` flag can only be used when the `--plan` option is already specified, otherwise using the `--container-size` option will throw an error with the message : `Error deploying application: Internal error`. To see more about the difference and prices of each one you can check [here](https://galaxycloud.app/meteorjs/pricing).
681681

682682
{% pullquote warning %}
683683
The `--container-size` option is available since Meteor 2.4.1.

guide/source/deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ MONGO_URL=mongodb://localhost:27017/myapp ROOT_URL=http://my-app.com PORT=3000 n
194194
```
195195

196196
* `ROOT_URL` is the base URL for your Meteor project
197-
* `PORT` is the port at which the application is running
197+
* `PORT` is the port at which the application is running
198198
* `MONGO_URL` is a [Mongo connection string URI](https://docs.mongodb.com/manual/reference/connection-string/) supplied by the MongoDB provider.
199199

200200

@@ -322,7 +322,7 @@ Galaxy's UI provides a detailed logging system, which can be invaluable to deter
322322

323323
If you really want to understand the ins and outs of running your Meteor application, you should use an Application Performance Monitoring (APM) service. There are multiple services designed for Meteor apps:
324324

325-
- [Meteor APM](https://www.meteor.com/cloud)
325+
- [Meteor APM](https://galaxycloud.app/)
326326
- [Monti APM](https://montiapm.com/)
327327
- [Meteor Elastic APM](https://github.com/Meteor-Community-Packages/meteor-elastic-apm)
328328

guide/source/performance-improvement.md

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

guide/source/ui-ux.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Meteor supports many view layers.
1111
The most popular are:
1212
- [React](react.html): official [page](http://reactjs.org/)
1313
- [Blaze](blaze.html): official [page](http://blazejs.org/)
14-
- [Angular](http://www.angular-meteor.com): official [page](https://angular.io/)
14+
- [Angular](angular.html): official [page](https://angular.io/)
1515
- [Vue](vue.html): official [page](https://vuejs.org/)
16-
- [Svelte](https://www.meteor.com/tutorials/svelte/creating-an-app): official [page](https://svelte.dev/)
16+
- [Svelte](svelte.html): official [page](https://svelte.dev/)
1717

1818
If you are starting with web development we recommend that you use Blaze as it's very simple to learn.
1919

npm-packages/eslint-plugin-meteor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ meteor
5656

5757
Building an application with Meteor?
5858

59-
* Deploy on Galaxy hosting: https://www.meteor.com/cloud
59+
* Deploy on Galaxy hosting: https://galaxycloud.app/
6060
* Announcement list: sign up at https://www.meteor.com/
6161
* Discussion forums: https://forums.meteor.com/
6262
* Join the Meteor community Slack by clicking this [invite link](https://join.slack.com/t/meteor-community/shared_invite/enQtODA0NTU2Nzk5MTA3LWY5NGMxMWRjZDgzYWMyMTEyYTQ3MTcwZmU2YjM5MTY3MjJkZjQ0NWRjOGZlYmIxZjFlYTA5Mjg4OTk3ODRiOTc).

npm-packages/meteor-installer/install.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ Or see the docs at:
360360
361361
Deploy and host your app with Cloud:
362362
363-
www.meteor.com/cloud
363+
https://galaxycloud.app/
364364
365365
***************************************
366366
You might need to open a new terminal window to have access to the meteor command, or run this in your terminal:

tools/cli/commands.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ main.registerCommand({
11251125
"If you are new to Meteor, try some of the learning resources here:"
11261126
);
11271127
Console.info(
1128-
Console.url("https://www.meteor.com/tutorials"),
1128+
Console.url("https://docs.meteor.com/"),
11291129
Console.options({ indent: 2 })
11301130
);
11311131

@@ -1134,7 +1134,7 @@ main.registerCommand({
11341134
"When you’re ready to deploy and host your new Meteor application, check out Cloud:"
11351135
);
11361136
Console.info(
1137-
Console.url("https://www.meteor.com/cloud"),
1137+
Console.url("https://galaxycloud.app/"),
11381138
Console.options({ indent: 2 })
11391139
);
11401140

v3-docs/docs/.vitepress/config.mts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export default defineConfig({
126126
],
127127
},
128128
{ text: "API", link: "/api/" },
129-
{ text: "Galaxy Cloud", link: "https://www.meteor.com/cloud" },
129+
{ text: "Galaxy Cloud", link: "https://galaxycloud.app" },
130130
{
131131
text: metadata.currentVersion,
132132
items: metadata.versions.reverse().map((v) => {
@@ -490,11 +490,11 @@ export default defineConfig({
490490
link: "/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker",
491491
text: "Meteor + Vue + vue-meteor-tracker",
492492
},
493-
{
493+
{
494494
text: "Meteor.js 3 + Solid",
495495
link: "/tutorials/solid/index",
496496
},
497-
{
497+
{
498498
text: "Meteor.js 3 + Blaze",
499499
link: "/tutorials/blaze/index",
500500
},

v3-docs/docs/api/meteor.md

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Meteor.startup(async () => {
3030
if ((await LinksCollection.find().countAsync()) === 0) {
3131
await LinksCollection.insertAsync({
3232
title: "Do the Tutorial",
33-
url: "https://www.meteor.com/tutorials/react/creating-an-app",
33+
url: "https://docs.meteor.com/tutorials/react",
3434
});
3535
}
3636
});
@@ -148,10 +148,7 @@ import { Meteor } from "meteor/meteor";
148148

149149
function Component() {
150150
const addLink = () =>
151-
Meteor.callAsync(
152-
"addLink",
153-
"https://www.meteor.com/tutorials/react/creating-an-app"
154-
);
151+
Meteor.callAsync("addLink", "https://docs.meteor.com/tutorials/react/");
155152

156153
return (
157154
<div>
@@ -398,7 +395,6 @@ even if the method's writes are not available yet, you can specify an
398395
Use `Meteor.call` only to call methods that do not have a stub, or have a sync stub. If you want to call methods with an async stub, `Meteor.callAsync` can be used with any method.
399396
:::
400397

401-
402398
<ApiBox name="Meteor.callAsync" />
403399

404400
`Meteor.callAsync` is just like `Meteor.call`, except that it'll return a promise that you need to solve to get the server result. Along with the promise returned by `callAsync`, you can also handle `stubPromise` and `serverPromise` for managing client-side simulation and server response.
@@ -409,64 +405,63 @@ The following sections guide you in understanding these promises and how to mana
409405

410406
```javascript
411407
try {
412-
await Meteor.callAsync('greetUser', 'John');
413-
// 🟢 Server ended with success
414-
} catch(e) {
415-
console.error("Error:", error.reason); // 🔴 Server ended with error
408+
await Meteor.callAsync("greetUser", "John");
409+
// 🟢 Server ended with success
410+
} catch (e) {
411+
console.error("Error:", error.reason); // 🔴 Server ended with error
416412
}
417413

418-
Greetings.findOne({ name: 'John' }); // 🗑️ Data is NOT available
414+
Greetings.findOne({ name: "John" }); // 🗑️ Data is NOT available
419415
```
420416

421417
#### stubPromise
422418

423419
```javascript
424-
await Meteor.callAsync('greetUser', 'John').stubPromise;
420+
await Meteor.callAsync("greetUser", "John").stubPromise;
425421

426422
// 🔵 Client simulation
427-
Greetings.findOne({ name: 'John' }); // 🧾 Data is available (Optimistic-UI)
423+
Greetings.findOne({ name: "John" }); // 🧾 Data is available (Optimistic-UI)
428424
```
429425

430426
#### stubPromise and serverPromise
431427

432428
```javascript
433-
const { stubPromise, serverPromise } = Meteor.callAsync('greetUser', 'John');
429+
const { stubPromise, serverPromise } = Meteor.callAsync("greetUser", "John");
434430

435431
await stubPromise;
436432

437433
// 🔵 Client simulation
438-
Greetings.findOne({ name: 'John' }); // 🧾 Data is available (Optimistic-UI)
434+
Greetings.findOne({ name: "John" }); // 🧾 Data is available (Optimistic-UI)
439435

440436
try {
441437
await serverPromise;
442438
// 🟢 Server ended with success
443-
} catch(e) {
439+
} catch (e) {
444440
console.error("Error:", error.reason); // 🔴 Server ended with error
445441
}
446442

447-
Greetings.findOne({ name: 'John' }); // 🗑️ Data is NOT available
443+
Greetings.findOne({ name: "John" }); // 🗑️ Data is NOT available
448444
```
449445

450446
#### Meteor 2.x contrast
451447

452448
For those familiar with legacy Meteor 2.x, the handling of client simulation and server response was managed using fibers, as explained in the following section. This comparison illustrates how async inclusion with standard promises has transformed the way Meteor operates in modern versions.
453449

454-
``` javascript
455-
Meteor.call('greetUser', 'John', function(error, result) {
450+
```javascript
451+
Meteor.call("greetUser", "John", function (error, result) {
456452
if (error) {
457453
console.error("Error:", error.reason); // 🔴 Server ended with error
458454
} else {
459455
console.log("Result:", result); // 🟢 Server ended with success
460456
}
461457

462-
Greetings.findOne({ name: 'John' }); // 🗑️ Data is NOT available
458+
Greetings.findOne({ name: "John" }); // 🗑️ Data is NOT available
463459
});
464460

465461
// 🔵 Client simulation
466-
Greetings.findOne({ name: 'John' }); // 🧾 Data is available (Optimistic-UI)
462+
Greetings.findOne({ name: "John" }); // 🧾 Data is available (Optimistic-UI)
467463
```
468464

469-
470465
<ApiBox name="Meteor.apply" />
471466

472467
`Meteor.apply` is just like `Meteor.call`, except that the method arguments are
@@ -504,8 +499,6 @@ different collections. We hope to lift this restriction in a future release.
504499

505500
</ApiBox>
506501

507-
508-
509502
```js
510503
import { Meteor } from "meteor/meteor";
511504
import { check } from "meteor/check";

0 commit comments

Comments
 (0)