Merge pull request #146 from postcss/remove-glob

Remove glob support
postcss · Jan 9, 2016 · 74879af · 74879af
2 parents 4fb0c2b + b6ae424
commit 74879af
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 83 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,19 @@ postcssImport({
 })
 ```
 
+- Removed: glob support
+([#146](https://github.com/postcss/postcss-import/pull/146))
+
+Globs can be implemented with custom `resolve` option
+
+```js
+postcssImport({
+  resolve: function(id, base) {
+    return glob.sync(path.join(base, id))
+  }
+})
+```
+
 # 7.1.3 - 2015-11-05
 
 - Fixed: ensure node 0.12 compatibility, round 2

diff --git a/README.md b/README.md
@@ -125,14 +125,6 @@ Default: `null`
 
 Function called after the import process. Take one argument (array of imported files).
 
-#### `glob`
-
-Type: `Boolean`  
-Default: `false`
-
-Set to `true` if you want @import rules to parse glob patterns.
-Files will be searched in base directory and paths specified in `path` option.
-
 #### `resolve`
 
 Type: `Function`  

diff --git a/lib/resolve-id.js b/lib/resolve-id.js
@@ -1,6 +1,5 @@
 var fs = require("fs")
 var path = require("path")
-var globby = require("globby")
 var resolve = require("resolve")
 
 var moduleDirectories = [
@@ -36,13 +35,6 @@ function resolveModule(id, opts) {
 module.exports = function(id, base, options) {
   var paths = options.path
 
-  if (options.glob) {
-    paths = [ base ].concat(paths)
-    return globby(paths.map(function(p) {
-      return path.resolve(p, id)
-    }))
-  }
-
   var resolveOpts = {
     basedir: base,
     moduleDirectory: moduleDirectories,

diff --git a/package.json b/package.json
@@ -17,7 +17,6 @@
     "index.js"
   ],
   "dependencies": {
-    "globby": "^4.0.0",
     "object-assign": "^4.0.1",
     "postcss": "^5.0.2",
     "postcss-value-parser": "^3.2.3",

diff --git a/test/fixtures/glob-base.css b/test/fixtures/glob-base.css
diff --git a/test/fixtures/glob-base.expected.css b/test/fixtures/glob-base.expected.css
diff --git a/test/fixtures/glob-missing.css b/test/fixtures/glob-missing.css
diff --git a/test/fixtures/glob-missing.expected.css b/test/fixtures/glob-missing.expected.css
diff --git a/test/fixtures/glob-resolve.css b/test/fixtures/glob-resolve.css
diff --git a/test/fixtures/glob-resolve.expected.css b/test/fixtures/glob-resolve.expected.css
diff --git a/test/fixtures/glob.css b/test/fixtures/glob.css
diff --git a/test/fixtures/glob.expected.css b/test/fixtures/glob.expected.css
diff --git a/test/glob.js b/test/glob.js