diff --git a/.gitignore b/.gitignore index 89b6d15..3124bd8 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,4 @@ tools/items/mc-art-viewer/nbt.js # Temporary articles/*.txt -commons/strings/_*/ meow*.ogg diff --git a/about/index.php b/about/index.php index 78b877d..10ff9e1 100644 --- a/about/index.php +++ b/about/index.php @@ -76,70 +76,75 @@ include 'commons/DOM/sidebar.php';

- - + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
±
:± € +
+ + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - + - -
+ + ±
±
±
:± € + :±
-

+ + + +

- - - - - - - - - - - - - - - - - - - - - -
±
±
:± € -
"!inputPath!" =^> "!outputPath!" - call "%~dp0node_modules\.bin\html-minifier-terser" --conservative-collapse --collapse-inline-tag-whitespace ^ ---collapse-whitespace --remove-comments --decode-entities --continue-on-parse-error -o "!outputPath!" "!inputPath!" -) -popd - -:php-relink -echo Linking minified PHP files together... -pushd %CD% -:: We change every .php extension to .min.php in all the minified file. -:: I didn't use Python because it fails miserably with utf-8 symbols... -for /r "%CD%" %%F in (*.min.php) do ( - node "%~dp0php-relinker.js" "%%F" -) -popd - -:php-end - - :compile-typescript echo Compiling TypeScript for ".js" files... call .\node_modules\.bin\tsc diff --git a/compress.bat b/compress.bat index acf8fa8..5611d22 100644 --- a/compress.bat +++ b/compress.bat @@ -6,23 +6,22 @@ cd /D "%~dp0" :compile -::call "%~dp0compile.bat" +call "%~dp0compile.bat" :compile-end -:: Source: https://stackoverflow.com/q/1192476 -set NP_ZIP_NAME=build_%date:~-4%-%date:~3,2%-%date:~0,2%_%time:~0,2%-%time:~3,2%-%time:~6,2% -::echo %NP_ZIP_NAME% -::goto end - -:: TMP -del /Q /S /F tmp01.7z 2> nul 1> nul :archive echo. echo Handling the 'Formula Wizard' echo ----------------------------- -:archive-env +:archive-env-name +echo Preparing name variable... +set NP_ZIP_NAME=build_%date:~-4%-%date:~3,2%-%date:~0,2%.7z +del /Q /S /F %NP_ZIP_NAME% 2> nul 1> nul +echo ^> %NP_ZIP_NAME% + +:archive-env-content echo Preparing environment variable... set NP_ZIP_CONTENT= set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "about/" @@ -53,11 +52,12 @@ set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/sounds/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/Quantum/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/SplideJs/dist/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "./.htaccess" "./*.php" "./favicon.*" -echo ^>%NP_ZIP_CONTENT% +::echo ^>%NP_ZIP_CONTENT% :archive-7z echo Making '.7z' archive... -7z a -mx9 "./%NP_ZIP_NAME%.7z" %NP_ZIP_CONTENT% +7z a -mx9 "./%NP_ZIP_NAME%" %NP_ZIP_CONTENT% 1> nul +echo ^> Done ! :archive-end diff --git a/minify-php.bat b/minify-php.bat new file mode 100644 index 0000000..b77d543 --- /dev/null +++ b/minify-php.bat @@ -0,0 +1,46 @@ +@echo off +setlocal enabledelayedexpansion + +:: Going into the script's directory +cd /D "%~dp0" + + +:clean +call "%~dp0clean.bat" +:clean-end + + +:php +echo. +echo Handling the PHP files +echo ----------------------- + +:php-minify +echo Minifying PHP files... +pushd %CD% +:: We minify the .php files to help with some weird spacing issues that cannot be fixed with CSS. +:: This issue is usually handled by the reverse-proxy or a middleware, but since I need to export SPA(s), I can't rely on it +for /r "%CD%" %%F in (*.php) do ( + set inputPath=%%F + set outputPath=%%~dpnF.min.php + + echo ^> "!inputPath!" =^> "!outputPath!" + call "%~dp0node_modules\.bin\html-minifier-terser" --conservative-collapse --collapse-inline-tag-whitespace ^ +--collapse-whitespace --remove-comments --decode-entities --continue-on-parse-error -o "!outputPath!" "!inputPath!" +) +popd + +:php-relink +echo Linking minified PHP files together... +pushd %CD% +:: We change every .php extension to .min.php in all the minified file. +:: I didn't use Python because it fails miserably with utf-8 symbols... +for /r "%CD%" %%F in (*.min.php) do ( + node "%~dp0php-relinker.js" "%%F" +) +popd + +:php-end + + +:end