Skip to content

Use minified bundle of node vibrant #7784

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

Merged
bramkragten merged 4 commits into from
Jan 26, 2021
Merged

Use minified bundle of node vibrant #7784

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e4b111
Use minified bundle of node vibrant
balloob Nov 23, 2020
20d6a15
Add comment
balloob Nov 23, 2020
7503816
Move comment
balloob Nov 23, 2020
debafcd
Merge branch 'dev' into tweak-node-vibrant-pt2
bramkragten Jan 26, 2021
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
26 changes: 9 additions & 17 deletions src/common/image/extract_color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Swatch, Vec3 } from "@vibrant/color";
import { BasicPipeline } from "@vibrant/core/lib/pipeline";
import MMCQ from "@vibrant/quantizer-mmcq";
import Vibrant from "node-vibrant/lib/browser";
// We import the minified bundle because the unminified bundle
// has some quirks that break wds. See #7784 for unminified version.
import Vibrant from "node-vibrant/dist/vibrant";
import type { Swatch, Vec3 } from "@vibrant/color";
import { getRGBContrastRatio } from "../color/rgb";

const CONTRAST_RATIO = 4.5;
Expand Down Expand Up @@ -104,23 +104,15 @@ const customGenerator = (colors: Swatch[]) => {
}

return {
foreground: new Swatch(foregroundColor, 0),
// We can't import Swatch constructor from the minified bundle, take it from background color.
// @ts-expect-error
foreground: new backgroundColor.constructor(foregroundColor, 0),
background: backgroundColor,
};
};

Vibrant.use(
new BasicPipeline().filter
.register(
"default",
(r: number, g: number, b: number, a: number) =>
a >= 125 && !(r > 250 && g > 250 && b > 250)
)
.quantizer.register("mmcq", MMCQ)
// Our generator has different output
// @ts-expect-error
.generator.register("default", customGenerator)
);
// Set our custom generator as the default.
Vibrant._pipeline.generator.register("default", customGenerator);

export const extractColors = (url: string, downsampleColors = 16) =>
new Vibrant(url, {
Expand Down