diff --git a/Hudozka.Dockerfile b/Hudozka.Dockerfile index 7677f808..b2399a66 100644 --- a/Hudozka.Dockerfile +++ b/Hudozka.Dockerfile @@ -2,7 +2,7 @@ FROM node:10 as build WORKDIR /app -COPY package.json package-lock.json gulpfile.babel.js .babelrc ./ +COPY package.json package-lock.json gulpfile.js .babelrc ./ RUN npm i COPY src ./src diff --git a/gulpfile.babel.js b/gulpfile.js similarity index 74% rename from gulpfile.babel.js rename to gulpfile.js index 2699b287..658871e1 100644 --- a/gulpfile.babel.js +++ b/gulpfile.js @@ -1,13 +1,13 @@ -import gulp from 'gulp' -import postcss from 'gulp-postcss' -import sass from 'gulp-sass' -import imageMin from 'gulp-imagemin' -import uglify from 'gulp-uglify' -import concat from 'gulp-concat' -import webpack from 'webpack-stream' -import named from 'vinyl-named' -import autoprefixer from 'autoprefixer' -import cssnano from 'cssnano' +const gulp = require('gulp') +const postcss = require('gulp-postcss') +const sass = require('gulp-sass') +const imageMin = require('gulp-imagemin') +const uglify = require('gulp-uglify') +const concat = require('gulp-concat') +const webpack = require('webpack-stream') +const named = require('vinyl-named') +const autoprefixer = require('autoprefixer') +const cssnano = require('cssnano') let env = process.env['NODE_ENV'] || 'production' let isProduction = env === 'production' @@ -109,7 +109,7 @@ gulp.task('production', () => { isProduction = true }) -gulp.task('default', ['style', 'compile']) -gulp.task('copy', ['copy views', 'copy fonts', 'copy graphics', 'copy 3rdparty', 'copy robots.txt']) -gulp.task('deploy', ['default', 'copy', 'compile 3rdparty', 'imagemin']) -gulp.task('compile production', ['production', 'compile']) +gulp.task('default', gulp.series('style')) +gulp.task('copy', gulp.series('copy views', 'copy fonts', 'copy graphics', 'copy 3rdparty', 'copy robots.txt')) +gulp.task('deploy', gulp.series('default', 'copy', 'compile 3rdparty', 'imagemin')) +gulp.task('compile production', gulp.series('production', 'compile')) diff --git a/package.json b/package.json index 0a4c7210..e6a8eba9 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "eslint-plugin-promise": "^3.3.1", "eslint-plugin-react": "^7.4.0", "eslint-plugin-standard": "^2.0.1", - "gulp": "^3.8.10", + "gulp": "^4.0.0", "gulp-concat": "^2.4.1", "gulp-if": "^2.0.0", "gulp-imagemin": "~2.4.0",