Skip to content

Inline framework packages and check for react-dom/server usage #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Inline framework packages and check for react-dom/server usage #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 26 additions & 28 deletions src/fixes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { Configuration, Options } from 'webpack';
import get from 'lodash.get';
import { createRequire } from './utils';

const FRAMEWORK_BUNDLES = [`react`, `react-dom`, `scheduler`, `prop-types`];

/**
* Fix missing framework in development.
* See https://github.com/Js-Brecht/gatsby-plugin-pnpm/issues/8
Expand All @@ -14,38 +16,34 @@ export const fixFrameworkCache = (config: Configuration, siteDirectory: string)

if (!framework) return;
if (typeof framework !== "object" || !framework.test) return;
if (!(framework.test instanceof RegExp)) return;

const regVal = framework.test
.toString()
.replace(/[[\\\]]/g, "")
.slice(1, -1);
const frameworkPackages = /\/\(([^)]+)\)\/$/.exec(regVal);
const frameworkList: string[] = [];

if (frameworkPackages) {
const frameworkRequire = createRequire(`${siteDirectory}/:internal:`);
Object.assign(
frameworkList,
frameworkPackages[1]
.split("|")
.map((f) => {
try {
return path.dirname(
frameworkRequire.resolve(`${f}/package.json`),
) + path.sep;
} catch (err) {
return "";
}
})
.filter(Boolean),
);
}
const frameworkRequire = createRequire(`${siteDirectory}/:internal:`);
Object.assign(
frameworkList,
FRAMEWORK_BUNDLES
.map((f) => {
try {
return path.dirname(
frameworkRequire.resolve(`${f}/package.json`),
) + path.sep;
} catch (err) {
return "";
}
})
.filter(Boolean),
);

const isRootDependency = (val?: string) => (
frameworkList.some((f) => val?.startsWith(f))
);
framework.test = (mod) => (
isRootDependency(mod.resource)
);
framework.test = (mod) => {
if (
mod.rawRequest === `react-dom/server` ||
mod.rawRequest?.includes(`/react-dom-server`)
) {
return false;
}
return isRootDependency(mod.resource);
};
};