Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 6 additions & 22 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -218,24 +218,12 @@ function parseGlob(atRule, options, imports) {
function addIgnoredAtRulesOnTop(styles, ignoredAtRules) {
var i = ignoredAtRules.length
if (i) {
var first = styles.first

while (i--) {
var ignoredAtRule = ignoredAtRules[i][0]
ignoredAtRule.params = ignoredAtRules[i][1].fullUri +
(ignoredAtRules[i][1].media ? " " + ignoredAtRules[i][1].media : "")

// keep ast ref
ignoredAtRule.parent = styles

// don't use prepend() to avoid weird behavior of normalize()
styles.nodes.unshift(ignoredAtRule)
}

// separate remote import a little with others rules if no newlines already
if (first &&
first.raws.before.indexOf("\n") === -1) {
first.raws.before = "\n\n" + first.raws.before
styles.prepend(ignoredAtRule)
}
}
}
Expand Down Expand Up @@ -272,7 +260,7 @@ function readAtImport(
state.ignoredAtRules.push([ atRule, parsedAtImport ])

// detach
detach(atRule)
atRule.remove()

return Promise.resolve()
}
Expand All @@ -292,7 +280,7 @@ function readAtImport(
state.importedFiles[resolvedFilename] &&
state.importedFiles[resolvedFilename][media]
) {
detach(atRule)
atRule.remove()
return Promise.resolve()
}

Expand Down Expand Up @@ -352,7 +340,7 @@ function readImportedContent(

if (fileContent.trim() === "") {
result.warn(resolvedFilename + " is empty", { node: atRule })
detach(atRule)
atRule.remove()
return Promise.resolve()
}

Expand All @@ -361,7 +349,7 @@ function readImportedContent(
state.hashFiles[fileContent] &&
state.hashFiles[fileContent][media]
) {
detach(atRule)
atRule.remove()
return Promise.resolve()
}

Expand Down Expand Up @@ -455,7 +443,7 @@ function insertRules(atRule, parsedAtImport, newStyles) {
// replace atRule by imported nodes
var nodes = atRule.parent.nodes
nodes.splice.apply(nodes, [ nodes.indexOf(atRule), 0 ].concat(newNodes))
detach(atRule)
atRule.remove()
}

/**
Expand Down Expand Up @@ -555,10 +543,6 @@ function addInputToPath(options) {
}
}

function detach(node) {
node.parent.nodes.splice(node.parent.nodes.indexOf(node), 1)
}

module.exports = postcss.plugin(
"postcss-import",
AtImport
Expand Down
14 changes: 14 additions & 0 deletions test/fixtures/ignore.expected.css
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
@import "http://css" (min-width: 25em);

@import "http://css-screen" (min-width: 25em) and screen;

@import "http://css";

@import "https://css";

@import 'http://css';

@import 'https://css';

@import url(http://css);

@import url(https://css);

@import url("http://css");

@import url("https://css");

@import url('http://css');

@import url('https://css');

@import url("//css");

@import url('//css');

@import url(//css);

@media (min-width: 25em){
Expand Down