build: bundle to avoid qwik optimizer issue

See #23
wmertens · Oct 30, 2023 · 8738946 · 8738946
1 parent c11388f
commit 8738946
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/src/css.ts b/src/css.ts
@@ -1,6 +1,6 @@
 import {keyframes, StyleRule} from '@vanilla-extract/css'
 import {compile} from 'stylis'
-import {type QwikStyledComponent} from './qwik-styled'
+import {type QwikStyledComponent} from './qwik-styled.qwik'
 import {type ClassNames} from './ve-style'
 
 export const veClassRE = /^[a-zA-Z0-9_./]*[a-z0-9]{6}\d+$/

diff --git a/src/qwik-styled.ts → src/qwik-styled.qwik.ts b/src/qwik-styled.ts → src/qwik-styled.qwik.ts
diff --git a/src/qwik-styled.test.ts b/src/qwik-styled.test.ts
@@ -1,5 +1,5 @@
 import {describe, expect, it} from 'vitest'
-import {isStyled, styled} from './qwik-styled'
+import {isStyled, styled} from './qwik-styled.qwik'
 
 describe('isStyled', () => {
 	it('should detect Styled functions', () => {

diff --git a/src/ve-style.test.ts b/src/ve-style.test.ts
@@ -1,8 +1,8 @@
-import {FunctionComponent} from '@builder.io/qwik'
+import type {FunctionComponent} from '@builder.io/qwik'
 import {assertType, describe, expect, expectTypeOf, it} from 'vitest'
 import {style, styled} from './ve-style'
 import {setFileScope} from '@vanilla-extract/css/fileScope'
-import {QwikStyledComponent} from './qwik-styled'
+import {QwikStyledComponent} from './qwik-styled.qwik'
 import {veClassRE, veMultiClassRE} from './css'
 
 // Make VE happy about running in this file

diff --git a/src/ve-style.ts b/src/ve-style.ts
@@ -7,7 +7,7 @@ import {
 	QwikStyledComponent,
 	styled as realStyled,
 	Tags,
-} from './qwik-styled'
+} from './qwik-styled.qwik'
 
 // Copy of Vanilla Extract's ClassNames type
 export type ClassNames = string | Array<ClassNames>

diff --git a/vite.config.ts b/vite.config.ts
@@ -1,5 +1,5 @@
 /// <reference types="vitest" />
-import {defineConfig} from 'vite'
+import {type LibraryFormats, defineConfig} from 'vite'
 import {configDefaults} from 'vitest/config'
 import {qwikVite} from '@builder.io/qwik/optimizer'
 import pkg from './package.json'
@@ -14,12 +14,10 @@ export default defineConfig(() => {
 		build: {
 			target: 'es2020',
 			lib: {
-				entry: ['./src/index.ts', './src/qwik-styled.ts', './src/vite.ts'],
-				formats: ['es', 'cjs'],
+				entry: ['./src/index.ts', './src/qwik-styled.qwik.ts', './src/vite.ts'],
+				formats: ['es', 'cjs'] satisfies LibraryFormats[],
 				fileName: (format: string, entryName: string) =>
-					`${entryName}${entryName.includes('vite') ? '' : '.qwik'}.${
-						format === 'es' ? 'mjs' : 'cjs'
-					}`,
+					`${entryName}.${format === 'es' ? 'mjs' : 'cjs'}`,
 			},
 			rollupOptions: {
 				// externalize deps that shouldn't be bundled into the library
@@ -28,10 +26,6 @@ export default defineConfig(() => {
 					...excludeAll(dependencies),
 					...excludeAll(peerDependencies),
 				],
-				output: {
-					preserveModules: true,
-					preserveModulesRoot: 'src',
-				},
 			},
 		},
 		plugins: [qwikVite()],