Merge pull request #717 from nextcloud-libraries/fix/make-rolldown-compatible

fix: make configuration rolldown compatible

Author: susnux

__tests__/appconfig.spec.ts

@@ -50,8 +50,8 @@ describe('app config', () => {
 		const output = resolved.build.rollupOptions.output as OutputOptions
 		expect(typeof output?.assetFileNames).toBe('function')
 		const assetFileNames = output?.assetFileNames as ((chunkInfo: unknown) => string)
-		expect(assetFileNames({ name: 'some.css' })).toMatch(/^css\/[^/]+\.css/)
-		expect(assetFileNames({ name: 'other/file.css' })).toMatch(/^css\/[^/]+\.css/)
+		expect(assetFileNames({ names: ['some.css'] })).toMatch(/^css\/[^/]+\.css/)
+		expect(assetFileNames({ names: ['other/file.css'] })).toMatch(/^css\/[^/]+\.css/)
 	})
 
 	it('moves image assets to img/', async () => {
@@ -60,10 +60,10 @@ describe('app config', () => {
 		const output = resolved.build.rollupOptions.output as OutputOptions
 		expect(typeof output?.assetFileNames).toBe('function')
 		const assetFileNames = output?.assetFileNames as ((chunkInfo: unknown) => string)
-		expect(assetFileNames({ name: 'some.png' })).toBe('img/[name][extname]')
-		expect(assetFileNames({ name: 'some.svg' })).toBe('img/[name][extname]')
-		expect(assetFileNames({ name: 'some.jpg' })).toBe('img/[name][extname]')
-		expect(assetFileNames({ name: 'some.ico' })).toBe('img/[name][extname]')
+		expect(assetFileNames({ names: ['some.png'] })).toBe('img/[name][extname]')
+		expect(assetFileNames({ names: ['some.svg'] })).toBe('img/[name][extname]')
+		expect(assetFileNames({ names: ['some.jpg'] })).toBe('img/[name][extname]')
+		expect(assetFileNames({ names: ['some.ico'] })).toBe('img/[name][extname]')
 	})
 
 	it('moves fonts to css/fonts', async () => {
@@ -72,20 +72,20 @@ describe('app config', () => {
 		const output = resolved.build.rollupOptions.output as OutputOptions
 		expect(typeof output?.assetFileNames).toBe('function')
 		const assetFileNames = output?.assetFileNames as ((chunkInfo: unknown) => string)
-		expect(assetFileNames({ name: 'some.woff' })).toBe('css/fonts/[name][extname]')
-		expect(assetFileNames({ name: 'some.woff2' })).toBe('css/fonts/[name][extname]')
-		expect(assetFileNames({ name: 'some.otf' })).toBe('css/fonts/[name][extname]')
-		expect(assetFileNames({ name: 'some.ttf' })).toBe('css/fonts/[name][extname]')
+		expect(assetFileNames({ names: ['some.woff'] })).toBe('css/fonts/[name][extname]')
+		expect(assetFileNames({ names: ['some.woff2'] })).toBe('css/fonts/[name][extname]')
+		expect(assetFileNames({ names: ['some.otf'] })).toBe('css/fonts/[name][extname]')
+		expect(assetFileNames({ names: ['some.ttf'] })).toBe('css/fonts/[name][extname]')
 	})
 
 	it('allow custom asset names', async () => {
-		const resolved = await createConfig('build', 'development', { assetFileNames: (({ name }) => name === 'main.png' ? 'img/main.png' : undefined) as never })
+		const resolved = await createConfig('build', 'development', { assetFileNames: ({ names }) => names[0] === 'main.png' ? 'img/main.png' : undefined })
 
 		const output = resolved.build.rollupOptions.output as OutputOptions
 		expect(typeof output?.assetFileNames).toBe('function')
 		const assetFileNames = output?.assetFileNames as ((chunkInfo: unknown) => string)
-		expect(assetFileNames({ name: 'main.png' })).toBe('img/main.png')
-		expect(assetFileNames({ name: 'foo.png' })).toBe('img/[name][extname]')
+		expect(assetFileNames({ names: ['main.png'] })).toBe('img/main.png')
+		expect(assetFileNames({ names: ['foo.png'] })).toBe('img/[name][extname]')
 	})
 
 	it('extracts CSS by default with CSS entry points', async () => {

lib/appConfig.ts

@@ -1,6 +1,5 @@
 /**
  * SPDX-FileCopyrightText: 2023 Ferdinand Thiessen <opensource@fthiessen.de>
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
@@ -12,6 +11,7 @@ import { readFileSync } from 'node:fs'
 import { relative } from 'node:path'
 import { cwd } from 'node:process'
 import { mergeConfig } from 'vite'
+import * as vite from 'vite'
 import { createBaseConfig } from './baseConfig.js'
 import { findAppinfo } from './utils/appinfo.js'
 
@@ -223,7 +223,8 @@ export const createAppConfig = (entries: { [entryAlias: string]: string }, optio
 									}
 								}
 
-								const extType = assetInfo.name.split('.').pop()
+								const [name] = assetInfo.names
+								const extType = name.split('.').pop()
 								if (/png|jpe?g|svg|gif|tiff|bmp|ico/i.test(extType)) {
 									return 'img/[name][extname]'
 								} else if (/css/i.test(extType)) {
@@ -243,9 +244,19 @@ export const createAppConfig = (entries: { [entryAlias: string]: string }, optio
 							chunkFileNames: () => {
 								return 'js/[name]-[hash].chunk.mjs'
 							},
-							manualChunks: {
-								...(options?.coreJS ? { polyfill: ['core-js'] } : {}),
-							},
+							...(
+								options?.coreJS
+									? (
+										'rolldownVite' in vite
+											? {
+												advancedChunks: {
+													groups: [{ name: 'polyfill', test: /core-js/ }],
+												},
+											}
+											: { polyfill: ['core-js'] }
+									)
+									: {}
+							),
 						},
 					},
 				},

lib/baseConfig.ts

@@ -57,7 +57,7 @@ export interface BaseOptions {
 	 * but if returns undefined, then this config defaults is be used.
 	 *
 	 * @example Move CSS styles to `styles/style.css` instead of the default `css/[entrypoint-name].css`:
-	 *          (chunkInfo) => chunkInfo.name.endsWith('.css') ? 'styles/style.css' : undefined
+	 *          (chunkInfo) => chunkInfo.names[0].endsWith('.css') ? 'styles/style.css' : undefined
 	 */
 	assetFileNames?: (chunkInfo: Rollup.PreRenderedAsset) => string | undefined,
 	/**

lib/libConfig.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { LibraryFormats, UserConfig, UserConfigFn, BuildOptions, Plugin } from 'vite'
+import type { LibraryFormats, UserConfig, UserConfigFn, BuildOptions, Plugin, Rollup } from 'vite'
 import type { BaseOptions } from './baseConfig.js'
 
 import { mergeConfig } from 'vite'
@@ -108,7 +108,7 @@ export const createLibConfig = (entries: { [entryAlias: string]: string }, optio
 			// Make sure we get a user config and not a promise or a user config function
 			const userConfig = await Promise.resolve(typeof options.config === 'function' ? options.config(env) : options.config)
 
-			const assetFileNames = (assetInfo) => {
+			const assetFileNames = (assetInfo: Rollup.PreRenderedAsset) => {
 				// Allow to customize the asset file names
 				if (options.assetFileNames) {
 					const customName = options.assetFileNames(assetInfo)
@@ -117,7 +117,8 @@ export const createLibConfig = (entries: { [entryAlias: string]: string }, optio
 					}
 				}
 
-				const extType = assetInfo.name.split('.').pop()
+				const [name] = assetInfo.names
+				const extType = name.split('.').pop()
 				if (!options.inlineCSS && /css/i.test(extType)) {
 					return '[name].css'
 				}

lib/plugins/CSSEntryPoints.ts

@@ -1,6 +1,5 @@
 /**
  * SPDX-FileCopyrightText: 2024 Ferdinand Thiessen <opensource@fthiessen.de>
- *
  * SPDX-License-Identifier: MIT
  */
 
@@ -44,7 +43,8 @@ export function CSSEntryPointsPlugin(options?: CSSEntryPointsPluginOptions) {
 					// If the original assets name option is a function we need to call it otherwise just use the template string
 					const name = typeof config === 'function' ? config(info) : config
 					// Only handle CSS files not extracted by this plugin
-					if (info.name.endsWith('.css') && !String(info.source).startsWith('/* extracted by css-entry-points-plugin */')) {
+					const [assetName] = info.names
+					if (assetName.endsWith('.css') && !String(info.source).startsWith('/* extracted by css-entry-points-plugin */')) {
 						// The new name should have the same path but instead of the .css extension it is .chunk.css
 						return name.replace(/(.css|.\[ext\]|\[extname\])$/, '.chunk.css')
 					}