many fixes

gulpfile.js

@@ -1,54 +1,74 @@
 const gulp = require("gulp");
 const Bundler = require("parcel-bundler");
 const path = require("path");
-const replace = require("gulp-replace");
 const fs = require("fs");
 const promisify = require("util").promisify;
+const del = require("del");
+const mkdirp = require("mkdirp");
 
 const p_copyFile = promisify(fs.copyFile);
+const p_mkdirp = promisify(mkdirp);
 
 const MODULES =  path.join(__dirname, "node_modules");
+const SRC = path.join(__dirname, "src");
+const SRCCSS = path.join(SRC, "css");
+const SRCJS = path.join(SRC, "js");
+const SRCIMG = path.join(SRC, "img");
 const WWW = path.join(__dirname, "www");
+const WWWJS = path.join(WWW, "js");
+const WWWCSS = path.join(WWW, "css");
+const WWWIMG = path.join(WWW, "img");
 const BS = path.join(MODULES, "bootstrap", "dist");
+const BSCSS = path.join(BS, "css");
+const BSJS = path.join(BS, "js");
+const JQUERY = path.join(MODULES, "jquery", "dist");
 
-/*
-gulp.task("css", () => {
-	let indexFile = path.join(_dirname, "src", "css", "index.css");
-	let bootFile = path.join(BS, "src", "css", "index.css");
-	let indexFile = path.join(_dirname, "src", "css", "index.css");
-	return p_copyFile(__dirName + "/src/css/index.css", dest)
-	.then(() => p_copyFile)
+function copy(fname, srcDir, destDir) {
+	let src = path.join(srcDir, fname);
+	let dest = path.join(destDir, fname);
+	return p_copyFile(src, dest);
+}
+
+gulp.task("clear", () => {
+	return del([WWW]);
 });
-*/
-
-gulp.task("fix-cordova", () => {
-	let file = path.join(WWW, "index.html");
-	return gulp.src([file])
-	.pipe(replace(
-		/<!--CORDOVA-->/g,
-		'<script type="text/javascript" src="cordova.js"></script>'
-	))
-	.pipe(gulp.dest(WWW + "/"));
+
+gulp.task("copyfiles", async () => {
+	await p_mkdirp(WWWCSS);
+	await p_mkdirp(WWWJS);
+	await p_mkdirp(WWWIMG);
+	await copy("index.html", SRC, WWW);
+	await copy("index.js", SRCJS, WWWJS);
+	await copy("cordova.js", SRCJS, WWWJS);
+	await copy("index.css", SRCCSS, WWWCSS);
+	await copy("mini60.jpg", SRCIMG, WWWIMG);
+	await copy("icon.png", SRCIMG, WWWIMG);
+	await copy("bootstrap.min.css", BSCSS, WWWCSS);
+	await copy("bootstrap.min.css.map", BSCSS, WWWCSS);
+	await copy("bootstrap.min.js", BSJS, WWWJS);
+	await copy("bootstrap.min.js.map", BSJS, WWWJS);
+	await copy("jquery.min.js", JQUERY, WWWJS);
+	return copy("jquery.min.map", JQUERY, WWWJS);
 });
 
 gulp.task("parcel", () => {
 	let opts = {
-		outDir: path.join(__dirname, "www"),
+		outDir: WWWJS,
 		watch: false
 	};
-	let file = path.join(__dirname, "./src/index.html");
+	let file = path.join(__dirname, "src", "js", "index.js");
 	let bundler = new Bundler(file, opts);
 	return bundler.bundle();
 });
 
-gulp.task("build", gulp.series("parcel", "fix-cordova"));
+gulp.task("build", gulp.series("clear", "copyfiles", "parcel"));
 
 gulp.task("watch", () => {
 	let opts = {
-		outDir: path.join(__dirname, "www"),
+		outDir: WWWJS,
 		watch: true
 	};
-	let file = path.join(__dirname, "./src/index.html");
+	let file = path.join(__dirname, "src", "js", "index.js");
 	let bundler = new Bundler(file, opts);
 	return bundler.bundle();
 });