Skip to content
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.

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

fix(dev): cache CSS side-effects transform for HMR #6622

Merged
merged 5 commits into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/css-side-effect-imports-hmr-cache.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/dev": patch
---

Cache CSS side-effect imports transform when using HMR
73 changes: 42 additions & 31 deletions packages/remix-dev/compiler/plugins/cssSideEffectImports.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import path from "path";
import type { Plugin } from "esbuild";
import fse from "fs-extra";
import LRUCache from "lru-cache";
import { parse, type ParserOptions } from "@babel/parser";
import traverse from "@babel/traverse";
import generate from "@babel/generator";
Expand Down Expand Up @@ -56,28 +55,52 @@ export const cssSideEffectImportsPlugin = (
build.onLoad(
{ filter: allJsFilesFilter, namespace: "file" },
async (args) => {
let code = await fse.readFile(args.path, "utf8");

// Don't process file if it doesn't contain any references to CSS files
if (!code.includes(".css")) {
let cacheKey = `css-side-effect-imports-plugin:${args.path}&hmr=${hmr}`;
let { cacheValue } = await ctx.fileWatchCache.getOrSet(
cacheKey,
async () => {
let fileDependencies = new Set([args.path]);

let code = await fse.readFile(args.path, "utf8");

// Don't process file if it doesn't contain any references to CSS files
if (!code.includes(".css")) {
return {
fileDependencies,
cacheValue: null,
};
}

let loader =
loaderForExtension[path.extname(args.path) as Extension];
let contents = addSuffixToCssSideEffectImports(loader, code);

if (args.path.startsWith(ctx.config.appDirectory) && hmr) {
contents = await applyHMR(
contents,
args,
ctx.config,
!!build.initialOptions.sourcemap
);
}

return {
fileDependencies,
cacheValue: {
contents,
loader,
},
};
}
);

if (!cacheValue) {
return null;
}

let loader = loaderForExtension[path.extname(args.path) as Extension];
let contents = addSuffixToCssSideEffectImports(loader, code);

if (args.path.startsWith(ctx.config.appDirectory) && hmr) {
contents = await applyHMR(
contents,
args,
ctx.config,
!!build.initialOptions.sourcemap
);
}

return {
contents,
loader,
contents: cacheValue.contents,
loader: cacheValue.loader,
};
}
);
Expand Down Expand Up @@ -129,20 +152,10 @@ const babelPluginsForLoader: Record<Loader, ParserOptions["plugins"]> = {
tsx: ["typescript", "jsx", ...additionalLanguageFeatures],
};

const cache = new LRUCache<string, string>({ max: 1000 });
const getCacheKey = (loader: Loader, code: string) => `${loader}:${code}`;

export function addSuffixToCssSideEffectImports(
loader: Loader,
code: string
): string {
let cacheKey = getCacheKey(loader, code);
let cachedResult = cache.get(cacheKey);

if (cachedResult) {
return cachedResult;
}

let ast = parse(code, {
sourceType: "module",
plugins: babelPluginsForLoader[loader],
Expand Down Expand Up @@ -192,7 +205,5 @@ export function addSuffixToCssSideEffectImports(
compact: false,
}).code;

cache.set(cacheKey, result);

return result;
}
1 change: 0 additions & 1 deletion packages/remix-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"json5": "^2.2.2",
"lodash": "^4.17.21",
"lodash.debounce": "^4.0.8",
"lru-cache": "^7.14.1",
"minimatch": "^9.0.0",
"node-fetch": "^2.6.9",
"ora": "^5.4.1",
Expand Down
5 changes: 0 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9487,11 +9487,6 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"

lru-cache@^7.14.1:
version "7.14.1"
resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"
integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==

lz-string@^1.4.4:
version "1.4.4"
resolved "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz"
Expand Down