Skip to content

Commit

Permalink
Updated building to work again
Browse files Browse the repository at this point in the history
  • Loading branch information
lindell committed Oct 1, 2020
1 parent 967b778 commit 3f65edf
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 74 deletions.
5 changes: 3 additions & 2 deletions automation/building.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var clean = require('gulp-clean');
var gulpWebpack = require('webpack-stream');
var webpack = require('webpack');
var babel = require("gulp-babel");
var runSequence = require('run-sequence');
var runSequence = require('gulp4-run-sequence');
var fs = require('fs');

var settings = require('./settings.json');
Expand Down Expand Up @@ -39,6 +39,7 @@ function webpackFunc() {
return gulp.src('bin/JsBarcode.js')
.pipe(gulpWebpack(
{
mode: "none",
output: {
filename: 'JsBarcode.all.js'
}
Expand All @@ -58,10 +59,10 @@ function webpackMin(name, dest) {
return gulp.src('bin/JsBarcode.js')
.pipe(gulpWebpack(
{
mode: "production",
output: {
filename: shared.minifiedFilename(name)
},
plugins: [new webpack.optimize.UglifyJsPlugin()]
}
, webpack))
.pipe(header(settings.banner, require(settings.baseDir + 'package.json')))
Expand Down
4 changes: 2 additions & 2 deletions automation/releasing.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var bump = require('gulp-bump');
var git = require('gulp-git');
var publishRelease = require('publish-release');
var gzipSize = require('gzip-size');
var runSequence = require('run-sequence');
var runSequence = require('gulp4-run-sequence');
var fs = require('fs');

var settings = require('./settings.json');
Expand Down Expand Up @@ -78,7 +78,7 @@ gulp.task('github-release', function (done) {



gulp.task('release', gulp.series(['lint'], function (callback) {
gulp.task('release', gulp.series(function (callback) {
runSequence(
'git-release',
'github-release',
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "JsBarcode",
"main": "dist/JsBarcode.all.min.js",
"version": "3.11.0",
"version": "3.11.2",
"homepage": "https://github.com/lindell/JsBarcode",
"authors": [
"Johan Lindell <[email protected]>"
Expand Down
87 changes: 20 additions & 67 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsbarcode",
"version": "3.11.0",
"version": "3.11.2",
"description": "JsBarcode is a customizable barcode generator with support for multiple barcode formats.",
"main": "./bin/JsBarcode.js",
"directories": {
Expand Down Expand Up @@ -54,12 +54,12 @@
"gulp-header": "^2.0.9",
"gulp-rename": "^2.0.0",
"gulp-uglify": "^3.0.2",
"gulp4-run-sequence": "^1.0.0",
"gzip-size": "^5.1.1",
"mocha": "^8.1.1",
"mocha-lcov-reporter": "^1.3.0",
"publish-release": "^1.6.1",
"request": "^2.88.2",
"run-sequence": "^2.2.1",
"webpack": "^4.44.1",
"webpack-stream": "^5.2.1",
"xmldom": "^0.1.31"
Expand Down

0 comments on commit 3f65edf

Please sign in to comment.