Skip to content

Commit

Permalink
v1.6.6
Browse files Browse the repository at this point in the history
 - Fix images preview
 - Update METEOR to v1.3.5.1
  • Loading branch information
dr-dimitru committed Jul 25, 2016
1 parent 8bd5b46 commit 3b82140
Show file tree
Hide file tree
Showing 2,841 changed files with 51,852 additions and 153,819 deletions.
2 changes: 1 addition & 1 deletion .node_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.10.45
v0.10.46
9 changes: 5 additions & 4 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Meteor-Files-Demo",
"version": "1.6.2",
"version": "1.6.6",
"description": "Demo application for ostrio:files package",
"repository": "https://github.com/VeliovGroup/Meteor-Files-Demo",
"website": "https://github.com/VeliovGroup/Meteor-Files-Demo",
Expand All @@ -19,6 +19,7 @@
"meteor-deque": "*",
"meteor-node-stubs": "~0.2.0",
"meteor-promise": "0.7.2",
"promise": "7.1.1",
"mime": "^1.3.4",
"mongodb": "^2.1.15",
"progress": "^1.1.8",
Expand All @@ -29,7 +30,7 @@
"throttle": "1.0.3",
"underscore": "1.5.2",
"useragent": "^2.1.9",
"request": "2.72.0"
"request": "2.73.0"
},
"env": {
"ROOT_URL": {
Expand Down Expand Up @@ -100,7 +101,7 @@
}
],
"engines": {
"node": "0.10.45",
"npm": "2.15.3"
"node": "0.10.46",
"npm": "3.10.5"
}
}
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Meteor-Files-Demo",
"version": "1.6.2",
"version": "1.6.6",
"description": "Demo application for ostrio:files package",
"main": "main.js",
"scripts": {
Expand Down Expand Up @@ -40,6 +40,7 @@
"meteor-deque": "*",
"meteor-node-stubs": "~0.2.0",
"meteor-promise": "0.7.2",
"promise": "7.1.1",
"mime": "^1.3.4",
"mongodb": "^2.1.15",
"progress": "^1.1.8",
Expand All @@ -50,10 +51,10 @@
"throttle": "1.0.3",
"underscore": "1.5.2",
"useragent": "^2.1.9",
"request": "2.72.0"
"request": "2.73.0"
},
"engines": {
"node": "0.10.45",
"npm": "2.15.3"
"node": "0.10.46",
"npm": "3.10.5"
}
}
23 changes: 12 additions & 11 deletions programs/server/app/lib/files.collection.coffee.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion programs/server/app/lib/files.collection.coffee.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion programs/server/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"meteorRelease": "METEOR@1.3.4.1",
"meteorRelease": "METEOR@1.3.5.1",
"appId": "5x3da39sxim5ucthkf",
"clientPaths": {
"web.browser": "../web.browser/program.json"
Expand Down
12 changes: 9 additions & 3 deletions programs/server/mini-files.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,16 @@ var wrapPathFunction = function (name, partialPaths) {
// forget about conversion of absolute paths for Windows
return toDosPath(p, partialPaths);
});
return toPosixPath(f.apply(path, args), partialPaths);
} else {
return f.apply(path, arguments);

var result = f.apply(path, args);
if (typeof result === "string") {
result = toPosixPath(result, partialPaths);
}

return result;
}

return f.apply(path, arguments);
};
};

Expand Down
31 changes: 31 additions & 0 deletions programs/server/npm-rebuild-args.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Command-line arguments passed to npm when rebuilding binary packages.
var args = [
"rebuild",

// The --no-bin-links flag tells npm not to create symlinks in the
// node_modules/.bin/ directory when rebuilding packages, which helps
// avoid problems like https://github.com/meteor/meteor/issues/7401.
"--no-bin-links",

// The --update-binary flag tells node-pre-gyp to replace previously
// installed local binaries with remote binaries:
// https://github.com/mapbox/node-pre-gyp#options
"--update-binary"
];

// Allow additional flags to be passed via the $METEOR_NPM_REBUILD_FLAGS
// environment variable.
var flags = process.env.METEOR_NPM_REBUILD_FLAGS;
if (flags) {
args = ["rebuild"];
flags.split(/\s+/g).forEach(function (flag) {
if (flag) {
args.push(flag);
}
});
}

exports.get = function () {
// Make a defensive copy.
return args.slice(0);
};
3 changes: 2 additions & 1 deletion programs/server/npm-rebuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ if (process.env.METEOR_SKIP_NPM_REBUILD) {

var path = require("path");
var spawn = require("child_process").spawn;
var rebuildArgs = require("./npm-rebuild-args.js").get();

try {
// This JSON file gets written in meteor/tools/isobuild/bundler.js.
Expand Down Expand Up @@ -40,7 +41,7 @@ function rebuild(i) {
return;
}

spawn("npm", ["rebuild"], {
spawn("npm", rebuildArgs, {
cwd: path.join(__dirname, dir),
stdio: "inherit",
env: env
Expand Down
Loading

0 comments on commit 3b82140

Please sign in to comment.