Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"presets": ["es2015"]
"presets": ["es2015", "react"],
"plugins": [
["transform-runtime", {"polyfill": true, "regenerator": true}]
]
}
18 changes: 9 additions & 9 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ gulp.task('build:webpack', () => {
process.env.NODE_ENV = (production == true) ? 'production' : 'development'
let plugins = [ new webpack.optimize.DedupePlugin() ]
if (production) plugins.push(new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }}))
gulp.src(resource.src.webpack.babel)
return gulp.src(resource.src.webpack.babel)
.pipe($.plumber())
.pipe(webpackStream({
entry: `${paths.src.js}/main.js`,
output: {filename: 'bundler.js'},
watch: !production,
module: {
loaders: [
{test: /\.(js|jsx)$/, loader: 'babel', query: {presets: ['es2015', 'react']}}
{test: /\.(js|jsx)$/, loader: 'babel', exclude: /node_modules/}
]
},
resolve: {
Expand All @@ -110,7 +110,7 @@ gulp.task('build:webpack', () => {

// compile Jade -> HTML
gulp.task('build:jade', () => {
gulp.src(resource.src.jade)
return gulp.src(resource.src.jade)
.pipe($.plumber())
.pipe($.jade())
.pipe($.htmlhint())
Expand All @@ -121,7 +121,7 @@ gulp.task('build:jade', () => {

// compile Sass -> CSS
gulp.task('build:sass', () => {
gulp.src(resource.src.sass)
return gulp.src(resource.src.sass)
.pipe($.plumber())
.pipe($.sass())
.pipe($.concat('style.css'))
Expand All @@ -139,7 +139,7 @@ gulp.task('build:static', () => {
.pipe(gulp.dest(paths.dist.js))
gulp.src(resource.vendor.fontawesome)
.pipe(gulp.dest(paths.dist.font))
gulp.src(resource.src.static)
return gulp.src(resource.src.static)
.pipe(gulp.dest(paths.dist.root))
})

Expand All @@ -156,18 +156,18 @@ gulp.task('server', () => {
})

// append Resource Revision
gulp.task('revision:clean', () => {
gulp.task('revision:clean', () =>
del.sync([root.tmp], { force: true })
})
)

gulp.task('revision:append', () => {
let revAll = new RevAll({dontRenameFile: [/^\/favicon.ico$/g, '.html']})
gulp.src(`${paths.dist.root}/**/*`)
return gulp.src(`${paths.dist.root}/**/*`)
.pipe(revAll.revision())
.pipe(gulp.dest(root.tmp))
})

gulp.task('revision:copy', () => {
gulp.src(`${root.tmp}/**/*`)
return gulp.src(`${root.tmp}/**/*`)
.pipe(gulp.dest(paths.dist.root))
})
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "sample-ui-react",
"version": "0.2.1",
"version": "0.2.2",
"description": "React.js Boilerplate",
"main": "source/js/main.js",
"scripts": {
"start": "gulp",
"build": "gulp build"
"build": "gulp build-prod"
},
"author": "jkazama",
"license": "MIT",
Expand All @@ -29,10 +29,10 @@
"gulp-sass": "~2.1.1",
"gulp-pleeease": "~2.0.2",
"gulp-uglify": "~1.5.1",
"gulp-cssmin": "~0.1.0",
"gulp-rev-all": "~0.8.22",
"webpack": "~1.12.14",
"webpack-stream": "~3.1.0",
"loader-utils": "~0.2.11",
"html-loader": "~0.4.0",
"template-html-loader": "~0.0.3",
"css-loader": "~0.23.1",
Expand All @@ -41,10 +41,11 @@
"node-sass": "~3.4.2",
"jade-loader": "~0.8.0",
"babel-loader": "~6.2.4",
"babel-core": "~6.6.0",
"babel-preset-es2015 ": "~6.6.0",
"babel-core": "~6.9.0",
"babel-runtime": "~6.9.0",
"babel-plugin-transform-runtime": "~6.9.0",
"babel-preset-es2015 ": "~6.9.0",
"babel-preset-react ": "~6.5.0",
"react-jade": "^2.5.0",
"browser-sync": "~2.11.0"
},
"dependencies": {
Expand Down
7 changes: 7 additions & 0 deletions source/js/platform/plain.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,16 @@ export class Ajax {
request.withCredentials()
request.accept('json')
request.timeout(Param.Api.timeout)
// for nocache
request.set('X-Requested-With', 'XMLHttpRequest')
request.set('Expires', '-1')
request.set('Cache-Control', 'no-cache,no-store,must-revalidate,max-age=-1,private')
let time = Date.now().toString()
if (request._query !== undefined && request._query[0]) {
request._query[0] += '&' + time
} else {
request._query = [time]
}
}
// GET形式のPromiseを返します。
static promiseGet(url, data = {}) {
Expand Down