Merge branch 'master' into greenkeeper/tslint-5.3.2

This commit is contained in:
こぴなたみぽ 2017-05-24 12:45:12 +09:00 committed by GitHub
commit 2f527ce8a5
5 changed files with 19 additions and 7 deletions

View file

@ -26,6 +26,11 @@ services:
- redis-server - redis-server
before_script: before_script:
# Travisはproduction環境なので(10行目により)、
# npm install しただけでは devDependencies はインストールされないので、
# --only=dev オプションを付けてそれらもインストールされるようにする:
- npm install --only=dev
- mkdir ./.config - mkdir ./.config
- cp ./.travis/default.yml ./.config - cp ./.travis/default.yml ./.config
- cp ./.travis/test.yml ./.config - cp ./.travis/test.yml ./.config

View file

@ -65,6 +65,8 @@ Misskeyには公式のリリースがあります。
3. `npm install` 3. `npm install`
### 方法 2) ソースコードを利用する ### 方法 2) ソースコードを利用する
> 注: この方法では正しくビルド・動作できることは保証されません。
Misskeyを手動でビルドしたい場合は、Misskeyのソースコードと依存関係をインストールした後、 Misskeyを手動でビルドしたい場合は、Misskeyのソースコードと依存関係をインストールした後、
`build`コマンドを用いることができます: `build`コマンドを用いることができます:

View file

@ -10,7 +10,7 @@ import * as ts from 'gulp-typescript';
import tslint from 'gulp-tslint'; import tslint from 'gulp-tslint';
import * as es from 'event-stream'; import * as es from 'event-stream';
import cssnano = require('gulp-cssnano'); import cssnano = require('gulp-cssnano');
import * as uglify from 'gulp-uglify'; import * as uglifyComposer from 'gulp-uglify/composer';
import pug = require('gulp-pug'); import pug = require('gulp-pug');
import * as rimraf from 'rimraf'; import * as rimraf from 'rimraf';
import * as chalk from 'chalk'; import * as chalk from 'chalk';
@ -18,8 +18,11 @@ import imagemin = require('gulp-imagemin');
import * as rename from 'gulp-rename'; import * as rename from 'gulp-rename';
import * as mocha from 'gulp-mocha'; import * as mocha from 'gulp-mocha';
import * as replace from 'gulp-replace'; import * as replace from 'gulp-replace';
const uglifyes = require('uglify-es');
import version from './src/version'; import version from './src/version';
const uglify = uglifyComposer(uglifyes, console);
const env = process.env.NODE_ENV; const env = process.env.NODE_ENV;
const isProduction = env === 'production'; const isProduction = env === 'production';
const isDebug = !isProduction; const isDebug = !isProduction;

View file

@ -12,7 +12,6 @@
"config": "node ./tools/init.js", "config": "node ./tools/init.js",
"start": "node ./built", "start": "node ./built",
"debug": "DEBUG=misskey:* node ./built", "debug": "DEBUG=misskey:* node ./built",
"update": "./tools/update.sh",
"swagger": "node ./swagger.js", "swagger": "node ./swagger.js",
"build": "gulp build", "build": "gulp build",
"rebuild": "gulp rebuild", "rebuild": "gulp rebuild",
@ -35,7 +34,6 @@
"@types/escape-html": "0.0.19", "@types/escape-html": "0.0.19",
"@types/event-stream": "3.3.31", "@types/event-stream": "3.3.31",
"@types/express": "4.0.35", "@types/express": "4.0.35",
"@types/glob": "5.0.30",
"@types/gm": "1.17.30", "@types/gm": "1.17.30",
"@types/gulp": "4.0.3", "@types/gulp": "4.0.3",
"@types/gulp-mocha": "0.0.30", "@types/gulp-mocha": "0.0.30",
@ -76,7 +74,7 @@
"gulp-pug": "3.3.0", "gulp-pug": "3.3.0",
"gulp-rename": "1.2.2", "gulp-rename": "1.2.2",
"gulp-replace": "0.5.4", "gulp-replace": "0.5.4",
"gulp-tslint": "8.0.0", "gulp-tslint": "8.1.0",
"gulp-typescript": "3.1.6", "gulp-typescript": "3.1.6",
"gulp-uglify": "3.0.0", "gulp-uglify": "3.0.0",
"gulp-util": "3.0.8", "gulp-util": "3.0.8",
@ -87,6 +85,7 @@
"stylus-loader": "3.0.1", "stylus-loader": "3.0.1",
"swagger-jsdoc": "1.9.4", "swagger-jsdoc": "1.9.4",
"tslint": "5.3.2", "tslint": "5.3.2",
"uglify-es": "3.0.11",
"uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony", "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
"webpack": "2.6.0" "webpack": "2.6.0"
}, },
@ -105,14 +104,13 @@
"debug": "2.6.8", "debug": "2.6.8",
"deep-equal": "1.0.1", "deep-equal": "1.0.1",
"deepcopy": "0.6.3", "deepcopy": "0.6.3",
"download": "6.1.0", "download": "6.2.0",
"elasticsearch": "13.0.1", "elasticsearch": "13.0.1",
"escape-html": "1.0.3", "escape-html": "1.0.3",
"escape-regexp": "0.0.1", "escape-regexp": "0.0.1",
"express": "4.15.2", "express": "4.15.3",
"file-type": "4.3.0", "file-type": "4.3.0",
"fuckadblock": "3.2.1", "fuckadblock": "3.2.1",
"glob": "7.1.1",
"gm": "1.23.0", "gm": "1.23.0",
"inquirer": "3.0.6", "inquirer": "3.0.6",
"is-root": "1.0.0", "is-root": "1.0.0",

View file

@ -1,3 +1,7 @@
/**
* Boot screen style
*/
@charset 'utf-8'; @charset 'utf-8';
html { html {