mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-22 13:45:18 +00:00
fix(vite): remove postcss-url
and duplicate postcss-import
(#23861)
This commit is contained in:
parent
995cba84a2
commit
8e44395d7a
@ -60,7 +60,6 @@
|
|||||||
"hookable": "^5.5.3",
|
"hookable": "^5.5.3",
|
||||||
"pathe": "^1.1.1",
|
"pathe": "^1.1.1",
|
||||||
"pkg-types": "^1.0.3",
|
"pkg-types": "^1.0.3",
|
||||||
"postcss-import-resolver": "^2.0.0",
|
|
||||||
"std-env": "^3.4.3",
|
"std-env": "^3.4.3",
|
||||||
"ufo": "^1.3.1",
|
"ufo": "^1.3.1",
|
||||||
"unimport": "^3.4.0",
|
"unimport": "^3.4.0",
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
import { defu } from 'defu'
|
|
||||||
import createResolver from 'postcss-import-resolver'
|
|
||||||
import { defineUntypedSchema } from 'untyped'
|
import { defineUntypedSchema } from 'untyped'
|
||||||
|
|
||||||
export default defineUntypedSchema({
|
export default defineUntypedSchema({
|
||||||
@ -11,29 +9,6 @@ export default defineUntypedSchema({
|
|||||||
* @type {Record<string, any>}
|
* @type {Record<string, any>}
|
||||||
*/
|
*/
|
||||||
plugins: {
|
plugins: {
|
||||||
/**
|
|
||||||
* https://github.com/postcss/postcss-import
|
|
||||||
*/
|
|
||||||
'postcss-import': {
|
|
||||||
$resolve: async (val, get) => val !== false
|
|
||||||
? defu(val || {}, {
|
|
||||||
resolve: createResolver({
|
|
||||||
alias: { ...(await get('alias')) },
|
|
||||||
modules: [
|
|
||||||
await get('srcDir'),
|
|
||||||
await get('rootDir'),
|
|
||||||
...(await get('modulesDir'))
|
|
||||||
]
|
|
||||||
})
|
|
||||||
})
|
|
||||||
: val
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* https://github.com/postcss/postcss-url
|
|
||||||
*/
|
|
||||||
'postcss-url': {},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* https://github.com/postcss/autoprefixer
|
* https://github.com/postcss/autoprefixer
|
||||||
*/
|
*/
|
||||||
|
@ -51,8 +51,6 @@
|
|||||||
"perfect-debounce": "^1.0.0",
|
"perfect-debounce": "^1.0.0",
|
||||||
"pkg-types": "^1.0.3",
|
"pkg-types": "^1.0.3",
|
||||||
"postcss": "^8.4.31",
|
"postcss": "^8.4.31",
|
||||||
"postcss-import": "^15.1.0",
|
|
||||||
"postcss-url": "^10.1.3",
|
|
||||||
"rollup-plugin-visualizer": "^5.9.2",
|
"rollup-plugin-visualizer": "^5.9.2",
|
||||||
"std-env": "^3.4.3",
|
"std-env": "^3.4.3",
|
||||||
"strip-literal": "^1.3.0",
|
"strip-literal": "^1.3.0",
|
||||||
|
@ -45,6 +45,7 @@
|
|||||||
"pify": "^6.1.0",
|
"pify": "^6.1.0",
|
||||||
"postcss": "^8.4.31",
|
"postcss": "^8.4.31",
|
||||||
"postcss-import": "^15.1.0",
|
"postcss-import": "^15.1.0",
|
||||||
|
"postcss-import-resolver": "^2.0.0",
|
||||||
"postcss-loader": "^7.3.3",
|
"postcss-loader": "^7.3.3",
|
||||||
"postcss-url": "^10.1.3",
|
"postcss-url": "^10.1.3",
|
||||||
"pug-plain-loader": "^1.1.0",
|
"pug-plain-loader": "^1.1.0",
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
import createResolver from 'postcss-import-resolver'
|
||||||
import { createCommonJS } from 'mlly'
|
import { createCommonJS } from 'mlly'
|
||||||
import { requireModule } from '@nuxt/kit'
|
import { requireModule } from '@nuxt/kit'
|
||||||
import type { Nuxt } from '@nuxt/schema'
|
import type { Nuxt } from '@nuxt/schema'
|
||||||
@ -39,6 +40,22 @@ export const getPostcssConfig = (nuxt: Nuxt) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const postcssOptions = defu({}, nuxt.options.postcss, {
|
const postcssOptions = defu({}, nuxt.options.postcss, {
|
||||||
|
plugins: {
|
||||||
|
/**
|
||||||
|
* https://github.com/postcss/postcss-import
|
||||||
|
*/
|
||||||
|
'postcss-import': {
|
||||||
|
resolve: createResolver({
|
||||||
|
alias: { ...nuxt.options.alias },
|
||||||
|
modules: nuxt.options.modulesDir
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* https://github.com/postcss/postcss-url
|
||||||
|
*/
|
||||||
|
'postcss-url': {}
|
||||||
|
},
|
||||||
sourceMap: nuxt.options.webpack.cssSourceMap,
|
sourceMap: nuxt.options.webpack.cssSourceMap,
|
||||||
// Array, String or Function
|
// Array, String or Function
|
||||||
order: 'autoprefixerAndCssnanoLast'
|
order: 'autoprefixerAndCssnanoLast'
|
||||||
|
@ -438,9 +438,6 @@ importers:
|
|||||||
pkg-types:
|
pkg-types:
|
||||||
specifier: ^1.0.3
|
specifier: ^1.0.3
|
||||||
version: 1.0.3
|
version: 1.0.3
|
||||||
postcss-import-resolver:
|
|
||||||
specifier: ^2.0.0
|
|
||||||
version: 2.0.0
|
|
||||||
std-env:
|
std-env:
|
||||||
specifier: ^3.4.3
|
specifier: ^3.4.3
|
||||||
version: 3.4.3
|
version: 3.4.3
|
||||||
@ -644,12 +641,6 @@ importers:
|
|||||||
postcss:
|
postcss:
|
||||||
specifier: ^8.4.31
|
specifier: ^8.4.31
|
||||||
version: 8.4.31
|
version: 8.4.31
|
||||||
postcss-import:
|
|
||||||
specifier: ^15.1.0
|
|
||||||
version: 15.1.0(postcss@8.4.31)
|
|
||||||
postcss-url:
|
|
||||||
specifier: ^10.1.3
|
|
||||||
version: 10.1.3(postcss@8.4.31)
|
|
||||||
rollup-plugin-visualizer:
|
rollup-plugin-visualizer:
|
||||||
specifier: ^5.9.2
|
specifier: ^5.9.2
|
||||||
version: 5.9.2(rollup@3.29.4)
|
version: 5.9.2(rollup@3.29.4)
|
||||||
@ -774,6 +765,9 @@ importers:
|
|||||||
postcss-import:
|
postcss-import:
|
||||||
specifier: ^15.1.0
|
specifier: ^15.1.0
|
||||||
version: 15.1.0(postcss@8.4.31)
|
version: 15.1.0(postcss@8.4.31)
|
||||||
|
postcss-import-resolver:
|
||||||
|
specifier: ^2.0.0
|
||||||
|
version: 2.0.0
|
||||||
postcss-loader:
|
postcss-loader:
|
||||||
specifier: ^7.3.3
|
specifier: ^7.3.3
|
||||||
version: 7.3.3(postcss@8.4.31)(typescript@5.2.2)(webpack@5.89.0)
|
version: 7.3.3(postcss@8.4.31)(typescript@5.2.2)(webpack@5.89.0)
|
||||||
|
Loading…
Reference in New Issue
Block a user