Merge pull request #22 from CloudCannon/fix/build-command-source-path

Generate build suggestions relative to the root dir
CloudCannon · Sep 17, 2024 · 920d7e2 · 920d7e2
2 parents 3ef700d + f448cde
commit 920d7e2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 20 deletions.
diff --git a/src/index.js b/src/index.js
@@ -82,7 +82,6 @@ export async function generateBuildCommands(filePaths, options) {
 		: guessSsg(filterPaths(filePaths, source));
 
 	source = source ?? ssg.getSource(filePaths);
-	filePaths = filterPaths(filePaths, source);
 
 	const files = ssg.groupFiles(filePaths);
 

diff --git a/src/ssgs/bridgetown.js b/src/ssgs/bridgetown.js
@@ -1,4 +1,3 @@
-import { joinPaths } from '../utility.js';
 import Ssg from './ssg.js';
 
 export default class Bridgetown extends Ssg {
@@ -24,7 +23,8 @@ export default class Bridgetown extends Ssg {
 	async generateBuildCommands(filePaths, options) {
 		const commands = await super.generateBuildCommands(filePaths, options);
 
-		if (filePaths.includes(joinPaths([options.source, 'Gemfile']))) {
+		const gemfilePath = filePaths.find((path) => path === 'Gemfile' || path.endsWith('/Gemfile'));
+		if (gemfilePath) {
 			commands.install.unshift({
 				value: 'bundle install',
 				attribution: 'because of your Gemfile',
@@ -40,7 +40,7 @@ export default class Bridgetown extends Ssg {
 
 			if (options.source) {
 				commands.environment['BUNDLE_GEMFILE'] = {
-					value: joinPaths([options.source, 'Gemfile']),
+					value: gemfilePath,
 					attribution: 'because of your Gemfile',
 				};
 			}

diff --git a/src/ssgs/jekyll.js b/src/ssgs/jekyll.js
@@ -380,7 +380,8 @@ export default class Jekyll extends Ssg {
 	async generateBuildCommands(filePaths, options) {
 		const commands = await super.generateBuildCommands(filePaths, options);
 
-		if (filePaths.includes(joinPaths([options.source, 'Gemfile']))) {
+		const gemfilePath = filePaths.find((path) => path === 'Gemfile' || path.endsWith('/Gemfile'));
+		if (gemfilePath) {
 			commands.install.unshift({
 				value: 'bundle install',
 				attribution: 'because of your Gemfile',
@@ -400,7 +401,7 @@ export default class Jekyll extends Ssg {
 
 			if (options.source) {
 				commands.environment['BUNDLE_GEMFILE'] = {
-					value: joinPaths([options.source, 'Gemfile']),
+					value: gemfilePath,
 					attribution: 'because of your Gemfile',
 				};
 			}

diff --git a/src/ssgs/mkdocs.js b/src/ssgs/mkdocs.js
@@ -1,4 +1,3 @@
-import { joinPaths } from '../utility.js';
 import Ssg from './ssg.js';
 
 export default class MkDocs extends Ssg {
@@ -25,8 +24,8 @@ export default class MkDocs extends Ssg {
 	 */
 	async generateBuildCommands(filePaths, options) {
 		const commands = await super.generateBuildCommands(filePaths, options);
-		const usePip = filePaths.includes(joinPaths([options.source, 'requirements.txt']));
-		const usePipEnv = filePaths.includes(joinPaths([options.source, 'Pipfile']));
+		const usePip = filePaths.includes('requirements.txt');
+		const usePipEnv = filePaths.includes('Pipfile');
 
 		commands.build.push({
 			value: 'mkdocs build',

diff --git a/src/ssgs/ssg.js b/src/ssgs/ssg.js
@@ -3,7 +3,7 @@ import { basename } from 'path';
 import slugify from '@sindresorhus/slugify';
 import titleize from 'titleize';
 import { findIcon } from '../icons.js';
-import { joinPaths, last, parseDataFile, stripTopPath } from '../utility.js';
+import { last, parseDataFile, stripTopPath } from '../utility.js';
 import { findBasePath, getCollectionPaths } from '../collections.js';
 
 export default class Ssg {
@@ -504,12 +504,11 @@ export default class Ssg {
 			environment: {},
 		};
 
-		const packageJsonPath = joinPaths([options.source, 'package.json']);
-		if (filePaths.includes(packageJsonPath)) {
-			const useYarn = filePaths.includes(joinPaths([options.source, 'yarn.lock']));
-			const usePnpm = filePaths.includes(joinPaths([options.source, 'pnpm-lock.yaml']));
+		if (filePaths.includes('package.json')) {
+			const useYarn = filePaths.includes('yarn.lock');
+			const usePnpm = filePaths.includes('pnpm-lock.yaml');
 			const useNpm =
-				filePaths.includes(joinPaths([options.source, 'package-lock.json'])) ||
+				filePaths.includes('package-lock.json') ||
 				(!useYarn && !usePnpm);
 
 			if (useNpm) {
@@ -538,7 +537,7 @@ export default class Ssg {
 
 			try {
 				if (options.readFile) {
-					const parsed = await parseDataFile(packageJsonPath, options.readFile);
+					const parsed = await parseDataFile('package.json', options.readFile);
 					if (parsed?.scripts?.build) {
 						if (useNpm) {
 							commands.build.push({

diff --git a/src/ssgs/sveltekit.js b/src/ssgs/sveltekit.js
@@ -1,4 +1,3 @@
-import { joinPaths } from '../utility.js';
 import Ssg from './ssg.js';
 
 export default class Sveltekit extends Ssg {
@@ -35,9 +34,8 @@ export default class Sveltekit extends Ssg {
 	 */
 	async generateBuildCommands(filePaths, options) {
 		const commands = await super.generateBuildCommands(filePaths, options);
-		const viteConfigPath = joinPaths([options.source, 'vite.config.js']);
-
-		if (filePaths.includes(viteConfigPath)) {
+
+		if (filePaths.includes('vite.config.js')) {
 			commands.build.push({
 				value: 'npx vite build',
 				attribution: 'because of your `vite.config.js` file',