Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1fd2109

Browse filesBrowse files
author
Ben Newman
committed
Use fibers@1.0.10 now that our Windows fork has been merged.
1 parent 57a5306 commit 1fd2109
Copy full SHA for 1fd2109

File tree

Expand file treeCollapse file tree

2 files changed

+2
-24
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+2
-24
lines changed

‎scripts/dev-bundle-server-package.js

Copy file name to clipboardExpand all lines: scripts/dev-bundle-server-package.js
+1-12Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,13 @@
44
// We put this in a JS file so that it can contain comments. It is processed
55
// into a package.json file by generate-dev-bundle.sh.
66

7-
var fibersVersion;
8-
if (process.platform === "win32") {
9-
// We have a fork of fibers off of version 1.0.5 that searches farther for
10-
// the isolate thread. This problem is a result of antivirus programs messing
11-
// with the thread counts on Windows.
12-
// Duplicated in dev-bundle-tool-package.js
13-
fibersVersion = "https://github.com/meteor/node-fibers/tarball/d519f0c5971c33d99c902dad346b817e84bab001";
14-
} else {
15-
fibersVersion = "1.0.8";
16-
}
17-
187
var packageJson = {
198
name: "meteor-dev-bundle",
209
// Version is not important but is needed to prevent warnings.
2110
version: "0.0.0",
2211
dependencies: {
23-
fibers: fibersVersion,
2412
"meteor-promise": "0.7.2",
13+
fibers: "1.0.10",
2514
promise: "7.1.1",
2615
// Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done
2716
// in the package too) because we should consider using lodash instead

‎scripts/dev-bundle-tool-package.js

Copy file name to clipboardExpand all lines: scripts/dev-bundle-tool-package.js
+1-12Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,6 @@
44
// We put this in a JS file so that it can contain comments. It is processed
55
// into a package.json file by generate-dev-bundle.sh.
66

7-
var fibersVersion;
8-
if (process.platform === "win32") {
9-
// We have a fork of fibers off of version 1.0.5 that searches farther for
10-
// the isolate thread. This problem is a result of antivirus programs messing
11-
// with the thread counts on Windows.
12-
// Duplicated in dev-bundle-server-package.js
13-
fibersVersion = "https://github.com/meteor/node-fibers/tarball/d519f0c5971c33d99c902dad346b817e84bab001";
14-
} else {
15-
fibersVersion = "1.0.8";
16-
}
17-
187
var packageJson = {
198
name: "meteor-dev-bundle-tool",
209
// Version is not important but is needed to prevent warnings.
@@ -25,9 +14,9 @@ var packageJson = {
2514
npm: "2.14.22",
2615
"node-gyp": "3.3.1",
2716
"node-pre-gyp": "0.6.26",
28-
fibers: fibersVersion,
2917
"meteor-babel": "0.9.3",
3018
"meteor-promise": "0.7.2",
19+
fibers: "1.0.10",
3120
promise: "7.1.1",
3221
// So that Babel 6 can emit require("babel-runtime/helpers/...") calls.
3322
"babel-runtime": "5.8.38",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.