Fix bundler not working correctly with new folder structure.

Author: sheabunge

config/webpack-css.ts

@@ -1,5 +1,5 @@
 import path from 'path'
-import { Configuration } from 'webpack'
+import { Configuration, EntryObject } from 'webpack'
 import { Config as PostCssConfig } from 'postcss-load-config'
 import libsass from 'sass'
 import cssnano from 'cssnano'
@@ -20,21 +20,21 @@ const postcssOptions: PostCssConfig = {
 	]
 }
 
+const entriesFromFiles = (patterns: string | string[], entry: (filename: string) => string): EntryObject =>
+	Object.fromEntries(
+		glob.sync(patterns)
+			.map(filename => [entry(filename), `./${filename}`])
+	)
+
 export const cssWebpackConfig: Configuration = {
 	entry: {
-		...Object.fromEntries(
-			glob.sync(['src/css/*.scss', '!src/css/**/_*.scss'])
-				.map(filename => {
-					const name = path.parse(filename).name
-					return [`${name}-style`, `./${filename}`]
-				})
+		...entriesFromFiles(
+			['src/css/*.scss', '!src/css/**/_*.scss'],
+			filename => `${path.parse(filename).name}-style`
 		),
-		...Object.fromEntries(
-			glob.sync('node_modules/codemirror/theme/*.css')
-				.map(filename => {
-					const name = path.parse(filename).name
-					return [`codemirror-theme-${name}`, `./${filename}`]
-				})
+		...entriesFromFiles(
+			'node_modules/codemirror/theme/*.css',
+			filename => `codemirror-theme-${path.parse(filename).name}`
 		)
 	},
 	module: {

scripts/bundle.ts

@@ -52,17 +52,18 @@ export const createArchive = (): Promise<void> => {
 }
 
 const bundle = async () => {
-	console.info('\ngenerating composer and webpack files\n')
+	console.info('generating composer and webpack files\n')
 
 	await Promise.all([
 		cleanup(`${plugin.name}.*.zip`),
 		execute('composer', 'install', '--no-dev'),
 		webpack({ mode: 'production' })
 	])
 
-	await copy(BUNDLE_FILES, DEST_DIR)
-	await createArchive()
+	await copy(BUNDLE_FILES, DEST_DIR, filename =>
+		filename.replace(/^src\//, ''))
 
+	await createArchive()
 	await execute('composer', 'install')
 }
 

scripts/utils/files.ts

@@ -11,7 +11,7 @@ export const cleanup = (...paths: string[]): Promise<Awaited<void>[]> =>
 		rm(resolve(filename), { force: true, recursive: true })
 	))
 
-export const copy = async (patterns: string[], dest: string): Promise<void> => {
+export const copy = async (patterns: string[], dest: string, transform?: (filename: string) => string): Promise<void> => {
 	const filenames = glob(patterns)
 	await rm(dest, { force: true, recursive: true })
 	await mkdir(dest, { recursive: true })
@@ -21,7 +21,7 @@ export const copy = async (patterns: string[], dest: string): Promise<void> => {
 
 		if (!stats.isDirectory()) {
 			console.log(`copying ${filename}`)
-			const destPath = resolve(dest, filename)
+			const destPath = resolve(dest, transform?.(filename) ?? filename)
 
 			await mkdir(dirname(destPath), { recursive: true })
 			const out = createWriteStream(destPath, 'utf8')

webpack.config.ts

@@ -3,15 +3,8 @@ import { merge } from 'webpack-merge'
 import { cssWebpackConfig } from './config/webpack-css'
 import { jsWebpackConfig } from './config/webpack-js'
 
-const devConfig: Configuration = {}
+const config: Configuration = {
+	mode: 'development'
+}
 
-const prodConfig: Configuration = {}
-
-const config = (_env: unknown, argv: Record<string, string>): Configuration =>
-	merge(
-		cssWebpackConfig,
-		jsWebpackConfig,
-		'development' === argv.mode ? devConfig : prodConfig
-	)
-
-export default config
+export default merge(cssWebpackConfig, jsWebpackConfig, config)