Added WebPack to the default `npm start web` starter.
App could not be started out of the box (only PHP is required)canary
WolverinDEV
parent
2ef80ef84f
commit
479168c26e
39
file.ts
39
file.ts
|
|
@ -753,10 +753,17 @@ namespace watcher {
|
|||
|
||||
const data = buffer.toString();
|
||||
if(this.verbose) {
|
||||
for(const line of data.split("\n"))
|
||||
const lines = data.split("\n");
|
||||
for(let index = 0; index < lines.length; index++) {
|
||||
let line = lines[index];
|
||||
if(line.charAt(0) === "\r")
|
||||
line = line.substr(1);
|
||||
if(line === "" && index + 1 === lines.length)
|
||||
break;
|
||||
console.log("%s: %s", this.name, line);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private handle_stderr_readable() {
|
||||
const buffer: Buffer = this._process.stdout.read(this._process.stdout.readableLength);
|
||||
|
|
@ -783,20 +790,31 @@ namespace watcher {
|
|||
}
|
||||
|
||||
protected start_command(): string[] {
|
||||
return ["npm", "run", "ttsc", "--", "-w"];
|
||||
return ["npm", "run", "tsc", "--", "-w"];
|
||||
}
|
||||
}
|
||||
|
||||
export class SASSWatcher extends Watcher {
|
||||
constructor() {
|
||||
super("SASS Watcher");
|
||||
this.verbose = true;
|
||||
this.verbose = false;
|
||||
}
|
||||
|
||||
protected start_command(): string[] {
|
||||
return ["npm", "run", "sass", "--", "--watch", ".:."];
|
||||
}
|
||||
}
|
||||
|
||||
export class WebPackWatcher extends Watcher {
|
||||
constructor() {
|
||||
super("WebPack Watcher");
|
||||
this.verbose = true;
|
||||
}
|
||||
|
||||
protected start_command(): string[] {
|
||||
return ["npm", "run", "watch-web"];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function php_exe() : string {
|
||||
|
|
@ -836,6 +854,12 @@ async function main_develop(node: boolean, target: "client" | "web", port: numbe
|
|||
if(flags.indexOf("--no-sass") == -1)
|
||||
await sasswatcher.start();
|
||||
|
||||
const webpackwatcher = new watcher.WebPackWatcher();
|
||||
|
||||
try {
|
||||
if(flags.indexOf("--no-webpack") == -1)
|
||||
await webpackwatcher.start();
|
||||
|
||||
try {
|
||||
await server.launch(target === "client" ? CLIENT_APP_FILE_LIST : WEB_APP_FILE_LIST, {
|
||||
port: port,
|
||||
|
|
@ -864,6 +888,15 @@ async function main_develop(node: boolean, target: "client" | "web", port: numbe
|
|||
} catch(error) {
|
||||
console.warn("Failed to stop web server: %o", error instanceof Error ? error.message : error);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Failed to start WebPack watcher: %o", error instanceof Error ? error.message : error);
|
||||
} finally {
|
||||
try {
|
||||
await webpackwatcher.stop();
|
||||
} catch(error) {
|
||||
console.warn("Failed to stop WebPack watcher: %o", error instanceof Error ? error.message : error);
|
||||
}
|
||||
}
|
||||
} catch(error) {
|
||||
console.error("Failed to start SASS watcher: %o", error instanceof Error ? error.message : error);
|
||||
} finally {
|
||||
|
|
|
|||
10
package.json
10
package.json
|
|
@ -7,17 +7,19 @@
|
|||
"scripts": {
|
||||
"compile-sass": "sass --update shared/css/:shared/css/ web/css/:web/css/ client/css/:client/css/ vendor/:vendor/",
|
||||
"compile-project-base": "tsc -p tsbaseconfig.json",
|
||||
|
||||
"dtsgen": "node tools/dtsgen/index.js",
|
||||
"trgen": "node tools/trgen/index.js",
|
||||
"sass": "sass",
|
||||
"csso": "csso",
|
||||
"rebuild-structure-web-dev": "php files.php generate web dev",
|
||||
"minify-web-rel-file": "terser --compress --mangle --ecma 6 --keep_classnames --keep_fnames --output",
|
||||
"start": "npm run compile-file-helper && node file.js ndevelop",
|
||||
"tsc": "tsc",
|
||||
|
||||
"start": "npm run compile-project-base && node file.js ndevelop",
|
||||
|
||||
"build-web": "webpack --config webpack-web.config.js",
|
||||
"watch-web": "webpack --watch --config webpack-web.config.js",
|
||||
"build-client": "webpack --config webpack-client.config.js",
|
||||
"watch-client": "webpack --watch --config webpack-client.config.js",
|
||||
|
||||
"generate-i18n-gtranslate": "node shared/generate_i18n_gtranslate.js"
|
||||
},
|
||||
"author": "TeaSpeak (WolverinDEV)",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import * as path from "path";
|
||||
import * as config_base from "./webpack.config";
|
||||
|
||||
const config = config_base.config("client");
|
||||
export = () => config_base.config("client").then(config => {
|
||||
Object.assign(config.entry, {
|
||||
"client-app": "./client/js/index.ts"
|
||||
});
|
||||
|
|
@ -18,4 +18,5 @@ config.externals.push((context, request: string, callback) => {
|
|||
callback();
|
||||
});
|
||||
|
||||
export = config;
|
||||
return Promise.resolve(config);
|
||||
});
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import * as path from "path";
|
||||
import * as config_base from "./webpack.config";
|
||||
|
||||
const config = config_base.config("web");
|
||||
export = () => config_base.config("web").then(config => {
|
||||
Object.assign(config.entry, {
|
||||
"shared-app": "./web/js/index.ts"
|
||||
});
|
||||
|
|
@ -13,4 +13,5 @@ Object.assign(config.resolve.alias, {
|
|||
"tc-generated/codec/opus": path.resolve(__dirname, "web/native-codec/generated/TeaWeb-Worker-Codec-Opus.js"),
|
||||
});
|
||||
|
||||
export = config;
|
||||
return Promise.resolve(config);
|
||||
});
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
import * as ts from "typescript";
|
||||
import * as fs from "fs";
|
||||
import trtransformer from "./tools/trgen/ts_transformer";
|
||||
import {exec} from "child_process";
|
||||
import * as util from "util";
|
||||
|
||||
const path = require('path');
|
||||
const webpack = require("webpack");
|
||||
|
|
@ -13,7 +15,7 @@ const { CleanWebpackPlugin } = require('clean-webpack-plugin');
|
|||
|
||||
export let isDevelopment = process.env.NODE_ENV === 'development';
|
||||
console.log("Webpacking for %s (%s)", isDevelopment ? "development" : "production", process.env.NODE_ENV || "NODE_ENV not specified");
|
||||
const generate_definitions = (target: string) => {
|
||||
const generate_definitions = async (target: string) => {
|
||||
const git_rev = fs.readFileSync(path.join(__dirname, ".git", "HEAD")).toString();
|
||||
let version;
|
||||
if(git_rev.indexOf("/") === -1)
|
||||
|
|
@ -21,18 +23,27 @@ const generate_definitions = (target: string) => {
|
|||
else
|
||||
version = fs.readFileSync(path.join(__dirname, ".git", git_rev.substr(5).trim())).toString().substr(0, 7);
|
||||
|
||||
let timestamp;
|
||||
try {
|
||||
const { stdout } = await util.promisify(exec)("git show -s --format=%ct");
|
||||
timestamp = parseInt(stdout.toString());
|
||||
if(isNaN(timestamp)) throw "failed to parse timestamp '" + stdout.toString() + "'";
|
||||
} catch (error) {
|
||||
console.error("Failed to get commit timestamp: %o", error);
|
||||
throw "failed to get commit timestamp";
|
||||
}
|
||||
return {
|
||||
"__build": {
|
||||
target: JSON.stringify(target),
|
||||
mode: JSON.stringify(isDevelopment ? "debug" : "release"),
|
||||
version: JSON.stringify(version),
|
||||
timestamp: Date.now(),
|
||||
timestamp: timestamp,
|
||||
entry_chunk_name: JSON.stringify(target === "web" ? "shared-app" : "client-app")
|
||||
} as BuildDefinitions
|
||||
} as any;
|
||||
};
|
||||
|
||||
export const config = (target: "web" | "client") => { return {
|
||||
export const config = async (target: "web" | "client") => { return {
|
||||
entry: {
|
||||
"loader": "./loader/app/index.ts"
|
||||
},
|
||||
|
|
@ -63,7 +74,7 @@ export const config = (target: "web" | "client") => { return {
|
|||
minSize: 1024 * 8,
|
||||
maxSize: 1024 * 128
|
||||
}),
|
||||
new webpack.DefinePlugin(generate_definitions(target))
|
||||
new webpack.DefinePlugin(await generate_definitions(target))
|
||||
].filter(e => !!e),
|
||||
module: {
|
||||
rules: [
|
||||
|
|
|
|||
Loading…
Reference in New Issue