test: code coverange

Author: cap-Bernardito

src/index.js

@@ -26,7 +26,7 @@ import {
 } from './utils';
 
 export default function loader(content, map, meta) {
-  const options = getOptions(this) || {};
+  const options = getOptions(this);
 
   validateOptions(schema, options, {
     name: 'CSS Loader',

src/plugins/postcss-import-parser.js

@@ -50,7 +50,7 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
       if (nodes[0].type === 'string') {
         isStringValue = true;
         url = nodes[0].value;
-      } else if (nodes[0].type === 'function') {
+      } else {
         // Invalid function - `@import nourl(test.css);`
         if (nodes[0].value.toLowerCase() !== 'url') {
           result.warn(`Unable to find uri in "${atRule.toString()}"`, {

src/plugins/postcss-url-parser.js

@@ -172,10 +172,9 @@ export default postcss.plugin(pluginName, (options) => (css, result) => {
       const { node, url, needQuotes, isStringValue } = rule;
       const splittedUrl = url.split(/(\?)?#/);
       const [urlWithoutHash, singleQuery, hashValue] = splittedUrl;
-      const hash =
-        singleQuery || hashValue
-          ? `${singleQuery ? '?' : ''}${hashValue ? `#${hashValue}` : ''}`
-          : '';
+
+      let hash = singleQuery ? '?' : '';
+      hash += hashValue ? `#${hashValue}` : '';
 
       let normalizedUrl = normalizeUrl(
         urlWithoutHash,

test/__snapshots__/import-option.test.js.snap

@@ -313,6 +313,68 @@ Array [
 
 exports[`"import" option should respect style field in package.json: warnings 1`] = `Array []`;
 
+exports[`"import" option should work resolve order: local -> node_modules -> alias: errors 1`] = `Array []`;
+
+exports[`"import" option should work resolve order: local -> node_modules -> alias: module 1`] = `
+"// Imports
+import ___CSS_LOADER_API_IMPORT___ from \\"../../../src/runtime/api.js\\";
+import ___CSS_LOADER_AT_RULE_IMPORT_0___ from \\"-!../../../src/index.js??[ident]!./test.css\\";
+import ___CSS_LOADER_AT_RULE_IMPORT_1___ from \\"-!../../../src/index.js??[ident]!./issue-683.css\\";
+import ___CSS_LOADER_AT_RULE_IMPORT_2___ from \\"-!../../../src/index.js??[ident]!./node_modules/package/tilde.css\\";
+var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(false);
+___CSS_LOADER_EXPORT___.i(___CSS_LOADER_AT_RULE_IMPORT_0___);
+___CSS_LOADER_EXPORT___.i(___CSS_LOADER_AT_RULE_IMPORT_1___);
+___CSS_LOADER_EXPORT___.i(___CSS_LOADER_AT_RULE_IMPORT_2___);
+// Module
+___CSS_LOADER_EXPORT___.push([module.id, \\"\\\\n\\", \\"\\"]);
+// Exports
+export default ___CSS_LOADER_EXPORT___;
+"
+`;
+
+exports[`"import" option should work resolve order: local -> node_modules -> alias: result 1`] = `
+Array [
+  Array [
+    "../../src/index.js?[ident]!./import/test.css",
+    ".test {
+  a: a;
+}
+",
+    "",
+  ],
+  Array [
+    "../../src/index.js?[ident]!./import/node_modules/issue-683/test.css",
+    ".test {
+  color: coral;
+}
+",
+    "",
+  ],
+  Array [
+    "../../src/index.js?[ident]!./import/issue-683.css",
+    "
+",
+    "",
+  ],
+  Array [
+    "../../src/index.js?[ident]!./import/node_modules/package/tilde.css",
+    ".tilde {
+  color: yellow;
+}
+",
+    "",
+  ],
+  Array [
+    "./import/import-order.css",
+    "
+",
+    "",
+  ],
+]
+`;
+
+exports[`"import" option should work resolve order: local -> node_modules -> alias: warnings 1`] = `Array []`;
+
 exports[`"import" option should work when "Function": errors 1`] = `Array []`;
 
 exports[`"import" option should work when "Function": module 1`] = `

test/fixtures/import/import-order.css

@@ -0,0 +1,3 @@
+@import "test";
+@import "issue-683";
+@import "aliasesPackage";

test/fixtures/import/import-order.js

@@ -0,0 +1,5 @@
+import css from './import-order.css';
+
+__export__ = css;
+
+export default css;

test/fixtures/import/node_modules/issue-683/package.json

@@ -35,6 +35,10 @@ export default (fixture, loaderOptions = {}, config = {}) => {
     },
     resolve: {
       alias: {
+        aliasesPackage: path.resolve(
+          __dirname,
+          '../fixtures/import/node_modules/package/tilde.css'
+        ),
         aliasesImg: path.resolve(__dirname, '../fixtures/url'),
         aliasesImport: path.resolve(__dirname, '../fixtures/import'),
         aliasesComposes: path.resolve(