From 2785194b61e2d4c2cf5042148a292b85ff8a71cf Mon Sep 17 00:00:00 2001 From: denihs Date: Wed, 22 May 2024 08:58:50 -0400 Subject: [PATCH 1/2] - publish new version for meteor-installer --- npm-packages/meteor-installer/config.js | 2 +- npm-packages/meteor-installer/package.json | 2 +- packages/webapp/.npm/package/npm-shrinkwrap.json | 10 ---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index c08a9e1ab5..2dab7f9d53 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -1,7 +1,7 @@ const os = require('os'); const path = require('path'); -const METEOR_LATEST_VERSION = '3.0-rc.1'; +const METEOR_LATEST_VERSION = '3.0-rc.2'; 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 044a696087..e23f12c825 100644 --- a/npm-packages/meteor-installer/package.json +++ b/npm-packages/meteor-installer/package.json @@ -1,6 +1,6 @@ { "name": "meteor", - "version": "3.0.0-rc.1", + "version": "3.0.0-rc.2", "description": "Install Meteor", "main": "install.js", "scripts": { diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json index 25a6be6846..db9acb4100 100644 --- a/packages/webapp/.npm/package/npm-shrinkwrap.json +++ b/packages/webapp/.npm/package/npm-shrinkwrap.json @@ -367,11 +367,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "nan": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz", - "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==" - }, "negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -422,11 +417,6 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, - "posix": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/posix/-/posix-4.2.0.tgz", - "integrity": "sha512-JbxfT0Fxy/SG10LSkKX1C75iULYfAJqYCwwmM6J0+zh2vl/bE51CqaqvSpdZWg7YAwiuDIoBI6j7in+n3GgXSw==" - }, "promise-polyfill": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz", From bf87363b725a63906a8d4fae736209a1fadff3c8 Mon Sep 17 00:00:00 2001 From: denihs Date: Wed, 22 May 2024 09:16:59 -0400 Subject: [PATCH 2/2] - fix error: getText is not a function spiderable package --- packages/deprecated/spiderable/package.js | 2 +- packages/deprecated/spiderable/spiderable_server.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/deprecated/spiderable/package.js b/packages/deprecated/spiderable/package.js index 2c91660aa7..c96fa78131 100644 --- a/packages/deprecated/spiderable/package.js +++ b/packages/deprecated/spiderable/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Makes the application crawlable to web spiders", - version: "1.1.0-alpha300.5", + version: "1.1.0-alpha300.6", deprecated: true, documentation: 'README.md' }); diff --git a/packages/deprecated/spiderable/spiderable_server.js b/packages/deprecated/spiderable/spiderable_server.js index 934d0235a7..50055d6114 100644 --- a/packages/deprecated/spiderable/spiderable_server.js +++ b/packages/deprecated/spiderable/spiderable_server.js @@ -56,9 +56,8 @@ Spiderable._urlForPhantom = function (siteAbsoluteUrl, requestUrl) { return urlParser.format(parsedAbsoluteUrl); }; -var PHANTOM_SCRIPT = Assets.getText("phantom_script.js"); - -WebApp.handlers.use(function (req, res, next) { +WebApp.handlers.use(async function (req, res, next) { + var PHANTOM_SCRIPT = await Assets.getTextAsync("phantom_script.js"); // _escaped_fragment_ comes from Google's AJAX crawling spec: // https://developers.google.com/webmasters/ajax-crawling/docs/specification if (/\?.*_escaped_fragment_=/.test(req.url) ||