Reorganized build

bakaq · Oct 8, 2023 · 027b4a4 · 027b4a4
1 parent 9660879
commit 027b4a4
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 89 deletions.
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
@@ -13,20 +13,10 @@ jobs:
       uses: actions/checkout@v4
     - name: Build release
       run: make all
-    - name: Assemble release folder
-      run: |
-        mkdir release-gh-pages
-        cp -r release release-gh-pages/
-        cp sw.js release-gh-pages/
-        cp index.css release-gh-pages/
-        cp index.html release-gh-pages/
-        cp manifest.json release-gh-pages/
-        cp kanjiInfo.json release-gh-pages/
-        cp radk.json release-gh-pages/
     - name: Upload Github Pages artifact
       uses: actions/upload-pages-artifact@v1
       with:
-        path: "./release-gh-pages"
+        path: "./release"
   deploy:
     permissions:
       contents: read

diff --git a/Makefile b/Makefile
@@ -1,9 +1,29 @@
-PROJECT_SOURCES = $(wildcard src/*.ts)
+PROJECT_SOURCES = $(wildcard src/main/* src/sw/*)
 
-all: release/index.js sw.js
+.PHONY: all
+all: release/main/index.js release/radk.json release/index.html release/index.css
 
-release/index.js: $(PROJECT_SOURCES)
-	tsc
+release/index.html: src/index.html
+	cp src/index.html release/
 
-sw.js: src/service-worker/sw.ts
-	tsc src/service-worker/sw.ts --lib webworker,es6 --outFile sw.js
+release/index.css: src/index.css
+	cp src/index.css release/
+
+# This is actually all the .js files, including sw.js
+release/main/index.js: $(PROJECT_SOURCES) | release
+	tsc --build src/main
+	mv release/sw/sw.js release/
+	rm release/sw -r
+
+# This is actually both radk.json and kanjiInfo.json
+release/radk.json: scripts/buildjson.py | release
+	./scripts/buildjson.py
+	mv radk.json release/
+	mv kanjiInfo.json release/
+
+release:
+	mkdir -p release
+
+.PHONY: clean
+clean:
+	rm -rf release
diff --git a/kanjiInfo.json b/kanjiInfo.json
diff --git a/radk.json b/radk.json
diff --git a/buildjson.py → scripts/buildjson.py b/buildjson.py → scripts/buildjson.py
@@ -4,19 +4,7 @@
 # information from RADKFILE and KANJIDICT2
 #
 # Copyright 2022 Kauê Hunnicutt Bazilli
-# 
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, either version 3 of the License, or (at your option) any later
-# version.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this program. If not, see <https:#www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import asyncio
 import json
@@ -117,7 +105,7 @@ async def main():
     # Invert the radkfile to create a easily parsable kradfile-like json
     kradjson = invert_radkjson(radkjson)
 
-    # Create the kanjiinfo.json
+    # Create the kanjiInfo.json
     kanji_info = build_kanji_info(await kanjidict2_task, kradjson)
 
     # Write files

diff --git a/src/generic-tsconfig.json b/src/generic-tsconfig.json
@@ -0,0 +1,10 @@
+{
+	"compilerOptions": {
+		"rootDir": ".",
+		"outDir": "../release",
+		"target": "ES2016",
+		"strict": true,
+		"composite": true,
+		"declarationMap": true
+	}
+}
diff --git a/index.css → src/index.css b/index.css → src/index.css
diff --git a/index.html → src/index.html b/index.html → src/index.html
@@ -35,7 +35,7 @@
     <!-- TODO: serve icons locally --> 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
     <!-- Scripts -->
-    <script type="module" src="release/index.js" defer></script>
+    <script type="module" src="main/index.js" defer></script>
   </head>
   <body>
     <div class="ui-wrapper">

diff --git a/src/ComponentSearchPanel.ts → src/main/ComponentSearchPanel.ts b/src/ComponentSearchPanel.ts → src/main/ComponentSearchPanel.ts
diff --git a/src/components.ts → src/main/components.ts b/src/components.ts → src/main/components.ts
diff --git a/src/index.ts → src/main/index.ts b/src/index.ts → src/main/index.ts
diff --git a/src/kanji.ts → src/main/kanji.ts b/src/kanji.ts → src/main/kanji.ts
diff --git a/src/kanjiInfo.ts → src/main/kanjiInfo.ts b/src/kanjiInfo.ts → src/main/kanjiInfo.ts
diff --git a/src/main/tsconfig.json b/src/main/tsconfig.json
@@ -0,0 +1,8 @@
+{
+    "extends": "../generic-tsconfig.json",
+    "compilerOptions": {
+        "lib": ["es2020", "dom", "dom.iterable"]
+    },
+	"include": ["./*"],
+    "references": [{ "path": "../sw" }]
+}
diff --git a/src/service-worker/sw.ts → src/sw/sw.ts b/src/service-worker/sw.ts → src/sw/sw.ts
@@ -1,3 +1,5 @@
+/// <reference no-default-lib="true" />
+/// <reference lib="ES2020" />
 /// <reference lib="WebWorker" />
 
 const _self = (self as unknown) as ServiceWorkerGlobalScope;

diff --git a/src/sw/tsconfig.json b/src/sw/tsconfig.json
@@ -0,0 +1,7 @@
+{
+    "extends": "../generic-tsconfig.json",
+	"compilerOptions": {
+        "lib": ["es2020", "webworker"]
+	},
+    "files": ["sw.ts"]
+}
diff --git a/sw.js b/sw.js
diff --git a/tsconfig.json b/tsconfig.json