From 50e65d292c2425dc24aa37c593e401b2114469e6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Mar 2017 19:00:04 +0900
Subject: [PATCH] Refactoring

---
 src/web/app/auth/view.pug    |  2 +-
 src/web/app/client/script.js | 29 ++++++++---------------------
 src/web/app/dev/view.pug     |  2 +-
 webpack.config.ts            |  2 +-
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/web/app/auth/view.pug b/src/web/app/auth/view.pug
index ae2a65202..5bc3b20ff 100644
--- a/src/web/app/auth/view.pug
+++ b/src/web/app/auth/view.pug
@@ -2,4 +2,4 @@ extends ../base
 
 block head
 	meta(name='viewport' content='width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no')
-	script(src=`/assets/auth/script.${version}.js` async defer)
+	script(src=`/assets/auth.${version}.js` async defer)
diff --git a/src/web/app/client/script.js b/src/web/app/client/script.js
index 876d2c169..d46aa4a18 100644
--- a/src/web/app/client/script.js
+++ b/src/web/app/client/script.js
@@ -12,32 +12,19 @@
 	const ua = navigator.userAgent.toLowerCase();
 	const isMobile = /mobile|iphone|ipad|android/.test(ua);
 
-	isMobile ? mountMobile() : mountDesktop();
+	const app = isMobile ? 'mobile' : 'desktop';
 
-	/**
-	 * Mount the desktop app
-	 */
-	function mountDesktop() {
-		const script = document.createElement('script');
-		script.setAttribute('src', `/assets/desktop/script.${VERSION}.${lang}.js`);
-		script.setAttribute('async', 'true');
-		script.setAttribute('defer', 'true');
-		head.appendChild(script);
-	}
+	// Load app script
+	const script = document.createElement('script');
+	script.setAttribute('src', `/assets/${app}.${VERSION}.${lang}.js`);
+	script.setAttribute('async', 'true');
+	script.setAttribute('defer', 'true');
+	head.appendChild(script);
 
-	/**
-	 * Mount the mobile app
-	 */
-	function mountMobile() {
+	if (isMobile) {
 		const meta = document.createElement('meta');
 		meta.setAttribute('name', 'viewport');
 		meta.setAttribute('content', 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no');
 		head.appendChild(meta);
-
-		const script = document.createElement('script');
-		script.setAttribute('src', `/assets/mobile/script.${VERSION}.${lang}.js`);
-		script.setAttribute('async', 'true');
-		script.setAttribute('defer', 'true');
-		head.appendChild(script);
 	}
 })();
diff --git a/src/web/app/dev/view.pug b/src/web/app/dev/view.pug
index b8bbddb50..1a9a0e5bb 100644
--- a/src/web/app/dev/view.pug
+++ b/src/web/app/dev/view.pug
@@ -1,4 +1,4 @@
 extends ../base
 
 block head
-	script(src=`/assets/dev/script.${version}.js` async defer)
+	script(src=`/assets/dev.${version}.js` async defer)
diff --git a/webpack.config.ts b/webpack.config.ts
index 1300d2c9e..9e390f460 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -85,7 +85,7 @@ module.exports = (Object as any).entries(languages).map(([lang, locale]) => {
 		],
 		output: {
 			path: __dirname + '/built/web/assets',
-			filename: `[name]/script.${version}.${lang}.js`
+			filename: `[name].${version}.${lang}.js`
 		}
 	};