Skip to content

Commit

Permalink
move .editorconfig and re-format code
Browse files Browse the repository at this point in the history
  • Loading branch information
ics-kawakatsu committed Jul 20, 2017
1 parent d5cb0f0 commit 16f69a9
Show file tree
Hide file tree
Showing 18 changed files with 329 additions and 329 deletions.
File renamed without changes.
20 changes: 10 additions & 10 deletions geometry_instancing/gulp/taskName.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
* Gulpのタスク名
*
* @author ICS-Kano
*/
module.exports = {
"start" : "start",
"tsCompile": "tsCompile",
"tsLint": "tsLint"
}
/**
* Gulpのタスク名
*
* @author ICS-Kano
*/
module.exports = {
"start": "start",
"tsCompile": "tsCompile",
"tsLint": "tsLint"
};
112 changes: 56 additions & 56 deletions geometry_instancing/gulp/tasks/start.js
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
/**
* ローカルサーバーの起動、ファイルウォッチ用のタスク
*
* @author ICS-Kano
*/
// 設定ファイル
const config = require("../../build_config")
const taskName = require("../taskName")
const browserSync = require("browser-sync")

require("./tsCompile")
require("./tsLint")

const gulp = require("gulp")

/**
* ローカルサーバーのタスク設定
*/
gulp.task(taskName.start,
gulp.series(
gulp.parallel(
taskName.tsLint,
taskName.tsCompile
),
() => {
startWatchTasks()
}
)
)

/**
* ウォッチタスクを開始します。
*/
function startWatchTasks() {
browserSync({
server: {
baseDir: "src" // ルートとなるディレクトリを指定
}
})

// jsファイルを監視
gulp.watch(`${config.jsFolder}/**/*.js`, (done) => {
// ファイルに変更があれば同期しているブラウザをリロード
browserSync.reload()
// リロード終了時に実行
done()
})

// TypeScriptファイルのウォッチ
gulp.watch(`${config.tsFolder}/**/*.ts`,
gulp.parallel(
taskName.tsLint, // Lint
taskName.tsCompile // コンパイル
)
)
}
/**
* ローカルサーバーの起動、ファイルウォッチ用のタスク
*
* @author ICS-Kano
*/
// 設定ファイル
const config = require("../../build_config");
const taskName = require("../taskName");
const browserSync = require("browser-sync");

require("./tsCompile");
require("./tsLint");

const gulp = require("gulp");

/**
* ローカルサーバーのタスク設定
*/
gulp.task(taskName.start,
gulp.series(
gulp.parallel(
taskName.tsLint,
taskName.tsCompile
),
() => {
startWatchTasks()
}
)
);

/**
* ウォッチタスクを開始します。
*/
function startWatchTasks() {
browserSync({
server: {
baseDir: "src" // ルートとなるディレクトリを指定
}
});

// jsファイルを監視
gulp.watch(`${config.jsFolder}/**/*.js`, (done) => {
// ファイルに変更があれば同期しているブラウザをリロード
browserSync.reload();
// リロード終了時に実行
done()
});

// TypeScriptファイルのウォッチ
gulp.watch(`${config.tsFolder}/**/*.ts`,
gulp.parallel(
taskName.tsLint, // Lint
taskName.tsCompile // コンパイル
)
)
}
54 changes: 27 additions & 27 deletions geometry_instancing/gulp/tasks/tsCompile.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
/**
* TypeScriptのコンパイルタスク
*
* @author ICS-Kano
*/

const config = require("../../build_config")
const webpackConfig = require('../../webpack.config.js')

const taskName = require("../taskName")

const gulp = require("gulp")
const plumber = require("gulp-plumber")
const webpackStream = require("webpack-stream")
const webpack = require("webpack")

const sourcemaps = require("gulp-sourcemaps")

// TODO:webpak 2 fix

gulp.task(taskName.tsCompile, () => {
return sourcemaps.init()
.pipe(plumber())
.pipe(webpackStream(webpackConfig))
.pipe(sourcemaps.write("./"))
.pipe(gulp.dest(config.jsFolder))
})
/**
* TypeScriptのコンパイルタスク
*
* @author ICS-Kano
*/

const config = require("../../build_config");
const webpackConfig = require('../../webpack.config.js');

const taskName = require("../taskName");

const gulp = require("gulp");
const plumber = require("gulp-plumber");
const webpackStream = require("webpack-stream");
const webpack = require("webpack");

const sourcemaps = require("gulp-sourcemaps");

// TODO:webpak 2 fix

gulp.task(taskName.tsCompile, () => {
return sourcemaps.init()
.pipe(plumber())
.pipe(webpackStream(webpackConfig))
.pipe(sourcemaps.write("./"))
.pipe(gulp.dest(config.jsFolder))
});
54 changes: 27 additions & 27 deletions geometry_instancing/gulp/tasks/tsLint.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
/**
* TypeScriptのLintチェック
*
* @author ICS-Kano
*/
const config = require("../../build_config")
const taskName = require("../taskName")

const gulp = require("gulp")
const tslint = require("gulp-tslint")
const notify = require("gulp-notify")
const plumber = require("gulp-plumber")

gulp.task(taskName.tsLint, () => {
return gulp.src(`${config.tsFolder}**/*.ts`)
.pipe(plumber({
errorHandler: function(err) {
notify.onError(`ts Error:${err}`)
this.emit("end")
}
}))
.pipe(tslint({
formatter: "verbose",
configuration: "./tslint.json"
}))
.pipe(tslint.report())
})
/**
* TypeScriptのLintチェック
*
* @author ICS-Kano
*/
const config = require("../../build_config");
const taskName = require("../taskName");

const gulp = require("gulp");
const tslint = require("gulp-tslint");
const notify = require("gulp-notify");
const plumber = require("gulp-plumber");

gulp.task(taskName.tsLint, () => {
return gulp.src(`${config.tsFolder}**/*.ts`)
.pipe(plumber({
errorHandler: function (err) {
notify.onError(`ts Error:${err}`);
this.emit("end")
}
}))
.pipe(tslint({
formatter: "verbose",
configuration: "./tslint.json"
}))
.pipe(tslint.report())
});
4 changes: 2 additions & 2 deletions geometry_instancing/gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const requireDir =require("require-dir")
requireDir("./gulp", {recurse: true})
const requireDir = require("require-dir");
requireDir("./gulp", {recurse: true});
46 changes: 23 additions & 23 deletions geometry_instancing/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// ビルド設定ファイル
const buidConfig = require("./build_config")

const entry = {}

/** webpackの設定ファイルです。 */
let webpackConfig = {
entry: buidConfig.tsEntryFiles,
output: {
filename: "[name].js"
},
devtool: "source-map",
resolve: {
extensions: ["", ".ts"]
},
module: {
loaders: [
{test: /\.ts$/, loader: 'ts-loader'}
]
}
}

module.exports = webpackConfig
// ビルド設定ファイル
const buidConfig = require("./build_config");

const entry = {};

/** webpackの設定ファイルです。 */
let webpackConfig = {
entry: buidConfig.tsEntryFiles,
output: {
filename: "[name].js"
},
devtool: "source-map",
resolve: {
extensions: ["", ".ts"]
},
module: {
loaders: [
{test: /\.ts$/, loader: 'ts-loader'}
]
}
};

module.exports = webpackConfig;
File renamed without changes.
20 changes: 10 additions & 10 deletions multiple_render_targets/gulp/taskName.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
* Gulpのタスク名
*
* @author ICS-Kano
*/
module.exports = {
"start" : "start",
"tsCompile": "tsCompile",
"tsLint": "tsLint"
};
/**
* Gulpのタスク名
*
* @author ICS-Kano
*/
module.exports = {
"start": "start",
"tsCompile": "tsCompile",
"tsLint": "tsLint"
};
54 changes: 27 additions & 27 deletions multiple_render_targets/gulp/tasks/tsLint.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
/**
* TypeScriptのLintチェック
*
* @author ICS-Kano
*/
const config = require("../../build_config");
const taskName = require("../taskName");

const gulp = require("gulp");
const tslint = require("gulp-tslint");
const notify = require("gulp-notify");
const plumber = require("gulp-plumber");

gulp.task(taskName.tsLint, () => {
return gulp.src(`${config.tsFolder}**/*.ts`)
.pipe(plumber({
errorHandler: function(err) {
notify.onError(`ts Error:${err}`);
this.emit("end");
}
}))
.pipe(tslint({
formatter: "verbose",
configuration: "./tslint.json"
}))
.pipe(tslint.report());
});
/**
* TypeScriptのLintチェック
*
* @author ICS-Kano
*/
const config = require("../../build_config");
const taskName = require("../taskName");

const gulp = require("gulp");
const tslint = require("gulp-tslint");
const notify = require("gulp-notify");
const plumber = require("gulp-plumber");

gulp.task(taskName.tsLint, () => {
return gulp.src(`${config.tsFolder}**/*.ts`)
.pipe(plumber({
errorHandler: function (err) {
notify.onError(`ts Error:${err}`);
this.emit("end");
}
}))
.pipe(tslint({
formatter: "verbose",
configuration: "./tslint.json"
}))
.pipe(tslint.report());
});
4 changes: 2 additions & 2 deletions multiple_render_targets/gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const requireDir =require("require-dir");
requireDir("./gulp", {recurse: true});
const requireDir = require("require-dir");
requireDir("./gulp", {recurse: true});
File renamed without changes.
Loading

0 comments on commit 16f69a9

Please sign in to comment.