- 
+
+
+
+
+
+
@@ -241,6 +215,7 @@
};
setTimeout(() => init($), 1000);
-
+%>
+ <%- initial_script %>
\ No newline at end of file
diff --git a/shared/js/ui/modal/ModalAbout.ts b/shared/js/ui/modal/ModalAbout.ts
index 828a36b5..bc72a981 100644
--- a/shared/js/ui/modal/ModalAbout.ts
+++ b/shared/js/ui/modal/ModalAbout.ts
@@ -1,5 +1,4 @@
import {createModal} from "tc-shared/ui/elements/Modal";
-import * as loader from "tc-loader";
import {LogCategory} from "tc-shared/log";
import * as log from "tc-shared/log";
@@ -10,29 +9,16 @@ function format_date(date: number) {
}
export function spawnAbout() {
- const app_version = (() => {
- const version_node = document.getElementById("app_version");
- if(!version_node) return undefined;
-
- const version = version_node.hasAttribute("value") ? version_node.getAttribute("value") : undefined;
- if(!version) return undefined;
-
- if(version == "unknown" || version.replace(/0+/, "").length == 0)
- return undefined;
-
- return version;
- })();
-
const connectModal = createModal({
header: tr("About"),
body: () => {
let tag = $("#tmpl_about").renderTag({
client: __build.target !== "web",
- version_client: __build.target === "web" ? app_version || "in-dev" : "loading...",
- version_ui: app_version || "in-dev",
+ version_client: __build.target === "web" ? __build.version || "in-dev" : "loading...",
+ version_ui: __build.version || "in-dev",
- version_timestamp: !!app_version ? format_date(Date.now()) : "--"
+ version_timestamp: format_date(__build.timestamp)
});
return tag;
},
diff --git a/tsbaseconfig.json b/tsbaseconfig.json
index 2b8684bd..167763c2 100644
--- a/tsbaseconfig.json
+++ b/tsbaseconfig.json
@@ -14,6 +14,7 @@
"webpack/build-definitions.d.ts",
"webpack/ManifestPlugin.ts",
+ "webpack/EJSGenerator.ts",
"webpack/WatLoader.ts",
"file.ts"
diff --git a/webpack.config.ts b/webpack.config.ts
index 5fdd49c1..cf1ad3ff 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -3,6 +3,7 @@ import * as fs from "fs";
import trtransformer from "./tools/trgen/ts_transformer";
import {exec} from "child_process";
import * as util from "util";
+import EJSGenerator = require("./webpack/EJSGenerator");
const path = require('path');
const webpack = require("webpack");
@@ -74,7 +75,24 @@ export const config = async (target: "web" | "client") => { return {
minSize: 1024 * 8,
maxSize: 1024 * 128
}),
- new webpack.DefinePlugin(await generate_definitions(target))
+ new webpack.DefinePlugin(await generate_definitions(target)),
+
+ new EJSGenerator({
+ variables: {
+ build_target: target
+ },
+ input: path.join(__dirname, "shared/html/index.html.ejs"),
+ output: path.join(__dirname, "dist/index.html"),
+ initialJSEntryChunk: "loader",
+ minify: !isDevelopment,
+ embedInitialJSEntryChunk: !isDevelopment,
+
+ embedInitialCSSFile: !isDevelopment,
+ initialCSSFile: {
+ localFile: path.join(__dirname, "loader/css/loader.css"),
+ publicFile: "css/loader.css"
+ }
+ })
].filter(e => !!e),
module: {
rules: [
@@ -142,13 +160,8 @@ export const config = async (target: "web" | "client") => { return {
{"tc-loader": "window loader"}
] as any[],
output: {
- filename: (chunkData) => {
- if(chunkData.chunk.name === "loader")
- return "loader.js";
-
- return '[name].js';
- },
- chunkFilename: "[name].js",
+ filename: isDevelopment ? "[name].[contenthash].js" : "[contenthash].js",
+ chunkFilename: isDevelopment ? "[name].[contenthash].js" : "[contenthash].js",
path: path.resolve(__dirname, 'dist'),
publicPath: "js/"
},
diff --git a/webpack/EJSGenerator.ts b/webpack/EJSGenerator.ts
new file mode 100644
index 00000000..7695b8c0
--- /dev/null
+++ b/webpack/EJSGenerator.ts
@@ -0,0 +1,94 @@
+import * as webpack from "webpack";
+import * as ejs from "ejs";
+import * as fs from "fs";
+import * as util from "util";
+import * as minifier from "html-minifier";
+import * as path from "path";
+import {Compilation} from "webpack";
+
+interface Options {
+ input: string,
+ output: string,
+
+ minify?: boolean,
+
+ initialJSEntryChunk: string,
+ embedInitialJSEntryChunk?: boolean,
+
+ initialCSSFile: {
+ localFile: string,
+ publicFile: string
+ },
+ embedInitialCSSFile?: boolean,
+
+ variables?: {[name: string]: any};
+}
+
+class EJSGenerator {
+ readonly options: Options;
+
+ constructor(options: Options) {
+ this.options = options;
+ }
+
+ private async generate_entry_js_tag(compilation: Compilation) {
+ const entry_group = compilation.chunkGroups.find(e => e.options.name === this.options.initialJSEntryChunk);
+ if(!entry_group) return; /* not the correct compilation */
+ if(entry_group.chunks.length !== 1) throw "Unsupported entry chunk size. We only support one at the moment.";
+ if(entry_group.chunks[0].files.length !== 1)
+ throw "Entry chunk has too many files. We only support to inline one!";
+ const file = entry_group.chunks[0].files[0];
+ if(path.extname(file) !== ".js")
+ throw "Entry chunk file has unknown extension";
+
+ if(!this.options.embedInitialJSEntryChunk) {
+ return '';
+ } else {
+ const script = await util.promisify(fs.readFile)(path.join(compilation.compiler.outputPath, file));
+ return ``;
+ }
+ }
+
+ private async generate_entry_css_tag() {
+ if(this.options.embedInitialCSSFile) {
+ const style = await util.promisify(fs.readFile)(this.options.initialCSSFile.localFile);
+ return ``
+ } else {
+ //
+ return ``
+ }
+ }
+
+ apply(compiler: webpack.Compiler) {
+ compiler.hooks.afterEmit.tapPromise(this.constructor.name, async compilation => {
+ const input = await util.promisify(fs.readFile)(this.options.input);
+ const variables = Object.assign({}, this.options.variables);
+
+ variables["initial_script"] = await this.generate_entry_js_tag(compilation);
+ variables["initial_css"] = await this.generate_entry_css_tag();
+
+ let generated = await ejs.render(input.toString(), variables, {
+ beautify: false /* uglify is a bit dump and does not understands ES6 */
+ });
+
+ if(this.options.minify) {
+ generated = minifier.minify(generated, {
+ html5: true,
+
+ collapseWhitespace: true,
+ removeComments: true,
+ removeRedundantAttributes: true,
+ removeScriptTypeAttributes: true,
+ removeTagWhitespace: true,
+ minifyCSS: true,
+ minifyJS: true,
+ minifyURLs: true
+ });
+ }
+
+ await util.promisify(fs.writeFile)(this.options.output, generated);
+ });
+ }
+}
+
+export = EJSGenerator;
\ No newline at end of file
diff --git a/webpack/ManifestPlugin.ts b/webpack/ManifestPlugin.ts
index d74fa12b..d0e3d0a3 100644
--- a/webpack/ManifestPlugin.ts
+++ b/webpack/ManifestPlugin.ts
@@ -24,8 +24,9 @@ class ManifestGenerator {
const modules = [];
for(const chunk of chunk_group.chunks) {
+ if(!chunk.files.length) continue;
if(chunk.files.length !== 1) {
- console.error("Expected only on file per chunk but got " + chunk.files.length);
+ console.error("Expected only one file per chunk but got " + chunk.files.length);
chunk.files.forEach(e => console.log(" - %s", e));
throw "expected only one file per chunk";
}