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.

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

fix(vite): respect rollupoptions specified output dir in lib mode (#2231) #2231

Merged
merged 4 commits into from
Feb 22, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 27 additions & 3 deletions packages/vite/src/modes/global/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,33 @@ export function GlobalModeBuildPlugin(ctx: UnocssPluginContext<VitePluginConfig>
}
},
async configResolved(config) {
const distDir = resolve(config.root, config.build.outDir)
cssPostPlugins.set(distDir, config.plugins.find(i => i.name === 'vite:css-post'))
cssPlugins.set(distDir, config.plugins.find(i => i.name === 'vite:css'))
const distDirs = [
resolve(config.root, config.build.outDir),
]

// for Vite lib more with rollupOptions.output, #2231
if (config.build.rollupOptions.output) {
const outputOptions = config.build.rollupOptions.output
if (Array.isArray(outputOptions)) {
distDirs.push(
...outputOptions.map(option => option.dir).filter(Boolean) as string[],
)
}
else {
if (outputOptions.dir)
distDirs.push(outputOptions.dir)
}
}

const cssPostPlugin = config.plugins.find(i => i.name === 'vite:css-post')
const cssPlugin = config.plugins.find(i => i.name === 'vite:css')

if (cssPostPlugin)
distDirs.forEach(dir => cssPostPlugins.set(dir, cssPostPlugin))

if (cssPlugin)
distDirs.forEach(dir => cssPlugins.set(dir, cssPlugin))

await ready
},
// we inject a hash to chunk before the dist hash calculation to make sure
Expand Down
32 changes: 32 additions & 0 deletions test/fixtures.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,38 @@ describe.concurrent('fixtures', () => {
}
})

it('vite lib rollupOptions', async () => {
const root = resolve(__dirname, 'fixtures/vite-lib-rollupoptions')
await fs.emptyDir(join(root, 'dist'))
await build({
root,
logLevel: 'warn',
})

const files = await fg(['dist/**/index.js'], { cwd: root, absolute: true })
expect(files).toHaveLength(2)

for (const path of files) {
const code = await fs.readFile(path, 'utf-8')
// basic
expect(code).contains('.text-red')
// transformer-variant-group
expect(code).contains('.text-sm')
// transformer-compile-class
expect(code).contains('.uno-tacwqa')
// transformer-directives
expect(code).not.contains('@apply')
expect(code).not.contains('--at-apply')
expect(code).contains('gap:.25rem')
expect(code).contains('gap:.5rem')

// transformer-variant-group
expect(code).contains('text-sm')
// transformer-compile-class
expect(code).contains('uno-tacwqa')
}
})

it('vue cli 4', async () => {
const root = resolve(__dirname, '../examples/vue-cli4')
await fs.emptyDir(join(root, 'dist'))
Expand Down
12 changes: 12 additions & 0 deletions test/fixtures/vite-lib-rollupoptions/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.ts"></script>
</body>
</html>
8 changes: 8 additions & 0 deletions test/fixtures/vite-lib-rollupoptions/lib/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.foo {
@apply flex;
@apply gap-1;
}

.bar {
--at-apply: gap-2;
}
19 changes: 19 additions & 0 deletions test/fixtures/vite-lib-rollupoptions/lib/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import '@unocss/reset/tailwind.css'
import './main.css'
import 'uno.css'

// @unocss-include
const html = String.raw
document.querySelector<HTMLDivElement>('#app')!.innerHTML = html`
<div class="font-sans p4">
<p class="text-red">
Red
</p>
<p class=":uno: text-green text-xl">
Green Large
</p>
<p class="text-(blue sm)">
Blue Small
</p>
</div>
`
8 changes: 8 additions & 0 deletions test/fixtures/vite-lib-rollupoptions/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"version": "0.0.0",
"private": true,
"scripts": {
"dev": "vite",
"build": "vite build"
}
}
22 changes: 22 additions & 0 deletions test/fixtures/vite-lib-rollupoptions/unocss.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import {
defineConfig,
presetAttributify,
presetIcons,
presetUno,
transformerCompileClass,
transformerDirectives,
transformerVariantGroup,
} from 'unocss'

export default defineConfig({
presets: [
presetAttributify(),
presetUno(),
presetIcons(),
],
transformers: [
transformerCompileClass(),
transformerVariantGroup(),
transformerDirectives(),
],
})
56 changes: 56 additions & 0 deletions test/fixtures/vite-lib-rollupoptions/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import { resolve } from 'path'
import { defineConfig } from 'vite'
import UnoCSS from '@unocss/vite'

export default defineConfig({
build: {
lib: {
entry: resolve(__dirname, 'lib/main.ts'),
name: 'MyLib',
},
rollupOptions: {
external: ['vue'],
output: [
{
dir: resolve(__dirname, 'dist/es'),
format: 'es',
entryFileNames: 'index.mjs',
assetFileNames: 'assets/mylib.css',
preserveModules: true,
preserveModulesRoot: resolve(__dirname, './'),
},
{
dir: resolve(__dirname, 'dist/cjs'),
format: 'cjs',
entryFileNames: 'index.cjs',
assetFileNames: 'assets/mylib.css',
preserveModules: true,
preserveModulesRoot: resolve(__dirname, './'),
},
{
globals: {
vue: 'Vue',
},
dir: resolve(__dirname, 'dist/umd'),
format: 'umd',
entryFileNames: 'index.js',
name: 'MyLib',
},
{
globals: {
vue: 'Vue',
},
dir: resolve(__dirname, 'dist/iife'),
format: 'iife',
entryFileNames: 'index.js',
name: 'MyLib',
},
],
},
sourcemap: true,
cssCodeSplit: true,
},
plugins: [
UnoCSS(),
],
})