better production detection, fix version injection

This commit is contained in:
Anton Lavrenov 2019-04-05 08:14:05 -05:00
parent 49ceea1dfc
commit 03d7ceef5a
6 changed files with 18 additions and 94 deletions

View File

@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
* Fix some stage events. `mouseenter` and `mouseleave` should work correctly on empty spaces * Fix some stage events. `mouseenter` and `mouseleave` should work correctly on empty spaces
* Fix some typescript types * Fix some typescript types
* Better detection of production mode (no extra warnings)
## [3.2.3][2019-03-21] ## [3.2.3][2019-03-21]

View File

@ -3,13 +3,11 @@ var rename = require('gulp-rename');
var uglify = require('gulp-uglify'); var uglify = require('gulp-uglify');
var concat = require('gulp-concat'); var concat = require('gulp-concat');
var replace = require('gulp-replace'); var replace = require('gulp-replace');
// var mochaPhantomJS = require('gulp-mocha-phantomjs');
var jsdoc = require('gulp-jsdoc3'); var jsdoc = require('gulp-jsdoc3');
var connect = require('gulp-connect'); var connect = require('gulp-connect');
var jscpd = require('gulp-jscpd'); var jscpd = require('gulp-jscpd');
var eslint = require('gulp-eslint'); var eslint = require('gulp-eslint');
var gutil = require('gulp-util'); var gutil = require('gulp-util');
var ts = require('gulp-typescript');
var fs = require('fs'); var fs = require('fs');
var NodeParams = fs var NodeParams = fs
@ -24,70 +22,6 @@ var ShapeParams = fs
var conf = require('./package.json'); var conf = require('./package.json');
var sourceFiles = [
// core
'src/Global.js',
'src/Util.js',
'src/Canvas.js',
'src/Context.js',
'src/Factory.js',
'src/Node.js',
// filters
'src/filters/Grayscale.js',
'src/filters/Brighten.js',
'src/filters/Invert.js',
'src/filters/Blur.js',
'src/filters/Mask.js',
'src/filters/RGB.js',
'src/filters/RGBA.js',
'src/filters/HSV.js',
'src/filters/HSL.js',
'src/filters/Emboss.js',
'src/filters/Enhance.js',
'src/filters/Posterize.js',
'src/filters/Noise.js',
'src/filters/Pixelate.js',
'src/filters/Threshold.js',
'src/filters/Sepia.js',
'src/filters/Solarize.js',
'src/filters/Kaleidoscope.js',
'src/filters/Contrast.js',
// core
'src/Container.js',
'src/Shape.js',
'src/Stage.js',
'src/BaseLayer.js',
'src/Layer.js',
'src/FastLayer.js',
'src/Group.js',
'src/Animation.js',
'src/Tween.js',
'src/DragAndDrop.js',
// shapes
'src/shapes/Rect.js',
'src/shapes/Circle.js',
'src/shapes/Ellipse.js',
'src/shapes/Ring.js',
'src/shapes/Wedge.js',
'src/shapes/Arc.js',
'src/shapes/Image.js',
'src/shapes/Text.js',
'src/shapes/Line.js',
'src/shapes/Sprite.js',
'src/shapes/Path.js',
'src/shapes/TextPath.js',
'src/shapes/RegularPolygon.js',
'src/shapes/Star.js',
'src/shapes/Label.js',
'src/shapes/Arrow.js',
'src/shapes/Transformer.js'
];
var tsProject = ts.createProject('tsconfig.json');
function build() { function build() {
return gulp return gulp
.src(['./konva.js']) .src(['./konva.js'])
@ -98,13 +32,16 @@ function build() {
.pipe(replace('@@date', new Date().toDateString())); .pipe(replace('@@date', new Date().toDateString()));
} }
// create development build gulp.task('update-version-lib', function() {
gulp.task('dev-build', function() { return gulp
return build().pipe(gulp.dest('./dist/')); .src(['./lib/Global.js'])
.pipe(replace('@@version', conf.version))
.pipe(rename('Global.js'))
.pipe(gulp.dest('./lib'));
}); });
// create usual build konva.js and konva.min.js // create usual build konva.js and konva.min.js
gulp.task('build', function() { gulp.task('pre-build', function() {
return build() return build()
.pipe(rename('konva.js')) .pipe(rename('konva.js'))
.pipe(gulp.dest('./')) .pipe(gulp.dest('./'))
@ -116,6 +53,8 @@ gulp.task('build', function() {
.pipe(gulp.dest('./')); .pipe(gulp.dest('./'));
}); });
gulp.task('build', gulp.parallel(['update-version-lib', 'pre-build']));
// local server for better development // local server for better development
gulp.task('server', function() { gulp.task('server', function() {
connect.server(); connect.server();
@ -161,8 +100,4 @@ gulp.task('api', function() {
); );
}); });
gulp.task('watch', function() { gulp.task('default', gulp.parallel(['server']));
gulp.watch(['src/**/*.js'], gulp.series(['dev-build']));
});
gulp.task('default', gulp.parallel(['dev-build', 'watch', 'server']));

View File

@ -8,7 +8,7 @@
* Konva JavaScript Framework v3.2.3 * Konva JavaScript Framework v3.2.3
* http://konvajs.org/ * http://konvajs.org/
* Licensed under the MIT * Licensed under the MIT
* Date: Wed Apr 03 2019 * Date: Fri Apr 05 2019
* *
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS) * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
* Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva) * Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva)
@ -74,16 +74,10 @@
: typeof WorkerGlobalScope !== 'undefined' : typeof WorkerGlobalScope !== 'undefined'
? self ? self
: {}; : {};
var Konva2;
(function (Konva2) {
Konva2.version = '3.2.3';
})(Konva2 || (Konva2 = {}));
var Konva = { var Konva = {
version: '3.2.3', version: '3.2.3',
isBrowser: detectBrowser(), isBrowser: detectBrowser(),
isUnminified: /comment/.test(function () { isUnminified: /param/.test(function (param) { }.toString()),
/* comment */
}.toString()),
dblClickWindow: 400, dblClickWindow: 400,
getAngle: function (angle) { getAngle: function (angle) {
return Konva.angleDeg ? angle * PI_OVER_180 : angle; return Konva.angleDeg ? angle * PI_OVER_180 : angle;

4
konva.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -86,18 +86,10 @@ export const glob: any =
? self ? self
: {}; : {};
export namespace Konva2 {
export const version = '@@version';
}
export const Konva = { export const Konva = {
version: '@@version', version: '@@version',
isBrowser: detectBrowser(), isBrowser: detectBrowser(),
isUnminified: /comment/.test( isUnminified: /param/.test(function(param) {}.toString()),
function() {
/* comment */
}.toString()
),
dblClickWindow: 400, dblClickWindow: 400,
getAngle(angle) { getAngle(angle) {
return Konva.angleDeg ? angle * PI_OVER_180 : angle; return Konva.angleDeg ? angle * PI_OVER_180 : angle;

View File

@ -36,6 +36,8 @@ declare namespace Konva {
export const isDragging: () => boolean; export const isDragging: () => boolean;
export const isDragReady: () => boolean; export const isDragReady: () => boolean;
export type Vector2d = import('./types').Vector2d;
export const Node: typeof import('./Node').Node; export const Node: typeof import('./Node').Node;
export type Node = import('./Node').Node; export type Node = import('./Node').Node;
export type NodeConfig = import('./Node').NodeConfig; export type NodeConfig = import('./Node').NodeConfig;