Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove postcss imports #456

Merged
merged 1 commit into from May 6, 2021
Merged

remove postcss imports #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 23 additions & 21 deletions index.js
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ function AtImport(options) {

return {
postcssPlugin: "postcss-import",
Once(styles, { result, atRule }) {
Once(styles, { result, atRule, postcss }) {
const state = {
importedFiles: {},
hashFiles: {},
Expand Down Expand Up @@ -265,28 +265,30 @@ function AtImport(options) {
if (state.hashFiles[content] && state.hashFiles[content][media])
return

return processContent(result, content, filename, options).then(
importedResult => {
const styles = importedResult.root
result.messages = result.messages.concat(
importedResult.messages
)

if (options.skipDuplicates) {
const hasImport = styles.some(child => {
return child.type === "atrule" && child.name === "import"
})
if (!hasImport) {
// save hash files to skip them next time
if (!state.hashFiles[content]) state.hashFiles[content] = {}
state.hashFiles[content][media] = true
}
return processContent(
result,
content,
filename,
options,
postcss
).then(importedResult => {
const styles = importedResult.root
result.messages = result.messages.concat(importedResult.messages)

if (options.skipDuplicates) {
const hasImport = styles.some(child => {
return child.type === "atrule" && child.name === "import"
})
if (!hasImport) {
// save hash files to skip them next time
if (!state.hashFiles[content]) state.hashFiles[content] = {}
state.hashFiles[content][media] = true
}

// recursion: import @import from imported file
return parseStyles(result, styles, options, state, media)
}
)

// recursion: import @import from imported file
return parseStyles(result, styles, options, state, media)
})
}
)
}
Expand Down
20 changes: 12 additions & 8 deletions lib/process-content.js
View file
Open in desktop
Expand Up @@ -3,13 +3,16 @@
// builtin tooling
const path = require("path")

// external tooling
const postcss = require("postcss")

// placeholder tooling
let sugarss

module.exports = function processContent(result, content, filename, options) {
module.exports = function processContent(
result,
content,
filename,
options,
postcss
) {
const { plugins } = options
const ext = path.extname(filename)

Expand All @@ -22,7 +25,8 @@ module.exports = function processContent(result, content, filename, options) {
sugarss = require("sugarss")
} catch {} // Ignore
}
if (sugarss) return runPostcss(content, filename, plugins, [sugarss])
if (sugarss)
return runPostcss(postcss, content, filename, plugins, [sugarss])
}

// Syntax support:
Expand All @@ -35,10 +39,10 @@ module.exports = function processContent(result, content, filename, options) {
// Try the default as a last resort:
parserList.push(null)

return runPostcss(content, filename, plugins, parserList)
return runPostcss(postcss, content, filename, plugins, parserList)
}

function runPostcss(content, filename, plugins, parsers, index) {
function runPostcss(postcss, content, filename, plugins, parsers, index) {
if (!index) index = 0
return postcss(plugins)
.process(content, {
Expand All @@ -50,6 +54,6 @@ function runPostcss(content, filename, plugins, parsers, index) {
index++
// If there are no parsers left, throw it
if (index === parsers.length) throw err
return runPostcss(content, filename, plugins, parsers, index)
return runPostcss(postcss, content, filename, plugins, parsers, index)
})
}