update to latest react and add npm run reset

Author: modestysn

package.json

@@ -42,8 +42,8 @@
     "node-sass": "^4.12.0",
     "node-watch": "^0.6.3",
     "prop-types": "^15.7.2",
-    "react": "^16.10.0",
-    "react-dom": "^16.10.0",
+    "react": "^16.10.1",
+    "react-dom": "^16.10.1",
     "sass-loader": "^8.0.0",
     "webpack": "^4.41.0",
     "webpack-cli": "^3.3.9"
@@ -53,8 +53,8 @@
     "build:asset": "babel-node ./tool/build.asset.js",
     "build:page": "babel-node ./tool/build.page.js",
     "build:bundle": "babel-node ./tool/build.bundle.js",
-    "build:water": "",
     "build": "npm run clean:target; npm run build:asset; npm run build:bundle; npm run build:page;",
+    "reset": "rm -rf node_modules/ && rm package-lock.json && npm i && npm run build",
     "start": "babel-node ./tool/build.watcher.js"
   }
 }

src/scripts/client/util/browser.util.js

@@ -55,3 +55,4 @@ module.exports = {
 	trackEvent,
 	createGAScript
 };
+//

src/scripts/model/header.js

@@ -1,5 +1,3 @@
-"use strict";
-
 const HeaderModel = {
 	homeLink: {name: "Home", href: "./", img: "img/logo.png"},
 	bannerLink: {name: "Banner Ad", href: "", img: "http://placehold.it/420x60"},

tool/base.config.js

@@ -1,12 +1,12 @@
 import path from 'path';
-
 const pkg = require("../package.json");
+
 const APP_NAME = pkg.name;
-const CUR_DIR = path.normalize(__dirname + "/..");
+const CUR_DIR = path.resolve(__dirname, "..");
 
-const SRC_BASE = "/src";
-const TAR_BASE = "/target";
-const VENDOR_BASE = "/vendor";
+const SRC_BASE = "src";
+const TAR_BASE = "target";
+const VEN_BASE = "vendor";
 
 const CSS_BUNDLE_NAME = APP_NAME + "-bundle.min.css";
 const JS_BUNDLE_NAME = APP_NAME + "-bundle.min.js";
@@ -16,24 +16,22 @@ const Config = {
 	CUR_DIR,
 	TRACK_ID: "UA-xxx-1111",
 	APP_NAME,
-	SRC_BASE,
-	TAR_BASE,
 	src: {
-		path: CUR_DIR + SRC_BASE,
-		js_path: CUR_DIR + SRC_BASE + "/scripts",
-		js_entry: CUR_DIR + SRC_BASE + "/scripts/client/main.js",
-		sass_path: CUR_DIR + SRC_BASE + "/styles",
-		img_path: CUR_DIR + SRC_BASE + "/images",
-		vendor_css: CUR_DIR + VENDOR_BASE + "/css",
-		vendor_js:  CUR_DIR + VENDOR_BASE + "/js"
+		path: 		path.join(CUR_DIR, SRC_BASE),
+		js_path: 	path.join(CUR_DIR, SRC_BASE, "scripts"),
+		js_entry: 	path.join(CUR_DIR, SRC_BASE, "scripts", "client", "main.js"),
+		sass_path: 	path.join(CUR_DIR, SRC_BASE, "styles"),
+		img_path: 	path.join(CUR_DIR, SRC_BASE, "images"),
+		vendor_css: path.join(CUR_DIR, VEN_BASE, "css"),
+		vendor_js:  path.join(CUR_DIR, VEN_BASE, "js")
 	},
 	target: {
-		path: CUR_DIR + TAR_BASE,
+		path: 	  path.join(CUR_DIR, TAR_BASE),
+		js_path:  path.join(CUR_DIR, TAR_BASE, "js"),
+		css_path: path.join(CUR_DIR, TAR_BASE, "css"),
+		img_path: path.join(CUR_DIR, TAR_BASE, "img"),
 		js_bundle: JS_BUNDLE_NAME,
-		css_bundle: "../css/" + CSS_BUNDLE_NAME,
-		js_path: CUR_DIR + TAR_BASE + "/js",
-		css_path: CUR_DIR + TAR_BASE + "/css",
-		img_path: CUR_DIR + TAR_BASE + "/img"
+		css_bundle: `..${path.sep}css${path.sep}${CSS_BUNDLE_NAME}`
 	},
 	root_files: "*(*.png|*.xml|*.ico|*.txt|*.html|.htaccess|site.webmanifest)",
 	image_files: ['**/*.jp*g', '**/*.png', '**/*.gif', '**/*.svg']

tool/build.watcher.js

@@ -99,7 +99,7 @@ function startWatchNonBundle() {
 	console.log(`☯︎ start to watch ...`);
 	watch(Conf.src.path, {
 		recursive: true,
-		filter: f => !/(\/client\/|\/styles\/)/i.test(f),
+		filter: f => !/([/\\\\]client[/\\\\]|[/\\\\]styles[/\\\\])/gi.test(f),
 		delay: 500
 	}, (evt, f) => {
 			console.log(`☯︎ watcher evt=${evt} name=${f}`);