hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-22 17:10:10 +00:00
Code Issues Projects Releases Wiki Activity

update node deps, fix resulting issues

Browse Source
This commit is contained in:
Harvey Tindall 2023-06-12 18:44:10 +01:00
parent 48403ce940
commit 3e52beef14
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
5 changed files with 3615 additions and 4223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -56,7 +56,7 @@ ifeq ($(DEBUG), on)
# jank # jank
COPYTS := rm -r $(DATA)/web/js/ts; cp -r tempts $(DATA)/web/js/ts COPYTS := rm -r $(DATA)/web/js/ts; cp -r tempts $(DATA)/web/js/ts
UNCSS := cp $(DATA)/web/css/bundle.css $(DATA)/bundle.css UNCSS := cp $(DATA)/web/css/bundle.css $(DATA)/bundle.css
TAILWIND := --content "" # TAILWIND := --content ""
else else
LDFLAGS := -s -w $(LDFLAGS) LDFLAGS := -s -w $(LDFLAGS)
SOURCEMAP := SOURCEMAP :=
@ -103,11 +103,11 @@ typescript:
scripts/dark-variant.sh tempts/modules scripts/dark-variant.sh tempts/modules
$(info compiling typescript) $(info compiling typescript)
mkdir -p $(DATA)/web/js mkdir -p $(DATA)/web/js
$(ESBUILD) --bundle tempts/admin.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/admin.js --minify $(ESBUILD) --target=es6 --bundle tempts/admin.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/admin.js --minify
$(ESBUILD) --bundle tempts/pwr.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/pwr.js --minify $(ESBUILD) --target=es6 --bundle tempts/pwr.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/pwr.js --minify
$(ESBUILD) --bundle tempts/form.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/form.js --minify $(ESBUILD) --target=es6 --bundle tempts/form.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/form.js --minify
$(ESBUILD) --bundle tempts/setup.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/setup.js --minify $(ESBUILD) --target=es6 --bundle tempts/setup.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/setup.js --minify
$(ESBUILD) --bundle tempts/crash.ts --outfile=./$(DATA)/crash.js --minify $(ESBUILD) --target=es6 --bundle tempts/crash.ts --outfile=./$(DATA)/crash.js --minify
$(COPYTS) $(COPYTS)
swagger: swagger:
@ -126,6 +126,8 @@ compress:
bundle-css: bundle-css:
mkdir -p $(DATA)/web/css mkdir -p $(DATA)/web/css
$(info copying fonts)
cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 $(DATA)/web/css/
$(info bundling css) $(info bundling css)
$(ESBUILD) --bundle css/base.css --outfile=$(DATA)/web/css/bundle.css --external:remixicon.css --minify $(ESBUILD) --bundle css/base.css --outfile=$(DATA)/web/css/bundle.css --external:remixicon.css --minify
npx tailwindcss -i $(DATA)/web/css/bundle.css -o $(DATA)/web/css/bundle.css $(TAILWIND) npx tailwindcss -i $(DATA)/web/css/bundle.css -o $(DATA)/web/css/bundle.css $(TAILWIND)
@ -144,8 +146,6 @@ variants-html:
node scripts/missing-colors.js html $(DATA)/html node scripts/missing-colors.js html $(DATA)/html
copy: copy:
$(info copying fonts)
cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 $(DATA)/web/css/
$(info copying crash page) $(info copying crash page)
mv $(DATA)/crash.html $(DATA)/html/ mv $(DATA)/crash.html $(DATA)/html/
$(info copying static data) $(info copying static data)

7757
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

30
package.json
View File

@ -17,27 +17,27 @@
}, },
"homepage": "https://github.com/hrfee/jfa-go#readme", "homepage": "https://github.com/hrfee/jfa-go#readme",
"dependencies": { "dependencies": {
"@ts-stack/markdown": "^1.3.0", "@ts-stack/markdown": "^1.4.0",
"@types/node": "^15.0.1", "@types/node": "^20.3.0",
"a17t": "^0.10.1", "a17t": "^0.10.1",
"browserslist": "^4.16.6", "browserslist": "^4.21.7",
"cheerio": "^1.0.0-rc.10", "cheerio": "^1.0.0-rc.12",
"esbuild": "^0.8.57", "esbuild": "^0.18.1",
"fs-cheerio": "^3.0.0", "fs-cheerio": "^3.0.0",
"inline-source": "^7.2.0", "inline-source": "^8.0.2",
"jsdom": "^19.0.0", "jsdom": "^22.1.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mjml": "^4.12.0", "mjml": "^4.14.1",
"nightwind": "github:yonson2/nightwind", "nightwind": "^1.1.13",
"perl-regex": "^1.0.4", "perl-regex": "^1.0.4",
"postcss": "^8.4.5", "postcss": "^8.4.24",
"remixicon": "^2.5.0", "remixicon": "^3.3.0",
"remove-markdown": "^0.3.0", "remove-markdown": "^0.5.0",
"typescript": "^4.0.3", "tailwindcss": "^3.3.2",
"typescript": "^5.1.3",
"uncss": "^0.17.3" "uncss": "^0.17.3"
}, },
"devDependencies": { "devDependencies": {
"live-server": "^1.2.1", "live-server": "^1.2.2"
"tailwindcss": "^3.0.16"
} }
} }

2
ts/modules/invites.ts
View File

@ -551,7 +551,7 @@ export class createInvite {
private _newInviteEvent = new CustomEvent("newInviteEvent"); private _newInviteEvent = new CustomEvent("newInviteEvent");
private _firstLoad = true; private _firstLoad = true;
private _count: Number = 30; private _count: number = 30;
private _populateNumbers = () => { private _populateNumbers = () => {
const fieldIDs = ["months", "days", "hours", "minutes"]; const fieldIDs = ["months", "days", "hours", "minutes"];
const prefixes = ["create-", "user-"]; const prefixes = ["create-", "user-"];

7
ts/typings/d.ts
View File

@ -135,9 +135,10 @@ interface inviteList {
reload: () => void; reload: () => void;
} }
declare interface SubmitEvent extends Event { // Finally added to typescript, dont need this anymore.
submitter: HTMLInputElement; // declare interface SubmitEvent extends Event {
} // submitter: HTMLInputElement;
// }
declare var config: Object; declare var config: Object;
declare var modifiedConfig: Object; declare var modifiedConfig: Object;