fragment-tools 0.1.18 → 0.1.20

package/bin/index.js

@@ -28,6 +28,7 @@ prog.command('run [entry]', '', { default: true })
 	.option('--outDir', 'Build output directory')
 	.option('--emptyOutDir', 'Empty outDir before static build')
 	.option('--base', 'Base public path when served in production', undefined)
+	.option('--config', 'Path to Fragment config file')
 	.option('--prompts', 'Enable interactive prompts', true)
 	.action((entry, options) => {
 		if (options.new) {
@@ -43,6 +44,7 @@ prog.command('run [entry]', '', { default: true })
 				emptyOutDir: options.emptyOutDir,
 				base: options.base,
 				prompts: options.prompts,
+				config: options.config,
 			});
 		}
 
@@ -50,6 +52,7 @@ prog.command('run [entry]', '', { default: true })
 			development: options.development,
 			exportDir: options.exportDir,
 			port: options.port,
+			config: options.config,
 		});
 	});
 
@@ -69,6 +72,7 @@ prog.command('build [entry]')
 	.option('--base', 'Base public path', undefined)
 	.option('-dev, --development', 'Enable development mode', false)
 	.option('--prompts', 'Enable interactive prompts', true)
+	.option('--config', 'Path to Fragment config file')
 	.action((entry, options) => {
 		build(entry, options);
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fragment-tools",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "A web development environment for creative coding",
   "main": "index.js",
   "bin": {

package/src/cli/build.js

@@ -95,13 +95,14 @@ export async function build(entry, options) {
 			);
 
 			const fragmentFilepath = await createFragmentFile(entries, cwd);
-			const config = createConfig(
+			const config = await createConfig(
 				entries,
 				fragmentFilepath,
 				{
 					dev: options.development,
 					build: true,
 				},
+				options.config,
 				cwd,
 			);
 

package/src/cli/createConfig.js

@@ -1,11 +1,44 @@
 import path from 'node:path';
-import { defineConfig } from 'vite';
+import fs from 'node:fs';
+import { defineConfig, loadConfigFromFile, mergeConfig } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 
 import checkDependencies from './plugins/check-dependencies.js';
 import { file } from './utils.js';
 import { log } from './log.js';
 
+export async function loadConfig({ cwd, filepath }) {
+	try {
+		let filename = `fragment.config.js`;
+		let configFile = filepath ? filepath : filename;
+		let configRoot = cwd;
+		let resolvedPath = path.resolve(cwd, configFile);
+
+		if (!fs.existsSync(resolvedPath)) {
+			if (filepath) {
+				log.error(`Config file not found: ${resolvedPath}`);
+			}
+			return {};
+		}
+
+		log.info(`Extending configuration from ${resolvedPath}`);
+
+		const { config } = await loadConfigFromFile(
+			{
+				command: 'build',
+				mode: 'dev',
+			},
+			configFile,
+			configRoot,
+		);
+
+		return config;
+	} catch (error) {
+		log.error(error);
+		return {};
+	}
+}
+
 /**
  * Create Vite config from entries
  * @param {string[]} entries
@@ -16,10 +49,11 @@ import { log } from './log.js';
  * @param {string} [cwd=process.cwd()]
  * @returns {import('vite').UserConfig}
  */
-export function createConfig(
+export async function createConfig(
 	entries,
 	fragmentFilepath,
 	{ dev = false, build = false } = {},
+	configFilepath,
 	cwd = process.cwd(),
 ) {
 	const entriesPaths = entries.map((entry) => path.join(cwd, entry));
@@ -28,55 +62,68 @@ export function createConfig(
 
 	log.info(`Creating Vite configuration...`);
 
-	return defineConfig({
-		configFile: false,
-		root,
-		logLevel: dev ? 'info' : 'silent',
-		resolve: {
-			alias: [
-				{ find: '@fragment/sketches', replacement: fragmentFilepath },
-				{ find: '@fragment', replacement: app },
-				{
-					find: 'three',
-					replacement: path.join(cwd, 'node_modules/three'),
-				},
-				{ find: 'p5', replacement: path.join(cwd, 'node_modules/p5') },
-				{
-					find: 'ogl',
-					replacement: path.join(cwd, 'node_modules/ogl'),
-				},
-			],
-		},
-		plugins: [
-			svelte({
-				configFile: false,
-				onwarn: (warning, handler) => {
-					if (dev) {
-						handler(warning);
-					} else {
-						return;
-					}
-				},
-			}),
-			checkDependencies({
-				cwd,
-				app,
-				entriesPaths,
-				build,
-			}),
-		],
-
-		define: {
-			__CWD__: `${JSON.stringify(cwd)}`,
-			__FRAGMENT_PORT__: undefined,
-			__START_TIME__: Date.now(),
-			__SEED__: Date.now(),
-			__BUILD__: build,
-			__DEV__: !build,
-		},
-		optimizeDeps: {
-			include: ['convert-length', 'webm-writer', 'changedpi'],
-			exclude: ['@fragment/sketches', ...entriesPaths],
-		},
+	const config = await loadConfig({
+		filepath: configFilepath,
+		cwd,
 	});
+
+	return mergeConfig(
+		defineConfig({
+			configFile: false,
+			root,
+			logLevel: dev ? 'info' : 'silent',
+			resolve: {
+				alias: [
+					{
+						find: '@fragment/sketches',
+						replacement: fragmentFilepath,
+					},
+					{ find: '@fragment', replacement: app },
+					{
+						find: 'three',
+						replacement: path.join(cwd, 'node_modules/three'),
+					},
+					{
+						find: 'p5',
+						replacement: path.join(cwd, 'node_modules/p5'),
+					},
+					{
+						find: 'ogl',
+						replacement: path.join(cwd, 'node_modules/ogl'),
+					},
+				],
+			},
+			plugins: [
+				svelte({
+					configFile: false,
+					onwarn: (warning, handler) => {
+						if (dev) {
+							handler(warning);
+						} else {
+							return;
+						}
+					},
+				}),
+				checkDependencies({
+					cwd,
+					app,
+					entriesPaths,
+					build,
+				}),
+			],
+			define: {
+				__CWD__: `${JSON.stringify(cwd)}`,
+				__FRAGMENT_PORT__: undefined,
+				__START_TIME__: Date.now(),
+				__SEED__: Date.now(),
+				__BUILD__: build,
+				__DEV__: !build,
+			},
+			optimizeDeps: {
+				include: ['convert-length', 'webm-writer', 'changedpi'],
+				exclude: ['@fragment/sketches', ...entriesPaths],
+			},
+		}),
+		config.vite ?? {},
+	);
 }

package/src/cli/run.js

@@ -62,13 +62,14 @@ export async function run(entry, options = {}) {
 			cwd,
 		});
 
-		const config = createConfig(
+		const config = await createConfig(
 			entries,
 			fragmentFilepath,
 			{
 				dev: options.development,
 				build: false,
 			},
+			options.config,
 			cwd,
 		);