Skip to content

Commit

Permalink
🐛 Fix css not generating for build
Browse files Browse the repository at this point in the history
  • Loading branch information
Khaoz-Topsy committed Jul 24, 2024
1 parent 8fdca9c commit 20c9bf8
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 11 deletions.
1 change: 1 addition & 0 deletions .github/workflows/BuildAndDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
name: Github Pages
environment: github-pages
runs-on: ubuntu-latest
timeout-minutes: 20

permissions:
pull-requests: write
Expand Down
Binary file added public/assets/img/meta/githubRepoPreview.pdn
Binary file not shown.
2 changes: 2 additions & 0 deletions src/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import url from 'url';

import { generateFavicons } from 'misc/favicon';
import { smartLoadingModules } from 'misc/moduleLoader';
import { generateMainCss } from 'misc/sass';
import { setupDirectories } from 'misc/setup';
import { getModules } from 'modules';
import { BOT_PATH } from 'services/internal/configService';
Expand All @@ -27,6 +28,7 @@ const main = async () => {
getHandlebar().registerPartialsAndHelpers();

await generateFavicons();
generateMainCss();

const availableLanguages = localisationModule.getLanguageCodes();
let langCode = availableLanguages[0];
Expand Down
10 changes: 10 additions & 0 deletions src/misc/sass.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import fs from 'fs/promises';
import sass from 'sass';

export const generateMainCss = () => {
const cssContent = sass.compile('src/scss/main.scss');
fs.writeFile('public/assets/css/main.css', cssContent.css);
if (cssContent.sourceMap != null) {
fs.writeFile('public/assets/css/main.css.map', JSON.stringify(cssContent.sourceMap));
}
};
9 changes: 2 additions & 7 deletions src/misc/watchDevFiles.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import aliveServer from 'alive-server';
import fs from 'fs';
import watch from 'node-watch';
import path from 'path';
import sass from 'sass';

import { paths } from 'constant/paths';
import { generateMainCss } from './sass';

interface IWatchDevFiles {
onSassChange?: () => void;
Expand All @@ -21,11 +20,7 @@ export const watchDevFiles = (props: IWatchDevFiles) => {

watch(paths().scssFolder, { recursive: true }, () => {
try {
const cssContent = sass.compile('src/scss/main.scss');
fs.writeFileSync('public/assets/css/main.css', cssContent.css);
if (cssContent.sourceMap != null) {
fs.writeFileSync('public/assets/css/main.css.map', JSON.stringify(cssContent.sourceMap));
}
generateMainCss();
props.onSassChange?.();
} catch (ex) {
console.error(ex);
Expand Down
6 changes: 2 additions & 4 deletions src/modules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { CharacterSpriteAnimModule } from 'modules/characterSpriteAnim/character
import { CommonModule } from 'modules/commonModule';
import { ElementReactionModule } from 'modules/elementReactions/elementReactionModule';
import { ElementsModule } from 'modules/elements/elementsModule';
import { FusionModule } from 'modules/fusion/fusionModule';
import { FusionSpriteAnimModule } from 'modules/fusionSpriteAnim/fusionSpriteAnimModule';
import { LocalisationModule } from 'modules/localisation/localisationModule';
import { MiscModule } from 'modules/misc/miscModule';
import { MonsterFormsModule } from 'modules/monsterForms/monsterFormsModule';
Expand Down Expand Up @@ -48,8 +46,8 @@ export const getModules = async (props: {
new CharacterSfxModule(),

// Fusions
new FusionModule(),
new FusionSpriteAnimModule(),
// new FusionModule(),
// new FusionSpriteAnimModule(),
];
return [localisationModule, modules];
};
2 changes: 2 additions & 0 deletions src/modules/elementReactions/elementReactionModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ export class ElementReactionModule extends CommonModule<IElementReaction> {
}

init = async () => {
this._baseDetails = [];
this._itemDetailMap = {};
if (this.isReady) return;
const list = fs.readdirSync(this._folder);

Expand Down

0 comments on commit 20c9bf8

Please sign in to comment.