From 917b01ac5f334a45e19f5925f39de1db85af2c94 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 18 Sep 2017 16:25:10 -0400 Subject: [PATCH 1/4] Bump standard-minifier-css package version to republish. Since all Meteor packages implicitly depend on the meteor package, it appears packages that register compiler plugins may need to be republished in order to benefit from f34c5ec92670142b280a4aa8741c37ae1019f266, or else the `Cannot find module "fibers\\future"` error may occur on Windows. --- packages/standard-minifier-css/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 603e9d7bb6..84b7999446 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.3.4', + version: '1.3.5', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); From b84a322ceb93c732eac718b3cf621eee76dc4374 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 18 Sep 2017 16:34:32 -0400 Subject: [PATCH 2/4] Update packages/non-core/blaze submodule to latest master revision. --- packages/non-core/blaze | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/non-core/blaze b/packages/non-core/blaze index 6a82100e09..7508438243 160000 --- a/packages/non-core/blaze +++ b/packages/non-core/blaze @@ -1 +1 @@ -Subproject commit 6a82100e09b22c27366d11805b232ceab443e386 +Subproject commit 750843824397a6f8062a6b1dcc884cacbd3bef85 From e59e0a582a817b9864dee27e8c63c395f63ab06c Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 18 Sep 2017 16:54:23 -0400 Subject: [PATCH 3/4] Convert \s to /s in Npm.require'd module identifiers. This is another way of addressing the problem I attempted to fix with f34c5ec92670142b280a4aa8741c37ae1019f266 earlier today. Apparently, older versions of compiler plugin-registering packages such as standard-minifier-css and templating-compiler still depend on older versions of the meteor package, which may still use path.join to import fibers/future. This can be fixed by republishing those packages, as I did in 917b01ac5f334a45e19f5925f39de1db85af2c94, but I'd prefer not to republish every compiler plugin package. Fortunately, we can also solve the problem by being more tolerant in the implementation of Npm.require, which is what this commit does. --- tools/isobuild/bundler.js | 4 ++++ tools/static-assets/server/boot.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index bb1b411b2e..160504eca6 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -1865,6 +1865,10 @@ class JsImage { }, function (name, error) { let fullPath; + // Replace all backslashes with forward slashes, just in case + // someone passes a Windows-y module identifier. + name = name.split("\\").join("/"); + function tryLookup(nodeModulesPath, name) { var nodeModulesTopDir = files.pathJoin( nodeModulesPath, diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js index 064d348622..4240a2b769 100644 --- a/tools/static-assets/server/boot.js +++ b/tools/static-assets/server/boot.js @@ -200,6 +200,10 @@ var loadServerBundles = Profile("Load server bundles", function () { if (nonLocalNodeModulesPaths.length > 0) { var fullPath; + // Replace all backslashes with forward slashes, just in case + // someone passes a Windows-y module identifier. + name = name.split("\\").join("/"); + nonLocalNodeModulesPaths.some(function (nodeModuleBase) { var packageBase = files.convertToOSPath(files.pathResolve( nodeModuleBase, From 4f43008aa0b02db79eb791d9103d696288a5bfb9 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 18 Sep 2017 17:19:36 -0400 Subject: [PATCH 4/4] Explicitly depend on d3-collection in bundle-visualizer. The visualizer seems to have stopped working recently if you reinstall its npm dependencies without using the existing npm-shrinkwrap.json file, likely due to changes in indirect dependencies. The good news is that the package now has far fewer npm dependencies. However, since the sunburst.js module imports d3-collection explicitly, we should definitely be depending directly on that package. cc @abernix --- .../.npm/package/npm-shrinkwrap.json | 151 ++---------------- .../non-core/bundle-visualizer/package.js | 3 +- 2 files changed, 15 insertions(+), 139 deletions(-) diff --git a/packages/non-core/bundle-visualizer/.npm/package/npm-shrinkwrap.json b/packages/non-core/bundle-visualizer/.npm/package/npm-shrinkwrap.json index 6b10c34bd8..156906452c 100644 --- a/packages/non-core/bundle-visualizer/.npm/package/npm-shrinkwrap.json +++ b/packages/non-core/bundle-visualizer/.npm/package/npm-shrinkwrap.json @@ -1,79 +1,24 @@ { "dependencies": { - "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "from": "commander@>=2.0.0 <3.0.0" - }, - "d3": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/d3/-/d3-4.8.0.tgz", - "from": "d3@4.8.0" - }, - "d3-array": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.0.tgz", - "from": "d3-array@1.2.0" - }, - "d3-axis": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.6.tgz", - "from": "d3-axis@1.0.6" - }, - "d3-brush": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz", - "from": "d3-brush@1.0.4" - }, - "d3-chord": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.4.tgz", - "from": "d3-chord@1.0.4" - }, "d3-collection": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.3.tgz", - "from": "d3-collection@1.0.3" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.4.tgz", + "from": "d3-collection@1.0.4" }, "d3-color": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz", - "from": "d3-color@1.0.3" + "from": "d3-color@>=1.0.0 <2.0.0" }, "d3-dispatch": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.3.tgz", - "from": "d3-dispatch@1.0.3" - }, - "d3-drag": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.0.4.tgz", - "from": "d3-drag@1.0.4" - }, - "d3-dsv": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.5.tgz", - "from": "d3-dsv@1.0.5" + "from": "d3-dispatch@>=1.0.0 <2.0.0" }, "d3-ease": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.3.tgz", - "from": "d3-ease@1.0.3" - }, - "d3-force": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.0.6.tgz", - "from": "d3-force@1.0.6" - }, - "d3-format": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.0.tgz", - "from": "d3-format@1.2.0" - }, - "d3-geo": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.6.3.tgz", - "from": "d3-geo@1.6.3" + "from": "d3-ease@>=1.0.0 <2.0.0" }, "d3-hierarchy": { "version": "1.1.4", @@ -81,44 +26,14 @@ "from": "d3-hierarchy@1.1.4" }, "d3-interpolate": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.4.tgz", - "from": "d3-interpolate@1.1.4" + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.5.tgz", + "from": "d3-interpolate@>=1.0.0 <2.0.0" }, "d3-path": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.5.tgz", - "from": "d3-path@1.0.5" - }, - "d3-polygon": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.3.tgz", - "from": "d3-polygon@1.0.3" - }, - "d3-quadtree": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.3.tgz", - "from": "d3-quadtree@1.0.3" - }, - "d3-queue": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-3.0.5.tgz", - "from": "d3-queue@3.0.5" - }, - "d3-random": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.0.3.tgz", - "from": "d3-random@1.0.3" - }, - "d3-request": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/d3-request/-/d3-request-1.0.5.tgz", - "from": "d3-request@1.0.5" - }, - "d3-scale": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.5.tgz", - "from": "d3-scale@1.0.5" + "from": "d3-path@>=1.0.0 <2.0.0" }, "d3-selection": { "version": "1.0.5", @@ -130,60 +45,20 @@ "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.0.6.tgz", "from": "d3-shape@1.0.6" }, - "d3-time": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.6.tgz", - "from": "d3-time@1.0.6" - }, - "d3-time-format": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.0.5.tgz", - "from": "d3-time-format@2.0.5" - }, "d3-timer": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.5.tgz", - "from": "d3-timer@1.0.5" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.7.tgz", + "from": "d3-timer@>=1.0.0 <2.0.0" }, "d3-transition": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.0.4.tgz", "from": "d3-transition@1.0.4" }, - "d3-voronoi": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.2.tgz", - "from": "d3-voronoi@1.1.2" - }, - "d3-zoom": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.1.4.tgz", - "from": "d3-zoom@1.1.4" - }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "from": "graceful-readlink@>=1.0.0" - }, - "iconv-lite": { - "version": "0.4.17", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "from": "iconv-lite@>=0.4.0 <0.5.0" - }, "pretty-bytes": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz", "from": "pretty-bytes@4.0.2" - }, - "rw": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", - "from": "rw@>=1.0.0 <2.0.0" - }, - "xmlhttprequest": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", - "from": "xmlhttprequest@>=1.0.0 <2.0.0" } } } diff --git a/packages/non-core/bundle-visualizer/package.js b/packages/non-core/bundle-visualizer/package.js index dea4b19de6..da94d149e9 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.0.3', + version: '1.0.4', summary: 'Meteor bundle analysis and visualization.', documentation: 'README.md', }); @@ -9,6 +9,7 @@ Npm.depends({ "d3-shape": "1.0.6", "d3-hierarchy": "1.1.4", "d3-transition": "1.0.4", + "d3-collection": "1.0.4", "pretty-bytes": "4.0.2", });