Merge pull request #3120 from robhuzzey/issue3115_extInNodePath

Issue3115 ext in node path
less · Oct 20, 2017 · 8d6204c · 8d6204c
2 parents 5200a20 + 9553672
commit 8d6204c
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -291,6 +291,7 @@ module.exports = function (grunt) {
                     'test/less/*.less',
                     // Don't test NPM import, obviously 
                     '!test/less/plugin-module.less',
+                    '!test/less/import-module.less',
                     '!test/less/javascript.less', 
                     '!test/less/urls.less', 
                     '!test/less/empty.less'

diff --git a/lib/less-node/file-manager.js b/lib/less-node/file-manager.js
@@ -82,9 +82,8 @@ FileManager.prototype.loadFile = function(filename, currentDirectory, options, e
                             }
                             catch (e) {}
                         }
-                        else {
-                            fullFilename = options.ext ? self.tryAppendExtension(fullFilename, options.ext) : fullFilename;
-                        }
+
+                        fullFilename = options.ext ? self.tryAppendExtension(fullFilename, options.ext) : fullFilename;
 
                         if (self.files[fullFilename]) {
                             fulfill({ contents: self.files[fullFilename], filename: fullFilename});

diff --git a/package.json b/package.json
@@ -61,12 +61,13 @@
     "grunt-eslint": "^19.0.0",
     "grunt-saucelabs": "^9.0.0",
     "grunt-shell": "^1.3.0",
+    "import-module": "file:test/import-module",
     "jit-grunt": "^0.10.0",
     "less-plugin-clean-css": "^1.5.1",
     "performance-now": "^0.2.0",
     "phantomjs-prebuilt": "^2.1.7",
-    "promise": "^7.1.1",
     "phin": "^2.2.3",
+    "promise": "^7.1.1",
     "time-grunt": "^1.3.0"
   },
   "keywords": [

diff --git a/test/css/import-module.css b/test/css/import-module.css
@@ -0,0 +1,9 @@
+.three {
+  color: green;
+}
+.two {
+  color: blue;
+}
+.one {
+  color: red;
+}
diff --git a/test/import-module/one/1.less b/test/import-module/one/1.less
@@ -0,0 +1,3 @@
+.one {
+  color: red;
+}
diff --git a/test/import-module/one/two/2.less b/test/import-module/one/two/2.less
@@ -0,0 +1,3 @@
+.two {
+  color: blue;
+}
diff --git a/test/import-module/one/two/three/3.less b/test/import-module/one/two/three/3.less
@@ -0,0 +1,3 @@
+.three {
+  color: green;
+}
diff --git a/test/import-module/package.json b/test/import-module/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "import-module",
+  "version": "1.0.0",
+  "description": "Less files to be included in node_modules directory for testing import from node_modules",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Rob Huzzey <robert.huzzey@holidayextras.com>",
+  "license": "ISC"
+}
diff --git a/test/less/import-module.less b/test/less/import-module.less
@@ -0,0 +1,3 @@
+@import "import-module/one/two/three/3.less";
+@import "import-module/one/two/2";
+@import "import-module/one/1.less";