Skip to content

fix: simplify font-awesome copying logic in Vite config #4617

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

Closed
GordonSmith wants to merge 1 commit into from
Closed

fix: simplify font-awesome copying logic in Vite config #4617

Show file tree
Hide file tree
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
154 changes: 9 additions & 145 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions packages/esbuild-plugins/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
"esbuild-plugin-umd-wrapper": "3.0.0",
"fzstd": "0.1.1",
"vite": "8.0.16",
"vite-plugin-css-injected-by-js": "5.0.1",
"vite-plugin-static-copy": "4.1.1"
"vite-plugin-css-injected-by-js": "5.0.1"
},
"devDependencies": {
"@hpcc-js/wasm-base91": "1.14.2",
Expand Down
30 changes: 16 additions & 14 deletions packages/esbuild-plugins/src/vite-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { configDefaults, defineConfig, ViteUserConfig } from "vitest/config";
import { playwright } from "@vitest/browser-playwright";
import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js";
import { viteStaticCopy } from "vite-plugin-static-copy";
import type { ResolvedConfig } from "vite";
import { packageVersionPlugin } from "./package-version-plugin.ts";
import { readFileSync } from "fs";
import { cp } from "fs/promises";
import { resolve, dirname } from "path";
import { fileURLToPath } from "url";

Expand Down Expand Up @@ -227,19 +228,20 @@ export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions =
];

if (includeFontAwesome) {
allPlugins.push(
viteStaticCopy({
targets: [
{
src: "../../node_modules/font-awesome/fonts",
dest: "../font-awesome"
}, {
src: "../../node_modules/font-awesome/css",
dest: "../font-awesome",
}
]
})
);
let faRoot: string;
let faDestRoot: string;
allPlugins.push({
name: "copy-font-awesome",
apply: "build" as const,
configResolved(config: ResolvedConfig) {
faRoot = resolve(config.root, "../../node_modules/font-awesome");
faDestRoot = resolve(config.root, config.build.outDir, "../font-awesome");
},
async closeBundle() {
await cp(`${faRoot}/fonts`, `${faDestRoot}/fonts`, { recursive: true });
await cp(`${faRoot}/css`, `${faDestRoot}/css`, { recursive: true });
}
});
}

const defaultLibConfig = {
Expand Down
Loading