Merge remote-tracking branch 'refs/remotes/origin/master' into no-build-requires-config

gulpfile.ts

@@ -167,11 +167,7 @@ gulp.task('build:client:scripts', () => new Promise(async (ok) => {
 			.pipe(babel({
 				presets: ['es2015']
 			}))
-			.pipe(uglify({
+			.pipe(uglify());
-				mangle: {
-					toplevel: true
-				}
-			}));
 	}
 
 	es.merge(

src/web/app/auth/tags/index.tag

@@ -23,7 +23,7 @@
 		<h1>サインインしてください</h1>
 		<mk-signin></mk-signin>
 	</main>
-	<footer><img src="/_/resources/auth/logo.svg" alt="Misskey"/></footer>
+	<footer><img src="/resources/auth/logo.svg" alt="Misskey"/></footer>
 	<style>
 		:scope
 			display block

src/web/app/auth/view.pug

@@ -2,5 +2,5 @@ extends ../base
 
 block head
 	meta(name='viewport', content='width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no')
-	link(rel='stylesheet', href='/_/resources/auth/style.css')
+	link(rel='stylesheet', href='/resources/auth/style.css')
-	script(src='/_/resources/auth/script.js', async, defer)
+	script(src='/resources/auth/script.js', async, defer)

src/web/app/base.pug

@@ -16,8 +16,8 @@ html(lang='ja', dir='ltr')
 		block head
 
 	body
-		noscript: div: p JavaScriptを有効にしてください
+		noscript: p JavaScriptを有効にしてください
-		div#init: p
+		div#ini: p
 			span .
 			span .
 			span .

src/web/app/boot.js

@@ -94,8 +94,8 @@ module.exports = callback => {
 
 		mixins(me);
 
-		const init = document.getElementById('init');
+		const ini = document.getElementById('ini');
-		init.parentNode.removeChild(init);
+		ini.parentNode.removeChild(ini);
 
 		const app = document.createElement('div');
 		app.setAttribute('id', 'app');

src/web/app/client/script.js

@@ -1,26 +1,28 @@
-const head = document.getElementsByTagName('head')[0];
+(() => {
-const ua = navigator.userAgent.toLowerCase();
+	const head = document.getElementsByTagName('head')[0];
-const isMobile = /mobile|iphone|ipad|android/.test(ua);
+	const ua = navigator.userAgent.toLowerCase();
+	const isMobile = /mobile|iphone|ipad|android/.test(ua);
 
-isMobile ? mountMobile() : mountDesktop();
+	isMobile ? mountMobile() : mountDesktop();
 
-function mountDesktop() {
+	function mountDesktop() {
 		const script = document.createElement('script');
-	script.setAttribute('src', '/_/resources/desktop/script.js');
+		script.setAttribute('src', '/resources/desktop/script.js');
 		script.setAttribute('async', 'true');
 		script.setAttribute('defer', 'true');
 		head.appendChild(script);
-}
+	}
 
-function mountMobile() {
+	function mountMobile() {
 		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', '/_/resources/mobile/script.js');
+		script.setAttribute('src', '/resources/mobile/script.js');
 		script.setAttribute('async', 'true');
 		script.setAttribute('defer', 'true');
 		head.appendChild(script);
-}
+	}
+})();

src/web/app/common/tags/core-error.tag

@@ -1,6 +1,6 @@
 <mk-core-error>
 	<!--i: i.fa.fa-times-circle-->
-	<img src="/_/resources/error.jpg" alt=""/>
+	<img src="/resources/error.jpg" alt=""/>
 	<h1>サーバーに接続できません</h1>
 	<p class="text">インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから<a onclick={ retry }>再度お試し</a>ください。</p>
 	<p class="thanks">いつもMisskeyをご利用いただきありがとうございます。</p>

src/web/app/common/tags/messaging/index.tag

@@ -191,7 +191,7 @@
 
 					&:not([data-is-me]):not([data-is-read])
 						> div
-							background-image url("/_/resources/unread.svg")
+							background-image url("/resources/unread.svg")
 							background-repeat no-repeat
 							background-position 0 center
 

src/web/app/common/tags/messaging/message.tag

@@ -2,7 +2,7 @@
 	<div class="content-container">
 		<div class="balloon">
 			<p class="read" if={ message.is_me && message.is_read }>既読</p>
-			<button class="delete-button" if={ message.is_me } title="メッセージを削除"><img src="/_/resources/desktop/messaging/delete.png" alt="Delete"/></button>
+			<button class="delete-button" if={ message.is_me } title="メッセージを削除"><img src="/resources/desktop/messaging/delete.png" alt="Delete"/></button>
 			<div class="content" if={ !message.is_deleted }>
 				<div ref="text"></div>
 				<div class="image" if={ message.file }><img src={ message.file.url } alt="image" title={ message.file.name }/></div>

src/web/app/desktop/tags/drive/file.tag

@@ -1,11 +1,11 @@
 <mk-drive-browser-file data-is-selected={ (file._selected || false).toString() } data-is-contextmenu-showing={ isContextmenuShowing.toString() } onclick={ onclick } oncontextmenu={ oncontextmenu } draggable="true" ondragstart={ ondragstart } ondragend={ ondragend } title={ title }>
-	<div class="label" if={ I.avatar_id == file.id }><img src="/_/resources/label.svg"/>
+	<div class="label" if={ I.avatar_id == file.id }><img src="/resources/label.svg"/>
 		<p>アバター</p>
 	</div>
-	<div class="label" if={ I.banner_id == file.id }><img src="/_/resources/label.svg"/>
+	<div class="label" if={ I.banner_id == file.id }><img src="/resources/label.svg"/>
 		<p>バナー</p>
 	</div>
-	<div class="label" if={ I.data.wallpaper == file.id }><img src="/_/resources/label.svg"/>
+	<div class="label" if={ I.data.wallpaper == file.id }><img src="/resources/label.svg"/>
 		<p>壁紙</p>
 	</div>
 	<div class="thumbnail"><img src={ file.url + '?thumbnail&size=128' } alt=""/></div>

src/web/app/desktop/tags/pages/entrance.tag

@@ -1,5 +1,5 @@
 <mk-entrance>
-	<main><img src="/_/resources/title.svg" alt="Misskey"/>
+	<main><img src="/resources/title.svg" alt="Misskey"/>
 		<mk-entrance-signin if={ mode == 'signin' }></mk-entrance-signin>
 		<mk-entrance-signup if={ mode == 'signup' }></mk-entrance-signup>
 		<div class="introduction" if={ mode == 'introduction' }>

src/web/app/desktop/tags/post-form.tag

@@ -4,7 +4,7 @@
 		<div class="medias { with: poll }" if={ files.length != 0 }>
 			<ul>
 				<li each={ files }>
-					<div class="img" style="background-image: url({ url + '?thumbnail&size=64' })" title={ name }></div><img class="remove" onclick={ _remove } src="/_/resources/desktop/remove.png" title="添付取り消し" alt=""/>
+					<div class="img" style="background-image: url({ url + '?thumbnail&size=64' })" title={ name }></div><img class="remove" onclick={ _remove } src="/resources/desktop/remove.png" title="添付取り消し" alt=""/>
 				</li>
 				<li class="add" if={ files.length < 4 } title="PCからファイルを添付" onclick={ selectFile }><i class="fa fa-plus"></i></li>
 			</ul>

src/web/app/desktop/tags/ui-header.tag

@@ -44,7 +44,7 @@
 						display block
 						width 100%
 						height 48px
-						background-image url(/_/resources/desktop/header-logo.svg)
+						background-image url(/resources/desktop/header-logo.svg)
 						background-size 64px
 						background-position center
 						background-repeat no-repeat

src/web/app/dev/view.pug

@@ -1,5 +1,5 @@
 extends ../base
 
 block head
-	link(rel='stylesheet', href='/_/resources/dev/style.css')
+	link(rel='stylesheet', href='/resources/dev/style.css')
-	script(src='/_/resources/dev/script.js', async, defer)
+	script(src='/resources/dev/script.js', async, defer)

src/web/app/init.css

@@ -4,9 +4,9 @@ html {
 	font-family: sans-serif;
 }
 
-body > noscript > div {
+body > noscript {
 	position: fixed;
-	z-index: 32768;
+	z-index: 2;
 	top: 0;
 	left: 0;
 	width: 100%;
@@ -14,16 +14,16 @@ body > noscript > div {
 	text-align: center;
 	background: #fff;
 }
-	body > noscript > div > p {
+	body > noscript > p {
 		display: block;
 		margin: 32px;
 		font-size: 2em;
 		color: #555;
 	}
 
-#init {
+#ini {
 	position: fixed;
-	z-index: 16384;
+	z-index: 1;
 	top: 0;
 	left: 0;
 	width: 100%;
@@ -32,27 +32,27 @@ body > noscript > div {
 	background: #fff;
 	cursor: wait;
 }
-	#init > p {
+	#ini > p {
 		display: block;
 		user-select: none;
 		margin: 32px;
 		font-size: 4em;
 		color: #555;
 	}
-		#init > p > span {
+		#ini > p > span {
-			animation: init 1.4s infinite ease-in-out both;
+			animation: ini 1.4s infinite ease-in-out both;
 		}
-		#init > p > span:nth-child(1) {
+		#ini > p > span:nth-child(1) {
 			animation-delay: 0s;
 		}
-		#init > p > span:nth-child(2) {
+		#ini > p > span:nth-child(2) {
 			animation-delay: 0.16s;
 		}
-		#init > p > span:nth-child(3) {
+		#ini > p > span:nth-child(3) {
 			animation-delay: 0.32s;
 		}
 
-@keyframes init {
+@keyframes ini {
 	0%, 80%, 100% {
 		opacity: 1;
 	}

src/web/app/mobile/tags/page/entrance.tag

@@ -1,5 +1,5 @@
 <mk-entrance>
-	<main><img src="/_/resources/title.svg" alt="Misskey"/>
+	<main><img src="/resources/title.svg" alt="Misskey"/>
 		<mk-entrance-signin if={ mode == 'signin' }></mk-entrance-signin>
 		<mk-entrance-signup if={ mode == 'signup' }></mk-entrance-signup>
 		<div class="introduction" if={ mode == 'introduction' }>

src/web/server.ts

@@ -40,7 +40,7 @@ app.use((req, res, next) => {
 app.use(favicon(`${__dirname}/resources/favicon.ico`));
 app.get('/manifest.json', (req, res) => res.sendFile(__dirname + '/resources/manifest.json'));
 app.get('/apple-touch-icon.png', (req, res) => res.sendFile(__dirname + '/resources/apple-touch-icon.png'));
-app.use('/_/resources', express.static(`${__dirname}/resources`, {
+app.use('/resources', express.static(`${__dirname}/resources`, {
 	maxAge: ms('7 days')
 }));
 

tsconfig.json

@@ -21,6 +21,6 @@
 		"./src/**/*.ts"
 	],
 	"exclude": [
-		"./src/web/**/*.ts"
+		"./src/web/app/**/*.ts"
 	]
 }