From 4c6bbb8d732821bd7fd2c273ef2e2720d469d4ba Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 23 May 2017 16:27:28 +0000 Subject: [PATCH 01/17] chore(package): update gulp-tslint to version 8.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ae0afbbd97..996716e0b3 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "gulp-pug": "3.3.0", "gulp-rename": "1.2.2", "gulp-replace": "0.5.4", - "gulp-tslint": "8.0.0", + "gulp-tslint": "8.1.0", "gulp-typescript": "3.1.6", "gulp-uglify": "3.0.0", "gulp-util": "3.0.8", From e5028cafb038d556e2334aa1e3ae24920a97a32b Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 23 May 2017 22:11:33 +0000 Subject: [PATCH 02/17] fix(package): update download to version 6.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 996716e0b3..7664dbfc6d 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "debug": "2.6.8", "deep-equal": "1.0.1", "deepcopy": "0.6.3", - "download": "6.1.0", + "download": "6.2.0", "elasticsearch": "13.0.1", "escape-html": "1.0.3", "escape-regexp": "0.0.1", From 3292df52e4849bab15b46c268a59eded26b6ee2e Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 08:52:08 +0900 Subject: [PATCH 03/17] Fix: Using a Different UglifyJS in gulp-uglify --- gulpfile.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gulpfile.ts b/gulpfile.ts index 2484fa8a0c..d5ba64970a 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -10,7 +10,7 @@ import * as ts from 'gulp-typescript'; import tslint from 'gulp-tslint'; import * as es from 'event-stream'; import cssnano = require('gulp-cssnano'); -import * as uglify from 'gulp-uglify'; +import * as uglifyComposer from 'gulp-uglify/composer'; import pug = require('gulp-pug'); import * as rimraf from 'rimraf'; import * as chalk from 'chalk'; @@ -18,8 +18,11 @@ import imagemin = require('gulp-imagemin'); import * as rename from 'gulp-rename'; import * as mocha from 'gulp-mocha'; import * as replace from 'gulp-replace'; +import * as uglifyjs from 'uglify-js'; import version from './src/version'; +const uglify = uglifyComposer(uglifyjs, console); + const env = process.env.NODE_ENV; const isProduction = env === 'production'; const isDebug = !isProduction; From 486909d86baf28c8bc82a134e0163aad00b925fe Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 08:52:17 +0900 Subject: [PATCH 04/17] Improve readability --- src/web/app/init.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/web/app/init.css b/src/web/app/init.css index c92f30b443..2587f63943 100644 --- a/src/web/app/init.css +++ b/src/web/app/init.css @@ -1,3 +1,7 @@ +/** + * Boot screen style + */ + @charset 'utf-8'; html { From a3dcefc2fb73d5613f27d72fa2f4f7a4d3006a5a Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 08:57:14 +0900 Subject: [PATCH 05/17] Clean up: Remove unused dependencies --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 7664dbfc6d..d26a57c913 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "@types/escape-html": "0.0.19", "@types/event-stream": "3.3.31", "@types/express": "4.0.35", - "@types/glob": "5.0.30", "@types/gm": "1.17.30", "@types/gulp": "4.0.3", "@types/gulp-mocha": "0.0.30", @@ -112,7 +111,6 @@ "express": "4.15.2", "file-type": "4.3.0", "fuckadblock": "3.2.1", - "glob": "7.1.1", "gm": "1.23.0", "inquirer": "3.0.6", "is-root": "1.0.0", From fd79f544baedd368e6c49c02bde626055ac292a4 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 08:57:41 +0900 Subject: [PATCH 06/17] Update a dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d26a57c913..2236550815 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "elasticsearch": "13.0.1", "escape-html": "1.0.3", "escape-regexp": "0.0.1", - "express": "4.15.2", + "express": "4.15.3", "file-type": "4.3.0", "fuckadblock": "3.2.1", "gm": "1.23.0", From 230a7b3d08c1f1fc1525ec32862c1295ecb91eba Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 08:59:41 +0900 Subject: [PATCH 07/17] Fix --- gulpfile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.ts b/gulpfile.ts index d5ba64970a..0cc636fb91 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -10,7 +10,7 @@ import * as ts from 'gulp-typescript'; import tslint from 'gulp-tslint'; import * as es from 'event-stream'; import cssnano = require('gulp-cssnano'); -import * as uglifyComposer from 'gulp-uglify/composer'; +const uglifyComposer = require('gulp-uglify/composer'); import pug = require('gulp-pug'); import * as rimraf from 'rimraf'; import * as chalk from 'chalk'; From 08019a665c8688cbf8c30712f749c3baee161108 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 09:02:55 +0900 Subject: [PATCH 08/17] Revert "Fix" This reverts commit 230a7b3d08c1f1fc1525ec32862c1295ecb91eba. --- gulpfile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.ts b/gulpfile.ts index 0cc636fb91..d5ba64970a 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -10,7 +10,7 @@ import * as ts from 'gulp-typescript'; import tslint from 'gulp-tslint'; import * as es from 'event-stream'; import cssnano = require('gulp-cssnano'); -const uglifyComposer = require('gulp-uglify/composer'); +import * as uglifyComposer from 'gulp-uglify/composer'; import pug = require('gulp-pug'); import * as rimraf from 'rimraf'; import * as chalk from 'chalk'; From 05fa5dea0a223960625c4fe3ca0cd4ee224bdf42 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 09:16:56 +0900 Subject: [PATCH 09/17] Fix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f3da1bd338..bcba4d76b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ before_script: - mkdir ./.config - cp ./.travis/default.yml ./.config - cp ./.travis/test.yml ./.config + - npm install - npm run build after_success: From 676e5ceac31afc600913660ba9abfa9d5af082ac Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 09:22:15 +0900 Subject: [PATCH 10/17] Clean up --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 2236550815..a1e59e8959 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "config": "node ./tools/init.js", "start": "node ./built", "debug": "DEBUG=misskey:* node ./built", - "update": "./tools/update.sh", "swagger": "node ./swagger.js", "build": "gulp build", "rebuild": "gulp rebuild", From d4a7d9de12705dfbea955e94ebcc35f6a8940a69 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 09:25:49 +0900 Subject: [PATCH 11/17] Add note --- docs/setup.ja.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/setup.ja.md b/docs/setup.ja.md index d0a9d79d9a..2841684580 100644 --- a/docs/setup.ja.md +++ b/docs/setup.ja.md @@ -65,6 +65,7 @@ Misskeyには公式のリリースがあります。 3. `npm install` ### 方法 2) ソースコードを利用する +> 注: この方法では正しくビルド・動作できることは保証されません。 Misskeyを手動でビルドしたい場合は、Misskeyのソースコードと依存関係をインストールした後、 `build`コマンドを用いることができます: From caae11b4f2b22e4183bf6ae895375cbb978256c8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 09:29:57 +0900 Subject: [PATCH 12/17] Fix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bcba4d76b5..575e5185a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ before_script: - mkdir ./.config - cp ./.travis/default.yml ./.config - cp ./.travis/test.yml ./.config + - npm install --only=dev - npm install - npm run build From 91cb3dae7498fb04367d4f7ba84d71df0f513e21 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 09:37:26 +0900 Subject: [PATCH 13/17] Clean up and Add note --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 575e5185a2..5df0d46915 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,11 +26,14 @@ services: - redis-server before_script: + # Travisはproduction環境なので(10行目により)、 + # npm install しただけでは devDependencies はインストールされないので、 + # --only=dev オプションを付けてそれらもインストールされるようにする: + - npm install --only=dev + - mkdir ./.config - cp ./.travis/default.yml ./.config - cp ./.travis/test.yml ./.config - - npm install --only=dev - - npm install - npm run build after_success: From 4f75202ea84e57c9c787343ce0069013d37e3a43 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 09:39:04 +0900 Subject: [PATCH 14/17] Fix --- gulpfile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.ts b/gulpfile.ts index d5ba64970a..7fa7667dff 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -18,7 +18,7 @@ import imagemin = require('gulp-imagemin'); import * as rename from 'gulp-rename'; import * as mocha from 'gulp-mocha'; import * as replace from 'gulp-replace'; -import * as uglifyjs from 'uglify-js'; +const uglifyjs = require('uglify-js'); import version from './src/version'; const uglify = uglifyComposer(uglifyjs, console); From 6f3b31bd8b2151be02cef3d0d3ac94f5910eaa59 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 09:42:22 +0900 Subject: [PATCH 15/17] Revert "Fix" This reverts commit 4f75202ea84e57c9c787343ce0069013d37e3a43. --- gulpfile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.ts b/gulpfile.ts index 7fa7667dff..d5ba64970a 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -18,7 +18,7 @@ import imagemin = require('gulp-imagemin'); import * as rename from 'gulp-rename'; import * as mocha from 'gulp-mocha'; import * as replace from 'gulp-replace'; -const uglifyjs = require('uglify-js'); +import * as uglifyjs from 'uglify-js'; import version from './src/version'; const uglify = uglifyComposer(uglifyjs, console); From a8ef6b66f6745a7b26db8468b32f78668380d552 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 May 2017 09:47:48 +0900 Subject: [PATCH 16/17] Fix --- gulpfile.ts | 4 ++-- package.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gulpfile.ts b/gulpfile.ts index d5ba64970a..278b20bb12 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -18,10 +18,10 @@ import imagemin = require('gulp-imagemin'); import * as rename from 'gulp-rename'; import * as mocha from 'gulp-mocha'; import * as replace from 'gulp-replace'; -import * as uglifyjs from 'uglify-js'; +const uglifyes = require('uglify-es'); import version from './src/version'; -const uglify = uglifyComposer(uglifyjs, console); +const uglify = uglifyComposer(uglifyes, console); const env = process.env.NODE_ENV; const isProduction = env === 'production'; diff --git a/package.json b/package.json index a1e59e8959..5a35bab8dd 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "stylus-loader": "3.0.1", "swagger-jsdoc": "1.9.4", "tslint": "5.3.0", + "uglify-es": "3.0.11", "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony", "webpack": "2.6.0" }, From dc96221f20d3e5382cc74715a024a370fac6482b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=B4=E3=81=AA=E3=81=9F=E3=81=BF=E3=81=BD?= Date: Wed, 24 May 2017 10:10:22 +0900 Subject: [PATCH 17/17] Update setup.ja.md --- docs/setup.ja.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/setup.ja.md b/docs/setup.ja.md index 2841684580..fe67e35474 100644 --- a/docs/setup.ja.md +++ b/docs/setup.ja.md @@ -66,6 +66,7 @@ Misskeyには公式のリリースがあります。 ### 方法 2) ソースコードを利用する > 注: この方法では正しくビルド・動作できることは保証されません。 + Misskeyを手動でビルドしたい場合は、Misskeyのソースコードと依存関係をインストールした後、 `build`コマンドを用いることができます: