From fcbd398ab7e1dc970d296946b8910bea14fddc62 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 29 Mar 2017 18:45:32 -0400 Subject: [PATCH] Appending module identifier extensions should not match directories. This logic needed to change not only in meteor/tools/isobuild/resolver.js but also in the runtime module system: https://github.com/benjamn/install/commit/cfcc42272575348239685882a2a406272203b094 Fixes #8539. --- packages/modules-runtime/.npm/package/npm-shrinkwrap.json | 6 +++--- packages/modules-runtime/package.js | 4 ++-- tools/isobuild/resolver.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json index 4c74093233..5186366969 100644 --- a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json +++ b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json @@ -1,9 +1,9 @@ { "dependencies": { "install": { - "version": "0.8.7", - "resolved": "https://registry.npmjs.org/install/-/install-0.8.7.tgz", - "from": "install@0.8.7" + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/install/-/install-0.8.8.tgz", + "from": "install@0.8.8" } } } diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 667414d5ec..bf651c454f 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,13 +1,13 @@ Package.describe({ name: "modules-runtime", - version: "0.7.9", + version: "0.7.10", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" }); Npm.depends({ - install: "0.8.7" + install: "0.8.8" }); Package.onUse(function(api) { diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js index 3737b60429..499178f703 100644 --- a/tools/isobuild/resolver.js +++ b/tools/isobuild/resolver.js @@ -176,7 +176,7 @@ export default class Resolver { this.extensions.some(ext => { const pathWithExt = path + ext; const stat = this.statOrNull(pathWithExt); - if (stat) { + if (stat && ! stat.isDirectory()) { return result = { path: pathWithExt, stat }; } });