diff --git a/README.md b/README.md index 67b3b22a..895faf3e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ First up, make sure that node >=4.x.x and npm >=3.x.x are installed on your syst git clone git@github.com:UltimateHackingKeyboard/agent.git cd agent npm install -npm run build sass npm run dev ``` diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index 58ec6453..00000000 --- a/gulpfile.js +++ /dev/null @@ -1,35 +0,0 @@ -var gulp = require('gulp'); -var args = require('yargs').argv; -var gulpif = require('gulp-if'); -var sass = require('gulp-sass'); -var sourcemaps = require('gulp-sourcemaps'); -var webpackStream = require('webpack-stream'); - -var paths = { - sassAll: 'src/sass/**/*.scss', - cssDest: 'dist/css' -} - -gulp.task('sass', function () { - return gulp.src(paths.sassAll) - .pipe(gulpif(args.debug, sourcemaps.init())) - .pipe(sass().on('error', sass.logError)) - .pipe(gulpif(args.debug, sourcemaps.write())) - .pipe(gulp.dest(paths.cssDest)); -}); - -gulp.task('watch', function () { - gulp.watch(paths.sassAll, ['sass']); -}); - -gulp.task('webpack', function () { - return gulp.src('./src/boot.ts') - .pipe(webpackStream(require('./src/webpack.config.js')) - .on('error', function (error) { - // console.error(error.message); - this.emit('end'); - })) - .pipe(gulp.dest('dist/')); -}); - -gulp.task('default', ['sass', 'webpack']); diff --git a/package.json b/package.json index 3040d2d6..b6a3580a 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,8 @@ "@types/node": "6.0.38", "copy-webpack-plugin": "^3.0.1", "electron": "1.4.0", - "gulp": "^3.9.1", - "gulp-if": "^2.0.1", - "gulp-sass": "^2.3.2", - "gulp-sourcemaps": "^1.6.0", "html-loader": "0.4.4", + "node-sass": "^3.10.0", "npm-run-all": "3.1.0", "path": "^0.12.7", "raw-loader": "^0.5.1", @@ -30,9 +27,7 @@ "webpack": "^1.13.1", "webpack-dev-server": "^1.16.1", "webpack-fail-plugin": "^1.0.5", - "webpack-stream": "^3.2.0", - "webpack-svgstore-plugin": "^2.2.2", - "yargs": "5.0.0" + "webpack-svgstore-plugin": "^2.2.2" }, "dependencies": { "@angular/common": "2.0.0", @@ -65,7 +60,7 @@ "tslint": "tslint \"src/**/*.ts\" \"test-serializer/**/*.ts\"", "stylelint": "stylelint \"src/**/*.scss\" --syntax scss", "lint": "run-s -scn tslint stylelint", - "build": "gulp", + "build": "webpack --config \"src/webpack.config.js\"", "build:test": "webpack --config \"test-serializer/webpack.config.js\"", "dev": "webpack-dev-server --config \"src/webpack.config.js\" --content-base \"./dist\"", "electron": "electron electron/index.js"