From 20a31b84dfcf6c354c452e61076ef1b472df2f01 Mon Sep 17 00:00:00 2001 From: Tom Soukup Date: Sat, 10 Dec 2022 20:03:02 +0100 Subject: [PATCH 01/45] remove svelte-meteor-data --- tools/static-assets/skel-svelte/.meteor/packages | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/static-assets/skel-svelte/.meteor/packages b/tools/static-assets/skel-svelte/.meteor/packages index 0e3c38c047..c09c0b86ad 100644 --- a/tools/static-assets/skel-svelte/.meteor/packages +++ b/tools/static-assets/skel-svelte/.meteor/packages @@ -20,5 +20,4 @@ autopublish # Publish all data to the clients (for prototyping) insecure # Allow all DB writes from clients (for prototyping) static-html # Define static page content in .html files zodern:melte # Meteor package to allow us to create files with the .svelte extension -rdb:svelte-meteor-data # Meteor package which allows us to consume Meteor's reactive data sources inside of our Svelte components hot-module-replacement # Update client in development without reloading the page From 8c3496a46bf089b986048708ae562b8ce63211e8 Mon Sep 17 00:00:00 2001 From: Tom Soukup Date: Sat, 10 Dec 2022 20:04:15 +0100 Subject: [PATCH 02/45] utilize collections on the client --- .../skel-svelte/imports/ui/App.svelte | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/tools/static-assets/skel-svelte/imports/ui/App.svelte b/tools/static-assets/skel-svelte/imports/ui/App.svelte index 4bbdfecdc4..31a4ae46de 100644 --- a/tools/static-assets/skel-svelte/imports/ui/App.svelte +++ b/tools/static-assets/skel-svelte/imports/ui/App.svelte @@ -1,8 +1,21 @@ @@ -13,10 +26,13 @@

You've pressed the button {counter} times.

Learn Meteor!

- + {#if subIsReady} + + {:else} +
Loading ...
+ {/if} From e7808b3a550c83d0096a9b7f30e60670adcd2655 Mon Sep 17 00:00:00 2001 From: Drew Fisher Date: Sat, 10 Dec 2022 13:17:44 -0800 Subject: [PATCH 03/45] Fix fetch() type declaration `fetch()` is the type of `globalThis.fetch`; it is not a function which returns a `globalThis.fetch`. Fixes #12351. --- packages/fetch/fetch.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fetch/fetch.d.ts b/packages/fetch/fetch.d.ts index 8d6eb289ad..9fdaddd3fd 100644 --- a/packages/fetch/fetch.d.ts +++ b/packages/fetch/fetch.d.ts @@ -1,4 +1,4 @@ -export declare function fetch(): typeof globalThis.fetch; +export declare var fetch: typeof globalThis.fetch; export declare var Headers: typeof globalThis.Headers; export declare var Request: typeof globalThis.Request; export declare var Response: typeof globalThis.Response; From 10784fc7ba983c0a780b6a6e1edf09229be6f317 Mon Sep 17 00:00:00 2001 From: Tom Soukup Date: Mon, 12 Dec 2022 20:45:31 +0100 Subject: [PATCH 04/45] update packages --- docs/source/commandline.md | 17 ++++++++--------- .../static-assets/skel-svelte/.meteor/packages | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/source/commandline.md b/docs/source/commandline.md index ebb9381d3a..78f7eacf49 100644 --- a/docs/source/commandline.md +++ b/docs/source/commandline.md @@ -164,38 +164,37 @@ Create a basic [Solid](https://www.solidjs.com/) app. | | Default (`--react`) | `--bare` | `--full` | `--minimal` | `--blaze` | `--apollo` | `--vue-2` | `--svelte` | `--tailwind` | `--chakra-ui` | `--solid` | `--vue` | |------------------------------------------------------------------------------------------------------|:-------------------:|:--------:|:--------:|:-----------:|:---------:|:----------:|:---------:|:----------:|:------------:|:-------------:|:---------:|:-------:| -| [autopublish](https://atmospherejs.com/meteor/autopublish) | X | | | | X | | | X | X | X | X | | +| [autopublish](https://atmospherejs.com/meteor/autopublish) | X | | | | X | | | | X | X | X | | | [akryum:vue-component](https://atmospherejs.com/akryum/vue-component) | | | | | | | X | | | | | | | [apollo](https://atmospherejs.com/meteor/apollo) | | | | | | X | | | | | | | | [blaze-html-templates](https://atmospherejs.com/meteor/blaze-html-templates) | | | X | | X | | | | | | | | | [ecmascript](https://atmospherejs.com/meteor/ecmascript) | X | X | X | X | X | X | X | X | X | X | X | X | | [es5-shim](https://atmospherejs.com/meteor/es5-shim) | X | X | X | X | X | X | X | X | X | X | X | X | -| [hot-module-replacement](https://atmospherejs.com/meteor/hot-module-replacement) | X | | | | X | X | | | X | X | X | X | -| [insecure](https://atmospherejs.com/meteor/insecure) | X | | | | X | | | X | X | X | X | X | +| [hot-module-replacement](https://atmospherejs.com/meteor/hot-module-replacement) | X | | | | X | X | | X | X | X | X | X | +| [insecure](https://atmospherejs.com/meteor/insecure) | X | | | | X | | | | X | X | X | X | | [johanbrook:publication-collector](https://atmospherejs.com/meteor/johanbrook/publication-collector) | | | X | | | X | | | | | | | | [jquery](https://atmospherejs.com/meteor/jquery) | | | X | | X | | | | | | | | -| [ostrio:flow-router-extra](https://atmospherejs.com/meteor/ostrio/flow-router-extra) | | | X | | | | | | | | | | | [less](https://atmospherejs.com/meteor/less) | | | X | | | | | | | | | | | [meteor](https://atmospherejs.com/meteor/meteor) | | | | X | | | | | | | | | | [meteor-base](https://atmospherejs.com/meteor/meteor-base) | X | X | X | | X | X | X | X | X | X | X | X | | [mobile-experience](https://atmospherejs.com/meteor/mobile-experience) | X | X | X | | X | X | X | X | X | X | X | X | | [mongo](https://atmospherejs.com/meteor/mongo) | X | X | X | | X | X | X | X | X | X | X | X | | [meteortesting:mocha](https://atmospherejs.com/meteortesting/mocha) | | | X | | | | X | | | | | | -| [reactive-var](https://atmospherejs.com/meteor/reactive-var) | X | X | X | | X | X | X | X | X | X | X | X | -| [rdb:svelte-meteor-data](https://atmospherejs.com/rdb/svelte-meteor-data) | | | | | | | | X | | | | | +| [ostrio:flow-router-extra](https://atmospherejs.com/meteor/ostrio/flow-router-extra) | | | X | | | | | | | | | | +| [react-meteor-data](https://atmospherejs.com/meteor/react-meteor-data) | X | | | | | | | | X | X | | | +| [reactive-var](https://atmospherejs.com/meteor/reactive-var) | X | X | X | | X | X | X | | X | X | X | X | | [server-render](https://atmospherejs.com/meteor/server-render) | | | | X | | X | X | | | | | | | [shell-server](https://atmospherejs.com/meteor/shell-server) | | X | | X | X | X | X | X | X | X | X | X | | [standard-minifier-css](https://atmospherejs.com/meteor/standard-minifier-css) | X | X | X | X | X | X | X | X | X | X | X | X | | [standard-minifier-js](https://atmospherejs.com/meteor/standard-minifier-js) | X | X | X | X | X | X | X | X | X | X | X | X | | [static-html](https://atmospherejs.com/meteor/static-html) | | X | | X | | X | X | X | | | | | -| [svelte:compiler](https://atmospherejs.com/svelte/compiler) | | | | | | | | X | | | | | | [swydo:graphql](https://atmospherejs.com/swydo/graphql) | | | | | | X | | | | | | | | [tailwindcss](https://tailwindcss.com) | | X | X | | X | | X | | X | | | | | [tracker](https://atmospherejs.com/meteor/tracker) | | X | X | | X | | X | | | | | | | [typescript](https://atmospherejs.com/meteor/typescript) | X | X | X | X | X | X | X | X | X | X | X | | -| [webapp](https://atmospherejs.com/meteor/webapp) | | | | X | | | | | | | | | -| [react-meteor-data](https://atmospherejs.com/meteor/react-meteor-data) | X | | | | | | | | X | X | | | | [vite:bundler](https://atmospherejs.com/vite/bundler) | | | | | | | | | | | X | X | +| [webapp](https://atmospherejs.com/meteor/webapp) | | | | X | | | | | | | | | +| [zodern:melte](https://atmospherejs.com/zodern/melte) | | | | | | | | X | | | | |

meteor generate

diff --git a/tools/static-assets/skel-svelte/.meteor/packages b/tools/static-assets/skel-svelte/.meteor/packages index 283d99b9b2..110aaf8f8c 100644 --- a/tools/static-assets/skel-svelte/.meteor/packages +++ b/tools/static-assets/skel-svelte/.meteor/packages @@ -7,7 +7,6 @@ meteor-base # Packages every Meteor app needs to have mobile-experience # Packages for a great mobile UX mongo # The database Meteor supports right now -reactive-var # Reactive variable for tracker standard-minifier-css # CSS minifier run for production mode standard-minifier-js # JS minifier run for production mode From bb9e5a9815d1c5cd68b2727c01d94c30fede1a9c Mon Sep 17 00:00:00 2001 From: Tom Soukup Date: Mon, 12 Dec 2022 20:45:40 +0100 Subject: [PATCH 05/45] utilize pub/sub --- .../skel-svelte/imports/ui/App.svelte | 14 ++++++-------- tools/static-assets/skel-svelte/server/main.js | 4 ++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/static-assets/skel-svelte/imports/ui/App.svelte b/tools/static-assets/skel-svelte/imports/ui/App.svelte index 31a4ae46de..101098e37b 100644 --- a/tools/static-assets/skel-svelte/imports/ui/App.svelte +++ b/tools/static-assets/skel-svelte/imports/ui/App.svelte @@ -6,15 +6,13 @@ counter += 1; } - const subIsReady = true; // remove this line if you want to use the code below - // no need to publish/subscribe as there is autopublish package installed - // let subIsReady = false; - // $m: { - // const handle = Meteor.subscribe('links.all'); // todo: setup the server-side publication - // subIsReady = handle.ready(); - // } + let subIsReady = false; + $m: { + const handle = Meteor.subscribe('links.all'); + subIsReady = handle.ready(); + } - // $m is available from zodern:melte package + // more information about $m at https://atmospherejs.com/zodern/melte#tracker-statements $m: links = LinksCollection.find().fetch(); diff --git a/tools/static-assets/skel-svelte/server/main.js b/tools/static-assets/skel-svelte/server/main.js index b43489013b..ef8955bc7c 100644 --- a/tools/static-assets/skel-svelte/server/main.js +++ b/tools/static-assets/skel-svelte/server/main.js @@ -5,6 +5,10 @@ async function insertLink({ title, url }) { await LinksCollection.insertAsync({ title, url, createdAt: new Date() }); } +Meteor.publish('links.all', function () { + return LinksCollection.find(); +}) + Meteor.startup(async () => { // If the Links collection is empty, add some data. if (await LinksCollection.find().countAsync() === 0) { From 2baa715de6c8979f8a141e88c8377dea4ba6a1f2 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 13 Dec 2022 11:06:29 -0300 Subject: [PATCH 06/45] chore: reverted missing types --- packages/meteor/package.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 7007d77957..839475f713 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -55,6 +55,8 @@ Package.onUse(function (api) { // People expect process.exit() to not swallow console output. // On Windows, it sometimes does, so we fix it for all apps and packages api.addFiles('flush-buffers-on-exit-in-windows.js', 'server'); + + api.addAssets('meteor.d.ts', 'server'); }); Package.onTest(function (api) { From d740b6831e87ae5d7c15448cb45d48e60b1c1de3 Mon Sep 17 00:00:00 2001 From: Tom Soukup Date: Tue, 13 Dec 2022 17:58:25 +0100 Subject: [PATCH 07/45] add TS support --- .../skel-svelte/.meteor/packages | 1 + .../skel-svelte/imports/ui/App.svelte | 3 +++ tools/static-assets/skel-svelte/package.json | 9 ++++++--- .../static-assets/skel-svelte/server/main.js | 2 +- tools/static-assets/skel-svelte/tsconfig.json | 20 +++++++++++++++++++ 5 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 tools/static-assets/skel-svelte/tsconfig.json diff --git a/tools/static-assets/skel-svelte/.meteor/packages b/tools/static-assets/skel-svelte/.meteor/packages index 110aaf8f8c..b6c7d8a95d 100644 --- a/tools/static-assets/skel-svelte/.meteor/packages +++ b/tools/static-assets/skel-svelte/.meteor/packages @@ -19,3 +19,4 @@ shell-server # Server-side component of the `meteor shell` command static-html # Define static page content in .html files zodern:melte # Meteor package to allow us to create files with the .svelte extension hot-module-replacement # Update client in development without reloading the page +zodern:types # Enable types from meteor/atmosphere packages diff --git a/tools/static-assets/skel-svelte/imports/ui/App.svelte b/tools/static-assets/skel-svelte/imports/ui/App.svelte index 101098e37b..2456b485bd 100644 --- a/tools/static-assets/skel-svelte/imports/ui/App.svelte +++ b/tools/static-assets/skel-svelte/imports/ui/App.svelte @@ -33,4 +33,7 @@ {:else}
Loading ...
{/if} + +

Typescript ready

+

Just add lang="ts" to .svelte components.

diff --git a/tools/static-assets/skel-svelte/package.json b/tools/static-assets/skel-svelte/package.json index 0b0aae237d..0ae79b3327 100644 --- a/tools/static-assets/skel-svelte/package.json +++ b/tools/static-assets/skel-svelte/package.json @@ -8,9 +8,12 @@ "visualize": "meteor --production --extra-packages bundle-visualizer" }, "dependencies": { - "@babel/runtime": "^7.17.9", - "meteor-node-stubs": "^1.2.1", - "svelte": "^3.46.4" + "@babel/runtime": "^7.20.6", + "meteor-node-stubs": "^1.2.5", + "svelte": "^3.54.0" + }, + "devDependencies": { + "svelte-preprocess": "^5.0.0" }, "meteor": { "mainModule": { diff --git a/tools/static-assets/skel-svelte/server/main.js b/tools/static-assets/skel-svelte/server/main.js index ef8955bc7c..886520b487 100644 --- a/tools/static-assets/skel-svelte/server/main.js +++ b/tools/static-assets/skel-svelte/server/main.js @@ -5,7 +5,7 @@ async function insertLink({ title, url }) { await LinksCollection.insertAsync({ title, url, createdAt: new Date() }); } -Meteor.publish('links.all', function () { +Meteor.publish('links.all', function publishLinksAll() { return LinksCollection.find(); }) diff --git a/tools/static-assets/skel-svelte/tsconfig.json b/tools/static-assets/skel-svelte/tsconfig.json new file mode 100644 index 0000000000..11f2c45698 --- /dev/null +++ b/tools/static-assets/skel-svelte/tsconfig.json @@ -0,0 +1,20 @@ +{ + // see https://guide.meteor.com/build-tool.html#typescript for a config example + "compilerOptions": { + "allowSyntheticDefaultImports": true, // to be able to import eg meteor/mongo + "baseUrl": ".", // required by "paths" + "module": "esNext", // required by "preserveValueImports" + "moduleResolution": "node", // required by zodern:types (not documented) + "paths": { + "/*": ["*"], // support absolute /imports/* with a leading '/' + // support Meteor/Atmospehere packages, required by zodern:types + "meteor/*": [ + "node_modules/@types/meteor/*", + ".meteor/local/types/packages.d.ts" + ] + }, + "preserveSymlinks": true, // required by zodern:types + "preserveValueImports": true // otherwise TS will remove imported components + }, + "exclude": ["./.meteor/**", "./packages/**"] // this may solve VS Code Svelte plugin warnings +} From 524360bb407a3ccf6cdd8e52d990534569deba0b Mon Sep 17 00:00:00 2001 From: Tom Soukup Date: Tue, 13 Dec 2022 18:06:35 +0100 Subject: [PATCH 08/45] convert to TS --- docs/source/commandline.md | 1 + .../skel-svelte/imports/api/links.js | 3 --- .../skel-svelte/imports/api/links.ts | 9 +++++++++ .../skel-svelte/imports/ui/App.svelte | 17 ++++++++--------- 4 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 tools/static-assets/skel-svelte/imports/api/links.js create mode 100644 tools/static-assets/skel-svelte/imports/api/links.ts diff --git a/docs/source/commandline.md b/docs/source/commandline.md index 78f7eacf49..9891dbadda 100644 --- a/docs/source/commandline.md +++ b/docs/source/commandline.md @@ -195,6 +195,7 @@ Create a basic [Solid](https://www.solidjs.com/) app. | [vite:bundler](https://atmospherejs.com/vite/bundler) | | | | | | | | | | | X | X | | [webapp](https://atmospherejs.com/meteor/webapp) | | | | X | | | | | | | | | | [zodern:melte](https://atmospherejs.com/zodern/melte) | | | | | | | | X | | | | | +| [zodern:types](https://atmospherejs.com/zodern/types) | | | | | | | | X | | | | |

meteor generate

diff --git a/tools/static-assets/skel-svelte/imports/api/links.js b/tools/static-assets/skel-svelte/imports/api/links.js deleted file mode 100644 index 050c508eae..0000000000 --- a/tools/static-assets/skel-svelte/imports/api/links.js +++ /dev/null @@ -1,3 +0,0 @@ -import { Mongo } from 'meteor/mongo'; - -export const LinksCollection = new Mongo.Collection('links'); diff --git a/tools/static-assets/skel-svelte/imports/api/links.ts b/tools/static-assets/skel-svelte/imports/api/links.ts new file mode 100644 index 0000000000..291d640b9b --- /dev/null +++ b/tools/static-assets/skel-svelte/imports/api/links.ts @@ -0,0 +1,9 @@ +import { Mongo } from 'meteor/mongo'; + +export interface Link { + _id: string; + url: string; + title: string; +} + +export const LinksCollection = new Mongo.Collection('links'); diff --git a/tools/static-assets/skel-svelte/imports/ui/App.svelte b/tools/static-assets/skel-svelte/imports/ui/App.svelte index 2456b485bd..147a9e2f97 100644 --- a/tools/static-assets/skel-svelte/imports/ui/App.svelte +++ b/tools/static-assets/skel-svelte/imports/ui/App.svelte @@ -1,18 +1,20 @@ - @@ -33,7 +35,4 @@ {:else}
Loading ...
{/if} - -

Typescript ready

-

Just add lang="ts" to .svelte components.

From 8379f4ac14173b9e37ec7966cb8a690822f8c760 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 13 Dec 2022 14:43:19 -0300 Subject: [PATCH 09/45] chore: updated node version --- scripts/build-dev-bundle-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index ef6013c4e5..6928825c20 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -5,7 +5,7 @@ set -u UNAME=$(uname) ARCH=$(uname -m) -NODE_VERSION=14.21.1 +NODE_VERSION=14.21.2 MONGO_VERSION_64BIT=5.0.5 MONGO_VERSION_32BIT=3.2.22 NPM_VERSION=6.14.17 From f279e55bb2b6bab2a531c9adb268299202de90f5 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 13 Dec 2022 14:43:29 -0300 Subject: [PATCH 10/45] bump to node 14.21.2 --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index be2307e734..70956fb22d 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=14.21.1.4 +BUNDLE_VERSION=14.21.2.0 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 6c8db261472690692be7d32517866cae4183bfb4 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 13 Dec 2022 15:39:33 -0300 Subject: [PATCH 11/45] revert 524360bb40 --- .../skel-svelte/imports/api/links.js | 3 +++ .../skel-svelte/imports/api/links.ts | 9 --------- .../skel-svelte/imports/ui/App.svelte | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 17 deletions(-) create mode 100644 tools/static-assets/skel-svelte/imports/api/links.js delete mode 100644 tools/static-assets/skel-svelte/imports/api/links.ts diff --git a/tools/static-assets/skel-svelte/imports/api/links.js b/tools/static-assets/skel-svelte/imports/api/links.js new file mode 100644 index 0000000000..050c508eae --- /dev/null +++ b/tools/static-assets/skel-svelte/imports/api/links.js @@ -0,0 +1,3 @@ +import { Mongo } from 'meteor/mongo'; + +export const LinksCollection = new Mongo.Collection('links'); diff --git a/tools/static-assets/skel-svelte/imports/api/links.ts b/tools/static-assets/skel-svelte/imports/api/links.ts deleted file mode 100644 index 291d640b9b..0000000000 --- a/tools/static-assets/skel-svelte/imports/api/links.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Mongo } from 'meteor/mongo'; - -export interface Link { - _id: string; - url: string; - title: string; -} - -export const LinksCollection = new Mongo.Collection('links'); diff --git a/tools/static-assets/skel-svelte/imports/ui/App.svelte b/tools/static-assets/skel-svelte/imports/ui/App.svelte index 147a9e2f97..d64c1297ee 100644 --- a/tools/static-assets/skel-svelte/imports/ui/App.svelte +++ b/tools/static-assets/skel-svelte/imports/ui/App.svelte @@ -1,20 +1,20 @@ - @@ -33,6 +33,8 @@ {/each} {:else} -
Loading ...
+
Loading ...
{/if} +

Typescript ready

+

Just add lang="ts" to .svelte components.

From cde0d0998ec31c0492321188e2ac356242162625 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 13 Dec 2022 15:49:22 -0300 Subject: [PATCH 12/45] =?UTF-8?q?Meteor=20version=20to=202.9.1-beta.0?= =?UTF-8?q?=C2=A0:comet:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fetch/package.js | 2 +- packages/meteor/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fetch/package.js b/packages/fetch/package.js index 5648235dac..79eec048f2 100644 --- a/packages/fetch/package.js +++ b/packages/fetch/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "fetch", - version: '0.1.2', + version: '0.1.3-beta.0', summary: "Isomorphic modern/legacy/Node polyfill for WHATWG fetch()", documentation: "README.md" }); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 839475f713..7022a02698 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.10.3' + version: '1.10.4-beta.0' }); Package.registerBuildPlugin({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index acce35a806..c826e4b54d 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.9.0", + "version": "2.9.1.beta.0", "recommended": false, "official": false, "description": "Meteor experimental release" From 782b3d12a3dc81924d118eb5c44f1a0a7c484449 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba <70247653+Grubba27@users.noreply.github.com> Date: Tue, 13 Dec 2022 17:02:02 -0300 Subject: [PATCH 13/45] Update _config.yml --- docs/_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/_config.yml b/docs/_config.yml index 7a70499147..1bd31f0460 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,6 +1,7 @@ title: Meteor API Docs subtitle: API Docs versions: + - '2.9' - '2.8' - '2.7' - '2.6' From 89fbfa5bf139e06d7cde97a590f3bbcb89702de5 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 13 Dec 2022 17:16:00 -0300 Subject: [PATCH 14/45] Meteor version to 2.9.1-beta.0 :comet: --- packages/meteor-tool/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index bafb59a62e..ee4b6a75b8 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'The Meteor command-line tool', - version: '2.9.0', + version: '2.9.1-beta.0', }); Package.includeTool(); From c16f3df846f91564bea3553f5aabdf0d39f65b7f Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 14 Dec 2022 10:48:24 -0300 Subject: [PATCH 15/45] tests: trying to make ci pass --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 70956fb22d..3f9ee0af69 100755 --- a/meteor +++ b/meteor @@ -146,5 +146,5 @@ fi exec "$DEV_BUNDLE/bin/node" \ --max-old-space-size=4096 \ --no-wasm-code-gc \ - ${TOOL_NODE_FLAGS} \ + "${TOOL_NODE_FLAGS}" \ "$METEOR" "$@" From 36702ee1c3eb153818439015241543fa4fdf9ab1 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 14 Dec 2022 10:50:26 -0300 Subject: [PATCH 16/45] revert c16f3df846 --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 3f9ee0af69..70956fb22d 100755 --- a/meteor +++ b/meteor @@ -146,5 +146,5 @@ fi exec "$DEV_BUNDLE/bin/node" \ --max-old-space-size=4096 \ --no-wasm-code-gc \ - "${TOOL_NODE_FLAGS}" \ + ${TOOL_NODE_FLAGS} \ "$METEOR" "$@" From fa8387c1c23838bcc1270157495bf86ba2295903 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 14 Dec 2022 11:41:41 -0300 Subject: [PATCH 17/45] test: making the ci pass again --- tools/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/index.js b/tools/index.js index 6522c41c3d..8fb6686582 100644 --- a/tools/index.js +++ b/tools/index.js @@ -13,7 +13,7 @@ require("./cli/dev-bundle-bin-commands.js").then(function (child) { throw error; }); }); - +process.env.DISABLE_FIBERS = process.env.DISABLE_FIBERS || 0; function continueSetup() { // Set up the Babel transpiler require('./tool-env/install-babel.js'); From 0d5ddb0af2382889b31bb2949c6742da56c95bf2 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 14 Dec 2022 12:02:48 -0300 Subject: [PATCH 18/45] Revert "test: making the ci pass again" This reverts commit fa8387c1c23838bcc1270157495bf86ba2295903. --- tools/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/index.js b/tools/index.js index 8fb6686582..6522c41c3d 100644 --- a/tools/index.js +++ b/tools/index.js @@ -13,7 +13,7 @@ require("./cli/dev-bundle-bin-commands.js").then(function (child) { throw error; }); }); -process.env.DISABLE_FIBERS = process.env.DISABLE_FIBERS || 0; + function continueSetup() { // Set up the Babel transpiler require('./tool-env/install-babel.js'); From b82942d33605ce586fb675952213cc501f8a94ee Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 14 Dec 2022 16:31:17 -0300 Subject: [PATCH 19/45] chore: update on dev bundle --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 70956fb22d..24d2dbb783 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=14.21.2.0 +BUNDLE_VERSION=14.21.2.1 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 34940db7c6a947c576cec831d69b95f226d4db10 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 14 Dec 2022 20:00:31 -0300 Subject: [PATCH 20/45] Docs: updated 2.9.1 changelog --- docs/history.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/docs/history.md b/docs/history.md index 2c41408d65..47cd81e0a3 100644 --- a/docs/history.md +++ b/docs/history.md @@ -1,3 +1,43 @@ +## v2.9.1, 2022-XX-XX + +### Highlights + +* Reverted missing types [PR](https://github.com/meteor/meteor/pull/12366) by [Grubba27](https://github.com/Grubba27). +* Fix fetch() type declaration [PR](https://github.com/meteor/meteor/pull/12352) by [zarvox](https://github.com/zarvox). +* update svelte skeleton [PR](https://github.com/meteor/meteor/pull/12350) by [tosinek](https://github.com/tosinek). +* Bump to node 14.21.2.0 [PR](https://github.com/meteor/meteor/pull/12370) by [Grubba27](https://github.com/Grubba27). + +#### Breaking Changes + +N/A + +#### Internal API changes + +N/A + +#### Migration Steps + +N/a + +#### Meteor Version Release + +* `fetch@0.1.3`: + - Updated fetch type definition. +* `fetch@1.10.4: + - Added back meteor type definitions that were removed by mistake in earlier version. + +* `Comand line`: + - Updated Svelte skeleton to now be able to support typescript out of the box and some idioms to the skeleton + - Updated node to 14.21.2 changes can be seen [here](https://github.com/nodejs/node/releases/tag/v14.21.2) + - +#### Special thanks to +- [@zarvox](https://github.com/zarvox). +- [@tosinek](https://github.com/tosinek). +- [@Grubba27](https://github.com/Grubba27). + +For making this great framework even better! + + ## v2.9, 2022-12-12 ### Highlights From dfaf5aebf0732ce524b8a5d18401c2403cbe7096 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 14 Dec 2022 20:07:05 -0300 Subject: [PATCH 21/45] Meteor version to 2.9.1-beta.1 :comet: --- packages/fetch/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fetch/package.js b/packages/fetch/package.js index 79eec048f2..e65ca62183 100644 --- a/packages/fetch/package.js +++ b/packages/fetch/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "fetch", - version: '0.1.3-beta.0', + version: '0.1.3-beta291.1', summary: "Isomorphic modern/legacy/Node polyfill for WHATWG fetch()", documentation: "README.md" }); diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index ee4b6a75b8..d242083410 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'The Meteor command-line tool', - version: '2.9.1-beta.0', + version: '2.9.1-beta.1', }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 7022a02698..d589702138 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.10.4-beta.0' + version: '1.10.4-beta291.1' }); Package.registerBuildPlugin({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index c826e4b54d..9ad4808c2c 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.9.1.beta.0", + "version": "2.9.1.beta.1", "recommended": false, "official": false, "description": "Meteor experimental release" From 5eb91aab9f8628b27a9671c53764d620ecc19db8 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Thu, 15 Dec 2022 11:33:58 -0300 Subject: [PATCH 22/45] Meteor version to 2.9.1-beta.2 :comet: --- packages/fetch/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fetch/package.js b/packages/fetch/package.js index e65ca62183..ba6933af1a 100644 --- a/packages/fetch/package.js +++ b/packages/fetch/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "fetch", - version: '0.1.3-beta291.1', + version: '0.1.3-beta291.2', summary: "Isomorphic modern/legacy/Node polyfill for WHATWG fetch()", documentation: "README.md" }); diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index d242083410..d569d4ae7a 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'The Meteor command-line tool', - version: '2.9.1-beta.1', + version: '2.9.1-beta.2', }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index d589702138..cadc5f247b 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.10.4-beta291.1' + version: '1.10.4-beta291.2' }); Package.registerBuildPlugin({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 9ad4808c2c..6ff8224d31 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.9.1.beta.1", + "version": "2.9.1.beta.2", "recommended": false, "official": false, "description": "Meteor experimental release" From c9ee57ceb0bcdb3ca33a079ff67f5b8ddc83cc7c Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Thu, 15 Dec 2022 12:11:02 -0300 Subject: [PATCH 23/45] Meteor version to 2.9.1-beta.3 :comet: --- packages/fetch/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fetch/package.js b/packages/fetch/package.js index ba6933af1a..86050aff48 100644 --- a/packages/fetch/package.js +++ b/packages/fetch/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "fetch", - version: '0.1.3-beta291.2', + version: '0.1.3-beta291.3', summary: "Isomorphic modern/legacy/Node polyfill for WHATWG fetch()", documentation: "README.md" }); diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index d569d4ae7a..bdc73e3b68 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'The Meteor command-line tool', - version: '2.9.1-beta.2', + version: '2.9.1-beta.3', }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index cadc5f247b..ad76232d21 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.10.4-beta291.2' + version: '1.10.4-beta291.3' }); Package.registerBuildPlugin({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 6ff8224d31..3de04c2a36 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.9.1.beta.2", + "version": "2.9.1-beta.3", "recommended": false, "official": false, "description": "Meteor experimental release" From 24d87e19b22ba717d88b71cacd60fbd2d2bf1b9d Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Thu, 15 Dec 2022 12:55:33 -0300 Subject: [PATCH 24/45] updated chmod From 8cc18f8897f1c0b792ea5bc26e3dbfdde6e61ea5 Mon Sep 17 00:00:00 2001 From: denihs Date: Fri, 16 Dec 2022 15:05:29 -0400 Subject: [PATCH 25/45] chore: changing the methods resetPassword and verifyEmail to no longer sign in the user automatically if they have 2fa enabled --- docs/history.md | 4 +++- docs/source/api/passwords.md | 7 ++++++ packages/accounts-password/package.js | 2 +- packages/accounts-password/password_client.js | 4 ++-- packages/accounts-password/password_server.js | 22 +++++++++++++++++++ 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/docs/history.md b/docs/history.md index 47cd81e0a3..4f25ea7ea0 100644 --- a/docs/history.md +++ b/docs/history.md @@ -9,7 +9,9 @@ #### Breaking Changes -N/A +* `accounts-password@2.3.3` + - The methods `resetPassword` and `verifyEmail` no longer logs the user if they have 2FA enabled. Now, the functions work as before, but instead of automatically logging in the user at the end, an error with the code `2fa-enabled` will be thrown. + #### Internal API changes diff --git a/docs/source/api/passwords.md b/docs/source/api/passwords.md index 49bcff2e6d..a1967e174e 100644 --- a/docs/source/api/passwords.md +++ b/docs/source/api/passwords.md @@ -59,6 +59,10 @@ email with a link the user can use to verify their email address. {% apibox "Accounts.verifyEmail" %} +If the user trying to verify the email has 2FA enabled, this error will be thrown: +* "Email verified, but user not logged in because 2FA is enabled [2fa-enabled]": No longer signing in the user automatically if the user has 2FA enabled. + + This function accepts tokens passed into the callback registered with [`Accounts.onEmailVerificationLink`](#Accounts-onEmailVerificationLink). @@ -89,6 +93,9 @@ This function accepts tokens passed into the callbacks registered with [`AccountsClient#onResetPasswordLink`](#Accounts-onResetPasswordLink) and [`Accounts.onEnrollmentLink`](#Accounts-onEnrollmentLink). +If the user trying to reset the password has 2FA enabled, this error will be thrown: +* "Changed password, but user not logged in because 2FA is enabled [2fa-enabled]": No longer signing in the user automatically if the user has 2FA enabled. + {% apibox "Accounts.setPassword" %} {% apibox "Accounts.sendResetPasswordEmail" %} diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index 719191d8dc..ecf98e10ba 100644 --- a/packages/accounts-password/package.js +++ b/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: '2.3.2', + version: '2.3.3-beta291.3', }); Npm.depends({ diff --git a/packages/accounts-password/password_client.js b/packages/accounts-password/password_client.js index 30d3b49450..a55609919e 100644 --- a/packages/accounts-password/password_client.js +++ b/packages/accounts-password/password_client.js @@ -201,7 +201,7 @@ Accounts.forgotPassword = (options, callback) => { // @param callback (optional) {Function(error|undefined)} /** - * @summary Reset the password for a user using a token received in email. Logs the user in afterwards. + * @summary Reset the password for a user using a token received in email. Logs the user in afterwards if the user doesn't have 2FA enabled. * @locus Client * @param {String} token The token retrieved from the reset password URL. * @param {String} newPassword A new password for the user. This is __not__ sent in plain text over the wire. @@ -234,7 +234,7 @@ Accounts.resetPassword = (token, newPassword, callback) => { // @param callback (optional) {Function(error|undefined)} /** - * @summary Marks the user's email address as verified. Logs the user in afterwards. + * @summary Marks the user's email address as verified. Logs the user in afterwards if the user doesn't have 2FA enabled. * @locus Client * @param {String} token The token retrieved from the verification URL. * @param {Function} [callback] Optional callback. Called with no arguments on success, or with a single `Error` argument on failure. diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js index c44be77f66..198b7a9c34 100644 --- a/packages/accounts-password/password_server.js +++ b/packages/accounts-password/password_server.js @@ -687,6 +687,17 @@ Meteor.methods({resetPassword: async function (...args) { // password should invalidate existing sessions). Accounts._clearAllLoginTokens(user._id); + if (Accounts._check2faEnabled?.(user)) { + return { + userId: user._id, + error: Accounts._handleError( + 'Changed password, but user not logged in because 2FA is enabled', + false, + '2fa-enabled' + ), + }; + } + return {userId: user._id}; } ); @@ -778,6 +789,17 @@ Meteor.methods({verifyEmail: async function (...args) { {$set: {'emails.$.verified': true}, $pull: {'services.email.verificationTokens': {address: tokenRecord.address}}}); + if (Accounts._check2faEnabled?.(user)) { + return { + userId: user._id, + error: Accounts._handleError( + 'Email verified, but user not logged in because 2FA is enabled', + false, + '2fa-enabled' + ), + }; + } + return {userId: user._id}; } ); From 40dfd2edbc3711093e0c4b0455f1ca35cd0e2970 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 14:38:37 -0300 Subject: [PATCH 26/45] chore: added permissions to run meteor script --- meteor | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 meteor diff --git a/meteor b/meteor old mode 100644 new mode 100755 From 7778e74a735b6fec2df98fceb360c60e9efdbb93 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 14:38:50 -0300 Subject: [PATCH 27/45] chore: added permissions to run meteor script --- meteor | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 meteor diff --git a/meteor b/meteor old mode 100755 new mode 100644 From 89dab6e8de0535159900c10d568245740a8ef759 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 14:38:57 -0300 Subject: [PATCH 28/45] chore: added permissions to run meteor script --- meteor | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 meteor diff --git a/meteor b/meteor old mode 100644 new mode 100755 From a0d76557b183d4b3555aee554f0592da12a4f728 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 14:39:10 -0300 Subject: [PATCH 29/45] "chore: added permissions to run meteor script" --- meteor | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 meteor diff --git a/meteor b/meteor old mode 100755 new mode 100644 From b73b31404ae9c9d6e9c138047b93bd37521884bd Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 14:43:30 -0300 Subject: [PATCH 30/45] chore: added permissions to run meteor script --- meteor | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 meteor diff --git a/meteor b/meteor old mode 100644 new mode 100755 From d733351f04ca37616eab0d70dec20c91def119b0 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 14:43:40 -0300 Subject: [PATCH 31/45] "chore: added permissions to run meteor script" --- meteor | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 meteor diff --git a/meteor b/meteor old mode 100755 new mode 100644 From 190e396958e9ffbe8adc560828118fb948797829 Mon Sep 17 00:00:00 2001 From: denihs Date: Mon, 19 Dec 2022 13:44:29 -0400 Subject: [PATCH 32/45] Changing meteor file permissions --- meteor | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 meteor diff --git a/meteor b/meteor old mode 100644 new mode 100755 From 7ee47054fd3547f658cb0089d537c38e3a657e44 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 15:24:30 -0300 Subject: [PATCH 33/45] doc: updated 2.9.1 docs --- docs/history.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/history.md b/docs/history.md index 4f25ea7ea0..912c968c79 100644 --- a/docs/history.md +++ b/docs/history.md @@ -6,7 +6,8 @@ * Fix fetch() type declaration [PR](https://github.com/meteor/meteor/pull/12352) by [zarvox](https://github.com/zarvox). * update svelte skeleton [PR](https://github.com/meteor/meteor/pull/12350) by [tosinek](https://github.com/tosinek). * Bump to node 14.21.2.0 [PR](https://github.com/meteor/meteor/pull/12370) by [Grubba27](https://github.com/Grubba27). - +* resetPassword and verifyEmail to no longer sign in the user automatically [PR](https://github.com/meteor/meteor/pull/12385) by [denihs](https://github.com/denihs). +* #### Breaking Changes * `accounts-password@2.3.3` @@ -25,9 +26,13 @@ N/a * `fetch@0.1.3`: - Updated fetch type definition. + * `fetch@1.10.4: - Added back meteor type definitions that were removed by mistake in earlier version. +* `accounts-password@2.3.3` + - The methods `resetPassword` and `verifyEmail` no longer logs the user if they have 2FA enabled. Now, the functions work as before, but instead of automatically logging in the user at the end, an error with the code `2fa-enabled` will be thrown. + * `Comand line`: - Updated Svelte skeleton to now be able to support typescript out of the box and some idioms to the skeleton - Updated node to 14.21.2 changes can be seen [here](https://github.com/nodejs/node/releases/tag/v14.21.2) @@ -36,6 +41,7 @@ N/a - [@zarvox](https://github.com/zarvox). - [@tosinek](https://github.com/tosinek). - [@Grubba27](https://github.com/Grubba27). +- [@denihs](https://github.com/denihs) For making this great framework even better! From 2660146d37629fa8ddde9833b5ce640714f139ae Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 15:39:27 -0300 Subject: [PATCH 34/45] Chore: update dev-bundle with devel --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 386ea5693b..1146deb2ff 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=14.21.2.1 +BUNDLE_VERSION=14.21.2.2 # OS Check. Put here because here is where we download the precompiled From 986de31ccbbc5ddfe7e1caef92569d282d424d8c Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 16:56:06 -0300 Subject: [PATCH 35/45] Meteor version to 2.9.1-beta.4 :comet: --- packages/accounts-password/package.js | 2 +- packages/fetch/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index ecf98e10ba..4a101f7ff6 100644 --- a/packages/accounts-password/package.js +++ b/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: '2.3.3-beta291.3', + version: '2.3.3-beta291.4', }); Npm.depends({ diff --git a/packages/fetch/package.js b/packages/fetch/package.js index 86050aff48..0b52838105 100644 --- a/packages/fetch/package.js +++ b/packages/fetch/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "fetch", - version: '0.1.3-beta291.3', + version: '0.1.3-beta291.4', summary: "Isomorphic modern/legacy/Node polyfill for WHATWG fetch()", documentation: "README.md" }); diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index bdc73e3b68..9d8ac5e94b 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'The Meteor command-line tool', - version: '2.9.1-beta.3', + version: '2.9.1-beta.4', }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index ad76232d21..711be04d7e 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.10.4-beta291.3' + version: '1.10.4-beta291.4' }); Package.registerBuildPlugin({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 3de04c2a36..8031905a03 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.9.1-beta.3", + "version": "2.9.1-beta.4", "recommended": false, "official": false, "description": "Meteor experimental release" From 1a8e3179668259e46630c9da09f7449417a729e9 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 19 Dec 2022 17:06:14 -0300 Subject: [PATCH 36/45] chore: updated will publish text to show version as well for better understatind --- tools/cli/commands-packages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js index 6a5c4d071c..9f26b97089 100644 --- a/tools/cli/commands-packages.js +++ b/tools/cli/commands-packages.js @@ -927,7 +927,7 @@ main.registerCommand({ return; } toPublish.push(packageName); - Console.info("Will publish new version for " + packageName); + Console.info(`Will publish new version for ${ packageName }: ${ packageSource.version }`); return; } else { var isopk = projectContext.isopackCache.getIsopack(packageName); From 3fd99a4c169c6496255a23cfb8510ee90535d69a Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 21 Dec 2022 14:17:04 -0300 Subject: [PATCH 37/45] fix: missing vue2 declaration --- tools/cli/commands.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/cli/commands.js b/tools/cli/commands.js index 22ffdebaeb..2467f05879 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -521,6 +521,7 @@ export const AVAILABLE_SKELETONS = [ DEFAULT_SKELETON, "typescript", "vue", + 'vue-2', "svelte", "tailwind", "chakra-ui", From 82b040762616128db9209222f3dd1f51c004c69f Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 21 Dec 2022 14:25:40 -0300 Subject: [PATCH 38/45] docs: updated 2.9.1 docs --- docs/history.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/history.md b/docs/history.md index 912c968c79..42e99c987a 100644 --- a/docs/history.md +++ b/docs/history.md @@ -7,7 +7,8 @@ * update svelte skeleton [PR](https://github.com/meteor/meteor/pull/12350) by [tosinek](https://github.com/tosinek). * Bump to node 14.21.2.0 [PR](https://github.com/meteor/meteor/pull/12370) by [Grubba27](https://github.com/Grubba27). * resetPassword and verifyEmail to no longer sign in the user automatically [PR](https://github.com/meteor/meteor/pull/12385) by [denihs](https://github.com/denihs). -* +* Added missing vue2 declaration for skeletons [PR](https://github.com/meteor/meteor/pull/12396) by [Grubba27](https://github.com/Grubba27) & [planning](https://github.com/mlanning) + #### Breaking Changes * `accounts-password@2.3.3` @@ -33,16 +34,16 @@ N/a * `accounts-password@2.3.3` - The methods `resetPassword` and `verifyEmail` no longer logs the user if they have 2FA enabled. Now, the functions work as before, but instead of automatically logging in the user at the end, an error with the code `2fa-enabled` will be thrown. -* `Comand line`: +* `Command line`: - Updated Svelte skeleton to now be able to support typescript out of the box and some idioms to the skeleton - Updated node to 14.21.2 changes can be seen [here](https://github.com/nodejs/node/releases/tag/v14.21.2) - - + - Solved [issue](https://github.com/meteor/meteor/issues/12395) that could not allow vue2 apps being created in command line #### Special thanks to - [@zarvox](https://github.com/zarvox). - [@tosinek](https://github.com/tosinek). - [@Grubba27](https://github.com/Grubba27). - [@denihs](https://github.com/denihs) - +- [mlanning](https://github.com/mlanning) For making this great framework even better! From f094515825c30771359f8245e713a8dd123ace79 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Thu, 22 Dec 2022 10:28:48 -0300 Subject: [PATCH 39/45] Meteor version to 2.9.1-rc.0 :comet: --- packages/accounts-password/package.js | 2 +- packages/fetch/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index 4a101f7ff6..f93bca9c7c 100644 --- a/packages/accounts-password/package.js +++ b/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: '2.3.3-beta291.4', + version: '2.3.3-rc291.0', }); Npm.depends({ diff --git a/packages/fetch/package.js b/packages/fetch/package.js index 0b52838105..b868b2df94 100644 --- a/packages/fetch/package.js +++ b/packages/fetch/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "fetch", - version: '0.1.3-beta291.4', + version: '0.1.3-rc291.0', summary: "Isomorphic modern/legacy/Node polyfill for WHATWG fetch()", documentation: "README.md" }); diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 9d8ac5e94b..a252d11ff3 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'The Meteor command-line tool', - version: '2.9.1-beta.4', + version: '2.9.1-rc.0', }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 711be04d7e..75067dae3b 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.10.4-beta291.4' + version: '1.10.4-rc291.0' }); Package.registerBuildPlugin({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 8031905a03..7a18f6f0ef 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.9.1-beta.4", + "version": "2.9.1-rc.0", "recommended": false, "official": false, "description": "Meteor experimental release" From 2be640693740f9852d61a4782b86c4ac0ad9126e Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 27 Dec 2022 13:37:06 -0300 Subject: [PATCH 40/45] docs: updated 2.9.1 docs --- docs/history.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/history.md b/docs/history.md index 42e99c987a..e18f1b1981 100644 --- a/docs/history.md +++ b/docs/history.md @@ -1,4 +1,4 @@ -## v2.9.1, 2022-XX-XX +## v2.9.1, 2022-12-27 ### Highlights @@ -7,7 +7,7 @@ * update svelte skeleton [PR](https://github.com/meteor/meteor/pull/12350) by [tosinek](https://github.com/tosinek). * Bump to node 14.21.2.0 [PR](https://github.com/meteor/meteor/pull/12370) by [Grubba27](https://github.com/Grubba27). * resetPassword and verifyEmail to no longer sign in the user automatically [PR](https://github.com/meteor/meteor/pull/12385) by [denihs](https://github.com/denihs). -* Added missing vue2 declaration for skeletons [PR](https://github.com/meteor/meteor/pull/12396) by [Grubba27](https://github.com/Grubba27) & [planning](https://github.com/mlanning) +* Added missing vue2 declaration for skeletons [PR](https://github.com/meteor/meteor/pull/12396) by [Grubba27](https://github.com/Grubba27) & [mlanning](https://github.com/mlanning) #### Breaking Changes @@ -21,14 +21,14 @@ N/A #### Migration Steps -N/a +N/A #### Meteor Version Release * `fetch@0.1.3`: - Updated fetch type definition. -* `fetch@1.10.4: +* `meteor@1.10.4`: - Added back meteor type definitions that were removed by mistake in earlier version. * `accounts-password@2.3.3` @@ -38,12 +38,14 @@ N/a - Updated Svelte skeleton to now be able to support typescript out of the box and some idioms to the skeleton - Updated node to 14.21.2 changes can be seen [here](https://github.com/nodejs/node/releases/tag/v14.21.2) - Solved [issue](https://github.com/meteor/meteor/issues/12395) that could not allow vue2 apps being created in command line + #### Special thanks to - [@zarvox](https://github.com/zarvox). - [@tosinek](https://github.com/tosinek). - [@Grubba27](https://github.com/Grubba27). -- [@denihs](https://github.com/denihs) -- [mlanning](https://github.com/mlanning) +- [@denihs](https://github.com/denihs). +- [@mlanning](https://github.com/mlanning). + For making this great framework even better! From 0d9abe8b75c3477e22d13594ac4bbc10a2ecb7cf Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 27 Dec 2022 13:39:40 -0300 Subject: [PATCH 41/45] docs: updated unclear definitions --- docs/history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/history.md b/docs/history.md index db5f6cdd85..25430a93e5 100644 --- a/docs/history.md +++ b/docs/history.md @@ -35,7 +35,7 @@ N/A - The methods `resetPassword` and `verifyEmail` no longer logs the user if they have 2FA enabled. Now, the functions work as before, but instead of automatically logging in the user at the end, an error with the code `2fa-enabled` will be thrown. * `Command line`: - - Updated Svelte skeleton to now be able to support typescript out of the box and some idioms to the skeleton + - Updated Svelte skeleton to now be able to support typescript out of the box and added ``#each`` in links in the skeleton. - Updated node to 14.21.2 changes can be seen [here](https://github.com/nodejs/node/releases/tag/v14.21.2) - Solved [issue](https://github.com/meteor/meteor/issues/12395) that could not allow vue2 apps being created in command line From 67ba2f65a6619b1a38ecf42bf2816e0d811e2ef5 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 27 Dec 2022 13:43:35 -0300 Subject: [PATCH 42/45] docs: added missing ponctuation in history.md --- docs/history.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/history.md b/docs/history.md index 25430a93e5..6a845af21d 100644 --- a/docs/history.md +++ b/docs/history.md @@ -7,7 +7,7 @@ * update svelte skeleton [PR](https://github.com/meteor/meteor/pull/12350) by [tosinek](https://github.com/tosinek). * Bump to node 14.21.2.0 [PR](https://github.com/meteor/meteor/pull/12370) by [Grubba27](https://github.com/Grubba27). * resetPassword and verifyEmail to no longer sign in the user automatically [PR](https://github.com/meteor/meteor/pull/12385) by [denihs](https://github.com/denihs). -* Added missing vue2 declaration for skeletons [PR](https://github.com/meteor/meteor/pull/12396) by [Grubba27](https://github.com/Grubba27) & [mlanning](https://github.com/mlanning) +* Added missing vue2 declaration for skeletons [PR](https://github.com/meteor/meteor/pull/12396) by [Grubba27](https://github.com/Grubba27) & [mlanning](https://github.com/mlanning). #### Breaking Changes @@ -36,8 +36,8 @@ N/A * `Command line`: - Updated Svelte skeleton to now be able to support typescript out of the box and added ``#each`` in links in the skeleton. - - Updated node to 14.21.2 changes can be seen [here](https://github.com/nodejs/node/releases/tag/v14.21.2) - - Solved [issue](https://github.com/meteor/meteor/issues/12395) that could not allow vue2 apps being created in command line + - Updated node to 14.21.2 changes can be seen [here](https://github.com/nodejs/node/releases/tag/v14.21.2). + - Solved [issue](https://github.com/meteor/meteor/issues/12395) that could not allow vue2 apps being created in command line. #### Special thanks to - [@zarvox](https://github.com/zarvox). From bc3d27e022c8363b6293bc73725aa38b8915f560 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 27 Dec 2022 13:59:41 -0300 Subject: [PATCH 43/45] Meteor version to 2.9.1 :comet: --- packages/accounts-password/package.js | 2 +- packages/fetch/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- scripts/admin/meteor-release-official.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index f93bca9c7c..2b23a6373d 100644 --- a/packages/accounts-password/package.js +++ b/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: '2.3.3-rc291.0', + version: '2.3.3', }); Npm.depends({ diff --git a/packages/fetch/package.js b/packages/fetch/package.js index b868b2df94..1d13e505d5 100644 --- a/packages/fetch/package.js +++ b/packages/fetch/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "fetch", - version: '0.1.3-rc291.0', + version: '0.1.3', summary: "Isomorphic modern/legacy/Node polyfill for WHATWG fetch()", documentation: "README.md" }); diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index a252d11ff3..e31fcbacf3 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'The Meteor command-line tool', - version: '2.9.1-rc.0', + version: '2.9.1', }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 75067dae3b..9056fec7d6 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.10.4-rc291.0' + version: '1.10.4' }); Package.registerBuildPlugin({ diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json index 27a0c865e4..2920330372 100644 --- a/scripts/admin/meteor-release-official.json +++ b/scripts/admin/meteor-release-official.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.9.0", + "version": "2.9.1", "recommended": false, "official": true, "description": "The Official Meteor Distribution" From aaefcc9abf3375873e902174ee55acba52350e15 Mon Sep 17 00:00:00 2001 From: Tim Gates Date: Fri, 30 Dec 2022 11:24:39 +1100 Subject: [PATCH 44/45] docs: Fix a few typos There are small typos in: - docs/source/commandline.md - tools/isobuild/compiler-deprecated-compile-step.js - tools/utils/buildmessage.js Fixes: - Should read `libraries` rather than `libaries`. - Should read `file name` rather than `filenanme`. - Should read `compatibility` rather than `compitability`. Signed-off-by: Tim Gates --- docs/source/commandline.md | 2 +- tools/isobuild/compiler-deprecated-compile-step.js | 2 +- tools/utils/buildmessage.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/commandline.md b/docs/source/commandline.md index a3a242df17..db994e03e1 100644 --- a/docs/source/commandline.md +++ b/docs/source/commandline.md @@ -926,7 +926,7 @@ from npm to your `node_modules` directory and save its usage in your Using the `meteor npm ...` commands in place of traditional `npm ...` commands is particularly important when using Node.js modules that have binary dependencies that make native C calls (like [`bcrypt`](https://www.npmjs.com/package/bcrypt)) -because doing so ensures that they are built using the same libaries. +because doing so ensures that they are built using the same libraries. Additionally, this access to the npm that comes with Meteor avoids the need to download and install npm separately. diff --git a/tools/isobuild/compiler-deprecated-compile-step.js b/tools/isobuild/compiler-deprecated-compile-step.js index fe3b9c76c8..0fad0c671d 100644 --- a/tools/isobuild/compiler-deprecated-compile-step.js +++ b/tools/isobuild/compiler-deprecated-compile-step.js @@ -1,7 +1,7 @@ // This file contains an old definition of CompileStep, an object that is passed // to the package-provided file handler. // Since then, the newer API called "Batch Plugins" have replaced it but we keep -// the functionality for the backwards-compitability. +// the functionality for the backwards-compatibility. // @deprecated // XXX COMPAT WITH 1.1.0.2 diff --git a/tools/utils/buildmessage.js b/tools/utils/buildmessage.js index 0d468624c1..48cbec19c4 100644 --- a/tools/utils/buildmessage.js +++ b/tools/utils/buildmessage.js @@ -75,7 +75,7 @@ Object.assign(Job.prototype, { } line += ": "; } else { - // not sure how to display messages without a filenanme.. try this? + // not sure how to display messages without a file name.. try this? line += "error: "; } // XXX line wrapping would be nice.. From 5e0331a7b71f76850182ef73fcdfdbd7189276db Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 4 Jan 2023 13:33:45 -0300 Subject: [PATCH 45/45] Meteor version to 2.9.1 :comet: --- npm-packages/meteor-installer/README.md | 2 ++ npm-packages/meteor-installer/config.js | 2 +- npm-packages/meteor-installer/package.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/npm-packages/meteor-installer/README.md b/npm-packages/meteor-installer/README.md index 91ad13de8f..54dc2a47b1 100644 --- a/npm-packages/meteor-installer/README.md +++ b/npm-packages/meteor-installer/README.md @@ -14,6 +14,8 @@ npm install -g meteor | NPM Package | Meteor Official Release | |-------------|-------------------------| +| 2.9.1 | 2.9.1 | +| 2.9.0 | 2.9.0 | | 2.8.2 | 2.8.1 | | 2.8.1 | 2.8.1 | | 2.8.0 | 2.8.0 | diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index fcae57bcec..4c2e1ac925 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -1,7 +1,7 @@ const path = require('path'); const os = require('os'); -const METEOR_LATEST_VERSION = '2.9.0'; +const METEOR_LATEST_VERSION = '2.9.1'; const sudoUser = process.env.SUDO_USER || ''; function isRoot() { return process.getuid && process.getuid() === 0; diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json index 53d344ef33..af52942de4 100644 --- a/npm-packages/meteor-installer/package.json +++ b/npm-packages/meteor-installer/package.json @@ -1,6 +1,6 @@ { "name": "meteor", - "version": "2.9.0", + "version": "2.9.1", "description": "Install Meteor", "main": "install.js", "scripts": {