mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
Merge branch 'webapp-addruntime-config-fix' of https://github.com/meteor/meteor into webapp-addruntime-config-fix
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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": {
|
||||
|
||||
@@ -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'
|
||||
});
|
||||
|
||||
@@ -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) ||
|
||||
|
||||
10
packages/webapp/.npm/package/npm-shrinkwrap.json
generated
10
packages/webapp/.npm/package/npm-shrinkwrap.json
generated
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user