From 26a7add53fa872269144593fb2632a4ad55330ac Mon Sep 17 00:00:00 2001 From: denihs Date: Wed, 9 Oct 2024 14:41:24 -0400 Subject: [PATCH 1/6] Meteor version to 3.0.4-rc.0 :comet: --- packages/accounts-base/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/check/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/modules/package.js | 2 +- packages/non-core/bundle-visualizer/package.js | 2 +- packages/non-core/mongo-decimal/package.js | 2 +- packages/static-html-tools/package.js | 2 +- packages/static-html/package.js | 4 ++-- packages/url/package.js | 2 +- packages/webapp/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 49e16a3c21..f6ff5c3842 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "3.0.3-beta304.0", + version: "3.0.3-rc304.0", }); Package.onUse((api) => { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 5d64a2bf71..53008752b5 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-compiler", summary: "Parser/transpiler for ECMAScript 2015+ syntax", - version: '7.11.1-beta304.0', + version: '7.11.1-rc304.0', }); Npm.depends({ diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 2fa93b9e31..7a4c370ee9 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '2.0.1-beta304.0', + version: '2.0.1-rc304.0', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/check/package.js b/packages/check/package.js index 1dabaf3b69..609dd3fa7a 100644 --- a/packages/check/package.js +++ b/packages/check/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Check whether a value matches a pattern', - version: '1.4.4-beta304.0', + version: '1.4.4-rc304.0', }); Package.onUse(api => { diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 545be4f6ac..68f5f619d6 100644 --- a/packages/ddp-client/package.js +++ b/packages/ddp-client/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data client", - version: "3.0.2-beta304.0", + version: "3.0.2-rc304.0", documentation: null, }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 97e439fd43..43b73801bd 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: "3.0.2-beta304.0", + version: "3.0.2-rc304.0", documentation: null, }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 84cd1e45e8..fb2c8e26c5 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: '0.8.3-beta304.0', + version: '0.8.3-rc304.0', summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 3ef5fb3bc8..15d6a77d79 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: '3.0.4-beta.0', + version: '3.0.4-rc.0', }); Package.includeTool(); diff --git a/packages/modules/package.js b/packages/modules/package.js index b672c568dd..714e5a3a28 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: '0.20.2-beta304.0', + version: '0.20.2-rc304.0', summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/non-core/bundle-visualizer/package.js b/packages/non-core/bundle-visualizer/package.js index f842ebab67..c0beeb16cb 100644 --- a/packages/non-core/bundle-visualizer/package.js +++ b/packages/non-core/bundle-visualizer/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.2.6-beta304.0', + version: '1.2.6-rc304.0', summary: 'Meteor bundle analysis and visualization.', documentation: 'README.md', }); diff --git a/packages/non-core/mongo-decimal/package.js b/packages/non-core/mongo-decimal/package.js index 9b483381f9..ae29cb6887 100644 --- a/packages/non-core/mongo-decimal/package.js +++ b/packages/non-core/mongo-decimal/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JS simulation of MongoDB Decimal128 type", - version: '0.1.5-beta304.0', + version: '0.1.5-rc304.0', }); Npm.depends({ diff --git a/packages/static-html-tools/package.js b/packages/static-html-tools/package.js index caf40f3851..f655f2000b 100644 --- a/packages/static-html-tools/package.js +++ b/packages/static-html-tools/package.js @@ -1,7 +1,7 @@ Package.describe({ name: 'static-html-tools', summary: "Tools for static-html", - version: '1.0.0-beta304.0', + version: '1.0.0-rc304.0', git: 'https://github.com/meteor/meteor.git', documentation: null }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 3b775c2452..f4dcd6b66a 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,7 +1,7 @@ Package.describe({ name: 'static-html', summary: "Define static page content in .html files", - version: '1.4.0-beta304.0', + version: '1.4.0-rc304.0', git: 'https://github.com/meteor/meteor.git' }); @@ -9,7 +9,7 @@ Package.registerBuildPlugin({ name: "compileStaticHtmlBatch", use: [ 'ecmascript@0.16.9', - 'static-html-tools@1.0.0-beta304.0', + 'static-html-tools@1.0.0-rc304.0', 'caching-compiler@2.0.0', ], sources: [ diff --git a/packages/url/package.js b/packages/url/package.js index d9c1d6288d..94f7b51aa1 100644 --- a/packages/url/package.js +++ b/packages/url/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "url", - version: '1.3.4-beta304.0', + version: '1.3.4-rc304.0', summary: "Isomorphic modern/legacy/Node polyfill for WHATWG URL/URLSearchParams", documentation: "README.md" }); diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 6fd3bbc885..b60352d42d 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: "2.0.3-beta304.0", + version: "2.0.3-rc304.0", }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index c462654198..6c5da70cb0 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "3.0.4-beta.0", + "version": "3.0.4-rc.0", "recommended": false, "official": false, "description": "Meteor experimental release" From 5ac3796289da950d43c4fc2efdbbd8f26118822e Mon Sep 17 00:00:00 2001 From: denihs Date: Wed, 9 Oct 2024 15:06:52 -0400 Subject: [PATCH 2/6] Update npm-shrinkwrap.json --- .../.npm/package/npm-shrinkwrap.json | 6 +- .../.npm/package/npm-shrinkwrap.json | 20 ++ .../email/.npm/package/npm-shrinkwrap.json | 6 +- .../.npm/package/npm-shrinkwrap.json | 6 +- .../.npm/package/npm-shrinkwrap.json | 180 +++++++++--------- .../webapp/.npm/package/npm-shrinkwrap.json | 6 +- 6 files changed, 122 insertions(+), 102 deletions(-) diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json index 93c418735a..ebacac28ad 100644 --- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json +++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json @@ -2,9 +2,9 @@ "lockfileVersion": 4, "dependencies": { "@types/node": { - "version": "22.5.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz", - "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==" + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==" }, "@types/notp": { "version": "2.0.5", diff --git a/packages/ddp-server/.npm/package/npm-shrinkwrap.json b/packages/ddp-server/.npm/package/npm-shrinkwrap.json index 5ecef99729..f7fd53b35e 100644 --- a/packages/ddp-server/.npm/package/npm-shrinkwrap.json +++ b/packages/ddp-server/.npm/package/npm-shrinkwrap.json @@ -11,6 +11,26 @@ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==" }, + "lodash.isempty": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz", + "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==" + }, + "lodash.isobject": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", + "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, "permessage-deflate": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/permessage-deflate/-/permessage-deflate-0.1.7.tgz", diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json index 1101bf7754..fcc8fd64c8 100644 --- a/packages/email/.npm/package/npm-shrinkwrap.json +++ b/packages/email/.npm/package/npm-shrinkwrap.json @@ -2,9 +2,9 @@ "lockfileVersion": 4, "dependencies": { "@types/node": { - "version": "22.5.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz", - "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==" + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==" }, "@types/nodemailer": { "version": "6.4.14", diff --git a/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json b/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json index cc006ffa58..cff63db95a 100644 --- a/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json +++ b/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json @@ -346,9 +346,9 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==" }, "regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==" + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", + "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==" }, "remove-trailing-separator": { "version": "1.1.0", diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json index e5cb7e27f5..ad08cb6eb3 100644 --- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json +++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json @@ -56,114 +56,114 @@ } }, "@aws-sdk/client-cognito-identity": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.658.1.tgz", - "integrity": "sha512-MCYLKmNy0FlNT9TvXfOxj0jh+ZQq+G9qEy/VZqu3JsQSgiFvFRdzgzcbQ9gQx7fZrDC/TPdABOTh483zI4cu9g==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.666.0.tgz", + "integrity": "sha512-TirQ6hJksC6M2Cwi7rIZS2tP4s3OHDdU4Md/mksMkLT9lkzT8sNLU0DwVO5FlWcwtKmC3gLbIDa+Hqe5CpRDNA==" }, "@aws-sdk/client-sso": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.658.1.tgz", - "integrity": "sha512-lOuaBtqPTYGn6xpXlQF4LsNDsQ8Ij2kOdnk+i69Kp6yS76TYvtUuukyLL5kx8zE1c8WbYtxj9y8VNw9/6uKl7Q==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.666.0.tgz", + "integrity": "sha512-+h5Xk64dM4on1MwjTYxlwtI8ilytU7zjTVRzMAYOysmH71Bc8YsLOfonFHvzhF/AXpKJu3f1BhM65S0tasPcrw==" }, "@aws-sdk/client-sso-oidc": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.658.1.tgz", - "integrity": "sha512-RGcZAI3qEA05JszPKwa0cAyp8rnS1nUvs0Sqw4hqLNQ1kD7b7V6CPjRXe7EFQqCOMvM4kGqx0+cEEVTOmBsFLw==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.666.0.tgz", + "integrity": "sha512-mW//v5EvHMU2SulW1FqmjJJPDNhzySRb/YUU+jq9AFDIYUdjF6j6wM+iavCW/4gLqOct0RT7B62z8jqyHkUCEQ==" }, "@aws-sdk/client-sts": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.658.1.tgz", - "integrity": "sha512-yw9hc5blTnbT1V6mR7Cx9HGc9KQpcLQ1QXj8rntiJi6tIYu3aFNVEyy81JHL7NsuBSeQulJTvHO3y6r3O0sfRg==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.666.0.tgz", + "integrity": "sha512-tw8yxcxvaj0d/A4YJXIh3mISzsQe8rThIVKvpyhEdl1lEoz81skCccX5u3gHajciSdga/V0DxhBbsO+eE1bZkw==" }, "@aws-sdk/core": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.658.1.tgz", - "integrity": "sha512-vJVMoMcSKXK2gBRSu9Ywwv6wQ7tXH8VL1fqB1uVxgCqBZ3IHfqNn4zvpMPWrwgO2/3wv7XFyikGQ5ypPTCw4jA==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.666.0.tgz", + "integrity": "sha512-jxNjs0sAVX+CWwoa4kHUENLHuBwjT1EILBoctmQoiIb1v5KpKwZnSByHTpvUkFmbuwWQPEnJkJCqzIHjEmjisA==" }, "@aws-sdk/credential-provider-cognito-identity": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.658.1.tgz", - "integrity": "sha512-JY4rZ4e2emL7PNHCU7F/BQV8PpQGEBZLkEoPD55RO4CitaIhlVZRpUCGLih+0Hw4MOnTUqJdfQBM+qZk6G+Now==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.666.0.tgz", + "integrity": "sha512-JkqJPSqN5XLEicW4gRtd5DTyg0xD0yIvc7+gWXGJq0crNM8IJB9lbG+q3xBkXSbmcrHQyuD74F+ZGjLxmTQBEQ==" }, "@aws-sdk/credential-provider-env": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.654.0.tgz", - "integrity": "sha512-kogsx3Ql81JouHS7DkheCDU9MYAvK0AokxjcshDveGmf7BbgbWCA8Fnb9wjQyNDaOXNvkZu8Z8rgkX91z324/w==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.664.0.tgz", + "integrity": "sha512-95rE+9Voaco0nmKJrXqfJAxSSkSWqlBy76zomiZrUrv7YuijQtHCW8jte6v6UHAFAaBzgFsY7QqBxs15u9SM7g==" }, "@aws-sdk/credential-provider-http": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.658.1.tgz", - "integrity": "sha512-4ubkJjEVCZflxkZnV1JDQv8P2pburxk1LrEp55telfJRzXrnowzBKwuV2ED0QMNC448g2B3VCaffS+Ct7c4IWQ==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.666.0.tgz", + "integrity": "sha512-j1Cob+tYmJ/m9agSsFPdAhLfILBqZzolF17XJvmEzQC2edltQ6NR0Wd09GQvtiAFZy7gn1l40bKuxX6Tq5U6XQ==" }, "@aws-sdk/credential-provider-ini": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.658.1.tgz", - "integrity": "sha512-2uwOamQg5ppwfegwen1ddPu5HM3/IBSnaGlaKLFhltkdtZ0jiqTZWUtX2V+4Q+buLnT0hQvLS/frQ+7QUam+0Q==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.666.0.tgz", + "integrity": "sha512-u09aUZJQNK8zVAKJKEOQ2mLsv39YxR20US00/WAPNW9sMWWhl4raT97tsalOUc6ZTHOEqHHmEVZXuscINnkaww==" }, "@aws-sdk/credential-provider-node": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.658.1.tgz", - "integrity": "sha512-XwxW6N+uPXPYAuyq+GfOEdfL/MZGAlCSfB5gEWtLBFmFbikhmEuqfWtI6CD60OwudCUOh6argd21BsJf8o1SJA==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.666.0.tgz", + "integrity": "sha512-C43L9kxAb2lvIZ+eKVuyX9xYrkpg+Zyq0fLasK1wekC6M/Qj/uqE1KFz9ddDE8Dv1HwiE+UZk5psM0KatQpPGQ==" }, "@aws-sdk/credential-provider-process": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.654.0.tgz", - "integrity": "sha512-PmQoo8sZ9Q2Ow8OMzK++Z9lI7MsRUG7sNq3E72DVA215dhtTICTDQwGlXH2AAmIp7n+G9LLRds+4wo2ehG4mkg==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.664.0.tgz", + "integrity": "sha512-sQicIw/qWTsmMw8EUQNJXdrWV5SXaZc2zGdCQsQxhR6wwNO2/rZ5JmzdcwUADmleBVyPYk3KGLhcofF/qXT2Ng==" }, "@aws-sdk/credential-provider-sso": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.658.1.tgz", - "integrity": "sha512-YOagVEsZEk9DmgJEBg+4MBXrPcw/tYas0VQ5OVBqC5XHNbi2OBGJqgmjVPesuu393E7W0VQxtJFDS00O1ewQgA==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.666.0.tgz", + "integrity": "sha512-aaa5Ig8hI7lSh1CSQP0oaLvjylz6+3mKUgdvw69zv0MdX3TUZiQRDCsfqK0P3VNsj/QSvBytSjuNDuSaYcACJg==" }, "@aws-sdk/credential-provider-web-identity": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.654.0.tgz", - "integrity": "sha512-6a2g9gMtZToqSu+CusjNK5zvbLJahQ9di7buO3iXgbizXpLXU1rnawCpWxwslMpT5fLgMSKDnKDrr6wdEk7jSw==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.664.0.tgz", + "integrity": "sha512-10ltP1BfSKRJVXd8Yr5oLbo+VSDskWbps0X3szSsxTk0Dju1xvkz7hoIjylWLvtGbvQ+yb2pmsJYKCudW/4DJg==" }, "@aws-sdk/credential-providers": { - "version": "3.658.1", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.658.1.tgz", - "integrity": "sha512-lfXA6kZS6GHyi/67EbfrKdLoqHR6j7G35eFwaqxyNkfMhNBpAF0eZK3SYiwnzdR9+Wb/enTFawYiFbG5R+dQzA==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.666.0.tgz", + "integrity": "sha512-BtkxznPF8a8vUCEiTasHhLUjsgkm7Sc0mxZeOY+NtGMfQaJxx/q/tj5bFmtMNmdcbiEcxUV6bybb6qdN1PM/jg==" }, "@aws-sdk/middleware-host-header": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.654.0.tgz", - "integrity": "sha512-rxGgVHWKp8U2ubMv+t+vlIk7QYUaRCHaVpmUlJv0Wv6Q0KeO9a42T9FxHphjOTlCGQOLcjCreL9CF8Qhtb4mdQ==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.664.0.tgz", + "integrity": "sha512-4tCXJ+DZWTq38eLmFgnEmO8X4jfWpgPbWoCyVYpRHCPHq6xbrU65gfwS9jGx25L4YdEce641ChI9TKLryuUgRA==" }, "@aws-sdk/middleware-logger": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.654.0.tgz", - "integrity": "sha512-OQYb+nWlmASyXfRb989pwkJ9EVUMP1CrKn2eyTk3usl20JZmKo2Vjis6I0tLUkMSxMhnBJJlQKyWkRpD/u1FVg==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.664.0.tgz", + "integrity": "sha512-eNykMqQuv7eg9pAcaLro44fscIe1VkFfhm+gYnlxd+PH6xqapRki1E68VHehnIptnVBdqnWfEqLUSLGm9suqhg==" }, "@aws-sdk/middleware-recursion-detection": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.654.0.tgz", - "integrity": "sha512-gKSomgltKVmsT8sC6W7CrADZ4GHwX9epk3GcH6QhebVO3LA9LRbkL3TwOPUXakxxOLLUTYdOZLIOtFf7iH00lg==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.664.0.tgz", + "integrity": "sha512-jq27WMZhm+dY8BWZ9Ipy3eXtZj0lJzpaKQE3A3tH5AOIlUV/gqrmnJ9CdqVVef4EJsq9Yil4ZzQjKKmPsxveQg==" }, "@aws-sdk/middleware-user-agent": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.654.0.tgz", - "integrity": "sha512-liCcqPAyRsr53cy2tYu4qeH4MMN0eh9g6k56XzI5xd4SghXH5YWh4qOYAlQ8T66ZV4nPMtD8GLtLXGzsH8moFg==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.666.0.tgz", + "integrity": "sha512-d8XJ103SGCMsFIKEowpOaZr0W8AkLNd+3CS7W95yb6YmN7lcNGL54RtTSy3m8YJI6W2jXftPFN2oLG4K3aywVQ==" }, "@aws-sdk/region-config-resolver": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.654.0.tgz", - "integrity": "sha512-ydGOrXJxj3x0sJhsXyTmvJVLAE0xxuTWFJihTl67RtaO7VRNtd82I3P3bwoMMaDn5WpmV5mPo8fEUDRlBm3fPg==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.664.0.tgz", + "integrity": "sha512-o/B8dg8K+9714RGYPgMxZgAChPe/MTSMkf/eHXTUFHNik5i1HgVKfac22njV2iictGy/6GhpFsKa1OWNYAkcUg==" }, "@aws-sdk/token-providers": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.654.0.tgz", - "integrity": "sha512-D8GeJYmvbfWkQDtTB4owmIobSMexZel0fOoetwvgCQ/7L8VPph3Q2bn1TRRIXvH7wdt6DcDxA3tKMHPBkT3GlA==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.664.0.tgz", + "integrity": "sha512-dBAvXW2/6bAxidvKARFxyCY2uCynYBKRFN00NhS1T5ggxm3sUnuTpWw1DTjl02CVPkacBOocZf10h8pQbHSK8w==" }, "@aws-sdk/types": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.654.0.tgz", - "integrity": "sha512-VWvbED3SV+10QJIcmU/PKjsKilsTV16d1I7/on4bvD/jo1qGeMXqLDBSen3ks/tuvXZF/mFc7ZW/W2DiLVtO7A==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.664.0.tgz", + "integrity": "sha512-+GtXktvVgpreM2b+NJL9OqZGsOzHwlCUrO8jgQUvH/yA6Kd8QO2YFhQCp0C9sSzTteZJVqGBu8E0CQurxJHPbw==" }, "@aws-sdk/util-endpoints": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.654.0.tgz", - "integrity": "sha512-i902fcBknHs0Irgdpi62+QMvzxE+bczvILXigYrlHL4+PiEnlMVpni5L5W1qCkNZXf8AaMrSBuR1NZAGp6UOUw==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.664.0.tgz", + "integrity": "sha512-KrXoHz6zmAahVHkyWMRT+P6xJaxItgmklxEDrT+npsUB4d5C/lhw16Crcp9TDi828fiZK3GYKRAmmNhvmzvBNg==" }, "@aws-sdk/util-locate-window": { "version": "3.568.0", @@ -171,14 +171,14 @@ "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig==" }, "@aws-sdk/util-user-agent-browser": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.654.0.tgz", - "integrity": "sha512-ykYAJqvnxLt7wfrqya28wuH3/7NdrwzfiFd7NqEVQf7dXVxL5RPEpD7DxjcyQo3DsHvvdUvGZVaQhozycn1pzA==" + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.664.0.tgz", + "integrity": "sha512-c/PV3+f1ss4PpskHbcOxTZ6fntV2oXy/xcDR9nW+kVaz5cM1G702gF0rvGLKPqoBwkj2rWGe6KZvEBeLzynTUQ==" }, "@aws-sdk/util-user-agent-node": { - "version": "3.654.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.654.0.tgz", - "integrity": "sha512-a0ojjdBN6pqv6gB4H/QPPSfhs7mFtlVwnmKCM/QrTaFzN0U810PJ1BST3lBx5sa23I5jWHGaoFY+5q65C3clLQ==" + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.666.0.tgz", + "integrity": "sha512-DzbOMcAqrn51Z0fz5FvofaYmQA+sOJKO2cb8zQrix3TkzsTw1vRLo/cgQUJuJRGptbQCe1gnj7+21Gd5hpU6Ag==" }, "@mongodb-js/saslprep": { "version": "1.1.9", @@ -196,9 +196,9 @@ "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg==" }, "@smithy/core": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.7.tgz", - "integrity": "sha512-goqMjX+IoVEnHZjYuzu8xwoZjoteMiLXsPHuXPBkWsGwu0o9c3nTjqkUlP1Ez/V8E501aOU7CJ3INk8mQcW2gw==" + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz", + "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA==" }, "@smithy/credential-provider-imds": { "version": "3.2.4", @@ -236,9 +236,9 @@ "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==" }, "@smithy/middleware-retry": { - "version": "3.0.22", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.22.tgz", - "integrity": "sha512-svEN7O2Tf7BoaBkPzX/8AE2Bv7p16d9/ulFAD1Gmn5g19iMqNk1WIkMxAY7SpB9/tVtUwKx0NaIsBRl88gumZA==" + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz", + "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A==" }, "@smithy/middleware-serde": { "version": "3.0.7", @@ -296,9 +296,9 @@ "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ==" }, "@smithy/smithy-client": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.3.6.tgz", - "integrity": "sha512-qdH+mvDHgq1ss6mocyIl2/VjlWXew7pGwZQydwYJczEc22HZyX3k8yVPV9aZsbYbssHPvMDRA5rfBDrjQUbIIw==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz", + "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==" }, "@smithy/types": { "version": "3.5.0", @@ -336,14 +336,14 @@ "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==" }, "@smithy/util-defaults-mode-browser": { - "version": "3.0.22", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.22.tgz", - "integrity": "sha512-WKzUxNsOun5ETwEOrvooXeI1mZ8tjDTOcN4oruELWHhEYDgQYWwxZupURVyovcv+h5DyQT/DzK5nm4ZoR/Tw5Q==" + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz", + "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw==" }, "@smithy/util-defaults-mode-node": { - "version": "3.0.22", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.22.tgz", - "integrity": "sha512-hUsciOmAq8fsGwqg4+pJfNRmrhfqMH4Y9UeGcgeUl88kPAoYANFATJqCND+O4nUvwp5TzsYwGpqpcBKyA8LUUg==" + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz", + "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg==" }, "@smithy/util-endpoints": { "version": "2.1.3", @@ -381,9 +381,9 @@ "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==" }, "@types/node": { - "version": "22.7.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz", - "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==" + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==" }, "@types/webidl-conversions": { "version": "7.0.3", diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json index e961a96f40..0de30108ab 100644 --- a/packages/webapp/.npm/package/npm-shrinkwrap.json +++ b/packages/webapp/.npm/package/npm-shrinkwrap.json @@ -32,9 +32,9 @@ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" }, "@types/node": { - "version": "22.7.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz", - "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==" + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==" }, "@types/qs": { "version": "6.9.16", From 3de54a3403900ef1b0f03e9507073abd9fa47843 Mon Sep 17 00:00:00 2001 From: denihs Date: Wed, 9 Oct 2024 17:24:08 -0400 Subject: [PATCH 3/6] publish new installer version --- npm-packages/meteor-installer/config.js | 110 ++++++++++----------- npm-packages/meteor-installer/package.json | 60 +++++------ 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index b683d5a53c..452cf19f9f 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -1,55 +1,55 @@ -const os = require('os'); -const path = require('path'); - -const METEOR_LATEST_VERSION = '3.0.3'; -const sudoUser = process.env.SUDO_USER || ''; -function isRoot() { - return process.getuid && process.getuid() === 0; -} -function isSudo() { - return isRoot() && !!sudoUser; -} -const localAppData = process.env.LOCALAPPDATA; -const isWindows = () => os.platform() === 'win32'; -const isMac = () => os.platform() === 'darwin'; -const isLinux = () => os.platform() === 'linux'; - -let rootPath; -if (isWindows()) { - rootPath = localAppData; -} else if (isRoot() && sudoUser) { - rootPath = isMac() ? `/Users/${sudoUser}` : `/home/${sudoUser}`; -} else { - if (isRoot()) { - console.info( - 'You are running the install script as root, without SUDO. This is not recommended and should be avoided. Continuing.', - ); - } - rootPath = os.homedir(); -} - -if (isWindows() && !localAppData) { - throw new Error('LOCALAPPDATA env var is not set.'); -} - -const shouldSetupExecPath = () => - !process.env.npm_config_ignore_meteor_setup_exec_path; - -const meteorLocalFolder = '.meteor'; -const meteorPath = path.resolve(rootPath, meteorLocalFolder); - -module.exports = { - METEOR_LATEST_VERSION, - extractPath: rootPath, - meteorPath, - release: process.env.INSTALL_METEOR_VERSION || METEOR_LATEST_VERSION, - rootPath, - sudoUser, - startedPath: path.resolve(rootPath, '.meteor-install-started.txt'), - isWindows, - isMac, - isLinux, - isRoot, - isSudo, - shouldSetupExecPath, -}; +const os = require('os'); +const path = require('path'); + +const METEOR_LATEST_VERSION = '3.0.4-rc.0'; +const sudoUser = process.env.SUDO_USER || ''; +function isRoot() { + return process.getuid && process.getuid() === 0; +} +function isSudo() { + return isRoot() && !!sudoUser; +} +const localAppData = process.env.LOCALAPPDATA; +const isWindows = () => os.platform() === 'win32'; +const isMac = () => os.platform() === 'darwin'; +const isLinux = () => os.platform() === 'linux'; + +let rootPath; +if (isWindows()) { + rootPath = localAppData; +} else if (isRoot() && sudoUser) { + rootPath = isMac() ? `/Users/${sudoUser}` : `/home/${sudoUser}`; +} else { + if (isRoot()) { + console.info( + 'You are running the install script as root, without SUDO. This is not recommended and should be avoided. Continuing.', + ); + } + rootPath = os.homedir(); +} + +if (isWindows() && !localAppData) { + throw new Error('LOCALAPPDATA env var is not set.'); +} + +const shouldSetupExecPath = () => + !process.env.npm_config_ignore_meteor_setup_exec_path; + +const meteorLocalFolder = '.meteor'; +const meteorPath = path.resolve(rootPath, meteorLocalFolder); + +module.exports = { + METEOR_LATEST_VERSION, + extractPath: rootPath, + meteorPath, + release: process.env.INSTALL_METEOR_VERSION || METEOR_LATEST_VERSION, + rootPath, + sudoUser, + startedPath: path.resolve(rootPath, '.meteor-install-started.txt'), + isWindows, + isMac, + isLinux, + isRoot, + isSudo, + shouldSetupExecPath, +}; diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json index 04d61922a0..e7ef80ad15 100644 --- a/npm-packages/meteor-installer/package.json +++ b/npm-packages/meteor-installer/package.json @@ -1,30 +1,30 @@ -{ - "name": "meteor", - "version": "3.0.3", - "description": "Install Meteor", - "main": "install.js", - "scripts": { - "install": "node cli.js install" - }, - "author": "zodern", - "license": "MIT", - "type": "commonjs", - "dependencies": { - "7zip-bin": "^5.2.0", - "cli-progress": "^3.11.1", - "https-proxy-agent": "^5.0.1", - "node-7z": "^2.1.2", - "node-downloader-helper": "^2.1.9", - "rimraf": "^6.0.1", - "semver": "^7.3.7", - "tar": "^6.1.11", - "tmp": "^0.2.1" - }, - "bin": { - "meteor-installer": "cli.js" - }, - "engines": { - "node": ">=20.x", - "npm": ">=10.x" - } -} +{ + "name": "meteor", + "version": "3.0.4-rc.0", + "description": "Install Meteor", + "main": "install.js", + "scripts": { + "install": "node cli.js install" + }, + "author": "zodern", + "license": "MIT", + "type": "commonjs", + "dependencies": { + "7zip-bin": "^5.2.0", + "cli-progress": "^3.11.1", + "https-proxy-agent": "^5.0.1", + "node-7z": "^2.1.2", + "node-downloader-helper": "^2.1.9", + "rimraf": "^6.0.1", + "semver": "^7.3.7", + "tar": "^6.1.11", + "tmp": "^0.2.1" + }, + "bin": { + "meteor-installer": "cli.js" + }, + "engines": { + "node": ">=20.x", + "npm": ">=10.x" + } +} From 937899ba1859d04084d225f121ab8815160adc22 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 10 Oct 2024 09:06:54 +0200 Subject: [PATCH 4/6] Express patch update --- packages/webapp/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webapp/package.js b/packages/webapp/package.js index b60352d42d..14c5c9c369 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -5,7 +5,7 @@ Package.describe({ Npm.depends({ "cookie-parser": "1.4.6", - express: "4.21.0", + express: "4.21.1", "@types/express": "4.17.21", compression: "1.7.4", errorhandler: "1.5.1", From 78b744c482fad348473937a3afb693dbd733ca4b Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 10 Oct 2024 09:10:52 +0200 Subject: [PATCH 5/6] Remove connect types --- packages/webapp/package.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 14c5c9c369..f1eab6a0b5 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -14,7 +14,6 @@ Npm.depends({ "stream-to-string": "1.2.1", qs: "6.13.0", "useragent-ng": "2.4.3", - "@types/connect": "3.4.38", "tmp": "0.2.3", }); From 13a0dccd73355f1e2983fa333bc109b8dd9c99bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Thu, 10 Oct 2024 14:17:16 +0200 Subject: [PATCH 6/6] reformat to fix styles --- npm-packages/meteor-installer/config.js | 110 ++++++++++++------------ 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index 452cf19f9f..e0970c76b5 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -1,55 +1,55 @@ -const os = require('os'); -const path = require('path'); - -const METEOR_LATEST_VERSION = '3.0.4-rc.0'; -const sudoUser = process.env.SUDO_USER || ''; -function isRoot() { - return process.getuid && process.getuid() === 0; -} -function isSudo() { - return isRoot() && !!sudoUser; -} -const localAppData = process.env.LOCALAPPDATA; -const isWindows = () => os.platform() === 'win32'; -const isMac = () => os.platform() === 'darwin'; -const isLinux = () => os.platform() === 'linux'; - -let rootPath; -if (isWindows()) { - rootPath = localAppData; -} else if (isRoot() && sudoUser) { - rootPath = isMac() ? `/Users/${sudoUser}` : `/home/${sudoUser}`; -} else { - if (isRoot()) { - console.info( - 'You are running the install script as root, without SUDO. This is not recommended and should be avoided. Continuing.', - ); - } - rootPath = os.homedir(); -} - -if (isWindows() && !localAppData) { - throw new Error('LOCALAPPDATA env var is not set.'); -} - -const shouldSetupExecPath = () => - !process.env.npm_config_ignore_meteor_setup_exec_path; - -const meteorLocalFolder = '.meteor'; -const meteorPath = path.resolve(rootPath, meteorLocalFolder); - -module.exports = { - METEOR_LATEST_VERSION, - extractPath: rootPath, - meteorPath, - release: process.env.INSTALL_METEOR_VERSION || METEOR_LATEST_VERSION, - rootPath, - sudoUser, - startedPath: path.resolve(rootPath, '.meteor-install-started.txt'), - isWindows, - isMac, - isLinux, - isRoot, - isSudo, - shouldSetupExecPath, -}; +const os = require('os'); +const path = require('path'); + +const METEOR_LATEST_VERSION = '3.0.4-rc.0'; +const sudoUser = process.env.SUDO_USER || ''; +function isRoot() { + return process.getuid && process.getuid() === 0; +} +function isSudo() { + return isRoot() && !!sudoUser; +} +const localAppData = process.env.LOCALAPPDATA; +const isWindows = () => os.platform() === 'win32'; +const isMac = () => os.platform() === 'darwin'; +const isLinux = () => os.platform() === 'linux'; + +let rootPath; +if (isWindows()) { + rootPath = localAppData; +} else if (isRoot() && sudoUser) { + rootPath = isMac() ? `/Users/${sudoUser}` : `/home/${sudoUser}`; +} else { + if (isRoot()) { + console.info( + 'You are running the install script as root, without SUDO. This is not recommended and should be avoided. Continuing.', + ); + } + rootPath = os.homedir(); +} + +if (isWindows() && !localAppData) { + throw new Error('LOCALAPPDATA env var is not set.'); +} + +const shouldSetupExecPath = () => + !process.env.npm_config_ignore_meteor_setup_exec_path; + +const meteorLocalFolder = '.meteor'; +const meteorPath = path.resolve(rootPath, meteorLocalFolder); + +module.exports = { + METEOR_LATEST_VERSION, + extractPath: rootPath, + meteorPath, + release: process.env.INSTALL_METEOR_VERSION || METEOR_LATEST_VERSION, + rootPath, + sudoUser, + startedPath: path.resolve(rootPath, '.meteor-install-started.txt'), + isWindows, + isMac, + isLinux, + isRoot, + isSudo, + shouldSetupExecPath, +};