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

Revert "Fix TgFont being excluded from build process" #11903

Closed
wants to merge 1 commit into from
Closed
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
11 changes: 8 additions & 3 deletions tools/build/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,12 @@ export const TgFontTarget = new Juke.Target({
'tgui/packages/tgfont/dist/tgfont.eot',
'tgui/packages/tgfont/dist/tgfont.woff2',
],
executes: async () => yarn('tgfont:build'),
executes: async () => {
await yarn('tgfont:build');
fs.copyFileSync('tgui/packages/tgfont/dist/tgfont.css', 'tgui/packages/tgfont/static/tgfont.css');
fs.copyFileSync('tgui/packages/tgfont/dist/tgfont.eot', 'tgui/packages/tgfont/static/tgfont.eot');
fs.copyFileSync('tgui/packages/tgfont/dist/tgfont.woff2', 'tgui/packages/tgfont/static/tgfont.woff2');
}
});

export const TguiTarget = new Juke.Target({
Expand Down Expand Up @@ -280,7 +285,7 @@ export const LintTarget = new Juke.Target({
});

export const BuildTarget = new Juke.Target({
dependsOn: [DmTarget, TgFontTarget, TguiTarget],
dependsOn: [DmTarget, TguiTarget],
});

export const ServerTarget = new Juke.Target({
Expand Down Expand Up @@ -347,7 +352,7 @@ const prependDefines = (...defines) => {
};

export const TgsTarget = new Juke.Target({
dependsOn: [TguiTarget, TgFontTarget],
dependsOn: [TguiTarget],
executes: async () => {
Juke.logger.info('Prepending TGS define');
prependDefines('TGS');
Expand Down
Loading