3.1.0

.tape.js

@@ -9,7 +9,7 @@ module.exports = {
 				message: /^Failed to find 'import1.css'/
 			}
 		},
-		'02-touch/test:enabled': {
+		'02-touch/test:true': {
 			message: 'supports { touch: true } with missing import usage',
 			options: {
 				touch: true
@@ -23,7 +23,19 @@ module.exports = {
 			)
 		},
 		'03-glob/test': {
-			message: 'supports { glob: true } usage'
+			message: 'supports { glob: true } usage',
+			options: {
+				glob: true
+			}
+		},
+		'03-glob/test:false': {
+			message: 'supports { glob: false } usage',
+			options: {
+				glob: false
+			},
+			error: {
+				message: /^Failed to find 'dir1\/\*\.css'/
+			}
 		},
 		'04-resolve/test': {
 			message: 'supports { resolve: customFn } usage',
@@ -34,6 +46,12 @@ module.exports = {
 				// Otherwise, use the regular resolve
 				resolve(id, base, options)
 			}
+		},
+		'05-pcss/test': {
+			message: 'supports { extension: ".pcss" } usage',
+			options: {
+				extension: '.pcss'
+			}
 		}
 	}
 };

CHANGELOG.md

@@ -1,11 +1,17 @@
+### 3.1.0 (December 20, 2016)
+
+- Added: Tests for glob, extension
+- Changed: Default `prefix` is now empty (`""`)
+- Removed: JSCS validation
+
 ### 3.0.1 (December 14, 2016)
 
-- Added: lib directory to package
+- Added: `lib` directory to the package
 
 ### 3.0.0 (December 14, 2016)
 
 - Added: Plugin refactoring as an alternative version of postcss-import
-- Updated: boilerplate conventions (Node v6.9.1 LTS)
+- Updated: Boilerplate conventions (Node v6.9.1 LTS)
 
 ### 2.1.0 (October 18, 2016)
 

README.md

@@ -82,9 +82,9 @@ Whether similar files (based on the same content) will be skipped.
 #### `prefix`
 
 Type: `String`  
-Default: `"_"`
+Default: `""`
 
-Leading characters conditionally prepended to imports which are not found without them.
+Leading characters conditionally prepended to imports which are not found without them. For [Sass]-like, use `"_"`.
 
 #### `glob`
 

index.js

@@ -11,7 +11,7 @@ module.exports = postcss.plugin(
 			{
 				glob: true,
 				extension: '.css',
-				prefix: '_',
+				prefix: '',
 				touch: false
 			},
 			opts,

lib/resolve-id.js

@@ -28,22 +28,33 @@ module.exports = (id, base, options) => resolveId(id, base, options).catch(
 	}
 ).catch(
 	(error) => {
+		let altId = id;
+
 		// when the prefix option is truthy
 		if (options.prefix) {
 			// prefixed file path matcher
 			const prefixMatch = RegExp(`(${ escapeRegExp(path.sep) })?(${ escapeRegExp(options.prefix) })?([^${ escapeRegExp(path.sep) }]+)$`);
 
 			// prefixed file path
-			const prefixedId = id.replace(prefixMatch, `$1${ options.prefix }$3`);
+			altId = altId.replace(prefixMatch, `$1${ options.prefix }$3`);
+		}
+
+		// when the prefix option is truthy
+		if (options.extension) {
+			// prefixed file path matcher
+			const extensionMatch = RegExp(`(${ escapeRegExp(options.extension) })?$`);
 
-			if (prefixedId !== id) {
-				// resolve prefixed file path
-				return resolveId(prefixedId, base, options).catch(
-					() => {
-						throw error;
-					}
-				);
-			}
+			// prefixed file path
+			altId = altId.replace(extensionMatch, options.extension);
+		}
+
+		if (altId !== id) {
+			// resolve prefixed file path
+			return resolveId(altId, base, options).catch(
+				() => {
+					throw error;
+				}
+			);
 		}
 
 		throw error;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-partial-import",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Inline sugary @import statements in CSS",
   "author": "Jonathan Neal <jonathantneal@hotmail.com>",
   "license": "CC0-1.0",
@@ -13,7 +13,7 @@
     "lib"
   ],
   "scripts": {
-    "lint": "echint && eslint *.js && jscs *.js",
+    "lint": "echint && eslint *.js lib/*.js",
     "prepublish": "npm test",
     "tape": "postcss-tape",
     "test": "npm run lint && postcss-tape"
@@ -30,8 +30,6 @@
     "echint-config-dev": "1.0.0",
     "eslint": "^3.12.1",
     "eslint-config-dev": "1.0.0",
-    "jscs": "^3.0.7",
-    "jscs-config-dev": "1.0.1",
     "normalize-css": "^2.3.1",
     "postcss-tape": "1.3.0"
   },
@@ -42,11 +40,11 @@
     "extends": "dev",
     "parserOptions": {
       "sourceType": "module"
+    },
+    "rules": {
+      "no-nested-ternary": [0]
     }
   },
-  "jscsConfig": {
-    "preset": "dev"
-  },
   "keywords": [
     "postcss",
     "css",

test/03-glob/test.false.css

@@ -0,0 +1 @@
+@import "dir1/*.css"

test/03-glob/test.false.expect.css

@@ -0,0 +1 @@
+@import "dir1/*.css"

test/05-pcss/dir1/dir2/import3.pcss

@@ -0,0 +1,3 @@
+a {
+	color: red;
+}

test/05-pcss/dir1/import1.pcss

@@ -0,0 +1 @@
+@import "import2";

test/05-pcss/dir1/import2.pcss

@@ -0,0 +1 @@
+@import "dir2/import3";

test/05-pcss/test.css

@@ -0,0 +1 @@
+@import "dir1/import1";

test/05-pcss/test.expect.css

@@ -0,0 +1,3 @@
+a {
+	color: red;
+}