Also make astro, gatsby, next and remix entry patterns overridable

webpro-nl · Oct 18, 2023 · e2aebc3 · e2aebc3
1 parent 47b09c9
commit e2aebc3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/src/plugins/astro/index.ts b/src/plugins/astro/index.ts
@@ -17,6 +17,10 @@ export const ENTRY_FILE_PATTERNS = ['astro.config.{js,cjs,mjs,ts}', 'src/content
 /** @public */
 export const PRODUCTION_ENTRY_FILE_PATTERNS = ['src/pages/**/*.{astro,mdx,js,ts}', 'src/content/**/*.mdx'];
 
-export const findDependencies: GenericPluginCallback = async () => {
-  return [...ENTRY_FILE_PATTERNS.map(toEntryPattern), ...PRODUCTION_ENTRY_FILE_PATTERNS.map(toProductionEntryPattern)];
+export const findDependencies: GenericPluginCallback = async (configFilePath, options) => {
+  const { config } = options;
+
+  return config.entry
+    ? config.entry.map(toProductionEntryPattern)
+    : [...ENTRY_FILE_PATTERNS.map(toEntryPattern), ...PRODUCTION_ENTRY_FILE_PATTERNS.map(toProductionEntryPattern)];
 };
diff --git a/src/plugins/gatsby/index.ts b/src/plugins/gatsby/index.ts
@@ -26,10 +26,12 @@ export const PRODUCTION_ENTRY_FILE_PATTERNS = [
   'plugins/**/gatsby-{browser,ssr}.{js,jsx,ts,tsx}',
 ];
 
-const findGatsbyDependencies: GenericPluginCallback = async (configFilePath, { isProduction }) => {
+const findGatsbyDependencies: GenericPluginCallback = async (configFilePath, options) => {
+  const { isProduction, config } = options;
+
   const localConfig: GatsbyConfig | GatsbyNode | undefined = await load(configFilePath);
 
-  const entryPatterns = PRODUCTION_ENTRY_FILE_PATTERNS.map(toProductionEntryPattern);
+  const entryPatterns = (config.entry ?? PRODUCTION_ENTRY_FILE_PATTERNS).map(toProductionEntryPattern);
 
   if (isProduction || !localConfig) return entryPatterns;
 

diff --git a/src/plugins/next/index.ts b/src/plugins/next/index.ts
@@ -31,6 +31,10 @@ export const PRODUCTION_ENTRY_FILE_PATTERNS = [
   ...productionEntryFilePatternsWithoutSrc.map(pattern => `src/${pattern}`),
 ];
 
-export const findDependencies: GenericPluginCallback = async () => {
-  return [...ENTRY_FILE_PATTERNS.map(toEntryPattern), ...PRODUCTION_ENTRY_FILE_PATTERNS.map(toProductionEntryPattern)];
+export const findDependencies: GenericPluginCallback = async (configFilePath, options) => {
+  const { config } = options;
+
+  return config.entry
+    ? config.entry.map(toProductionEntryPattern)
+    : [...ENTRY_FILE_PATTERNS.map(toEntryPattern), ...PRODUCTION_ENTRY_FILE_PATTERNS.map(toProductionEntryPattern)];
 };
diff --git a/src/plugins/remix/index.ts b/src/plugins/remix/index.ts
@@ -23,8 +23,12 @@ export const PRODUCTION_ENTRY_FILE_PATTERNS = [
   'server.{js,ts}',
 ];
 
-const findRemixDependencies: GenericPluginCallback = async () => {
-  return [...ENTRY_FILE_PATTERNS.map(toEntryPattern), ...PRODUCTION_ENTRY_FILE_PATTERNS.map(toProductionEntryPattern)];
+const findRemixDependencies: GenericPluginCallback = async (configFilePath, options) => {
+  const { config } = options;
+
+  return config.entry
+    ? config.entry.map(toProductionEntryPattern)
+    : [...ENTRY_FILE_PATTERNS.map(toEntryPattern), ...PRODUCTION_ENTRY_FILE_PATTERNS.map(toProductionEntryPattern)];
 };
 
 export const findDependencies = timerify(findRemixDependencies);
diff --git a/test/plugins/gatsby.test.ts b/test/plugins/gatsby.test.ts
@@ -2,12 +2,13 @@ import assert from 'node:assert/strict';
 import test from 'node:test';
 import * as gatsby from '../../src/plugins/gatsby/index.js';
 import { resolve, join } from '../../src/util/path.js';
+import { pluginConfig as config } from '../helpers/index.js';
 
 const cwd = resolve('fixtures/plugins/gatsby');
 
 test('Find dependencies in Gatsby configuration (gatsby-config.js)', async () => {
   const configFilePath = join(cwd, 'gatsby-config.js');
-  const dependencies = await gatsby.findDependencies(configFilePath, {});
+  const dependencies = await gatsby.findDependencies(configFilePath, { config });
   assert.deepEqual(dependencies, [
     '@sentry/gatsby',
     'gatsby-plugin-webpack-bundle-analyser-v2',
@@ -25,7 +26,7 @@ test('Find dependencies in Gatsby configuration (gatsby-config.js)', async () =>
 
 test('Find dependencies in Gatsby configuration (gatsby-node.js)', async () => {
   const configFilePath = join(cwd, 'gatsby-node.js');
-  const dependencies = await gatsby.findDependencies(configFilePath, {});
+  const dependencies = await gatsby.findDependencies(configFilePath, { config });
   assert.deepEqual(dependencies, [
     '@babel/plugin-proposal-function-bind',
     '@babel/plugin-proposal-export-default-from',