From 149c8d83fde37b340f338549087da1356e2a328a Mon Sep 17 00:00:00 2001
From: Anton Lavrenov <lavrton@gmail.com>
Date: Wed, 4 May 2022 16:04:16 -0500
Subject: [PATCH] try cmjs only

---
 gulpfile.mjs         | 39 ++++++++++++++++++++++++++++++++++++++-
 konva.js             |  2 +-
 konva.min.js         |  2 +-
 package.json         |  8 ++++----
 test/import-test.mjs |  6 +++---
 5 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/gulpfile.mjs b/gulpfile.mjs
index 7cc811bd..c088abe6 100644
--- a/gulpfile.mjs
+++ b/gulpfile.mjs
@@ -37,6 +37,34 @@ gulp.task('update-version-lib', function () {
     .pipe(gulp.dest('./lib'));
 });
 
+gulp.task('update-version-cmj', function () {
+  return gulp
+    .src(['./cmj/Global.js'])
+    .pipe(replace('@@version', conf.version))
+    .pipe(rename('Global.js'))
+    .pipe(gulp.dest('./cmj'));
+});
+
+gulp.task('update-version-es-to-cmj-index', function () {
+  return gulp
+    .src(['./lib/index.js'])
+    .pipe(
+      replace(`import { Konva } from './_F`, `import { Konva } from '../cmj/_F`)
+    )
+    .pipe(rename('index.js'))
+    .pipe(gulp.dest('./lib'));
+});
+
+gulp.task('update-version-es-to-cmj-node', function () {
+  return gulp
+    .src(['./lib/index-node.js'])
+    .pipe(
+      replace(`import { Konva } from './_F`, `import { Konva } from '../cmj/_F`)
+    )
+    .pipe(rename('index-node.js'))
+    .pipe(gulp.dest('./lib'));
+});
+
 // create usual build konva.js and konva.min.js
 gulp.task('pre-build', function () {
   return build()
@@ -52,7 +80,16 @@ gulp.task('pre-build', function () {
     .pipe(gulp.dest('./'));
 });
 
-gulp.task('build', gulp.parallel(['update-version-lib', 'pre-build']));
+gulp.task(
+  'build',
+  gulp.parallel([
+    'update-version-lib',
+    'update-version-cmj',
+    'update-version-es-to-cmj-index',
+    'update-version-es-to-cmj-node',
+    'pre-build',
+  ])
+);
 
 // local server for better development
 gulp.task('server', function () {
diff --git a/konva.js b/konva.js
index 8496f7f1..61fa4fca 100644
--- a/konva.js
+++ b/konva.js
@@ -8,7 +8,7 @@
    * Konva JavaScript Framework v8.3.6
    * http://konvajs.org/
    * Licensed under the MIT
-   * Date: Wed Apr 27 2022
+   * Date: Wed May 04 2022
    *
    * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
    * Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva)
diff --git a/konva.min.js b/konva.min.js
index 352c10cb..8d2bcc19 100644
--- a/konva.min.js
+++ b/konva.min.js
@@ -3,7 +3,7 @@
    * Konva JavaScript Framework v8.3.6
    * http://konvajs.org/
    * Licensed under the MIT
-   * Date: Wed Apr 27 2022
+   * Date: Wed May 04 2022
    *
    * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
    * Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva)
diff --git a/package.json b/package.json
index 9db79d74..a828e4e4 100644
--- a/package.json
+++ b/package.json
@@ -25,20 +25,20 @@
       "default": "./lib/index.js"
     },
     "./cmj": {
-      "import": "./lib/index.js",
+      "import": "./cmj/index.js",
       "require": "./cmj/index-node.js",
       "node": "./cmj/index-node.js",
       "default": "./cmj/index.js"
     },
     "./cmj/*": {
-      "import": "./lib/*.js",
+      "import": "./cmj/*.js",
       "require": "./cmj/*.js",
       "default": "./cmj/*.js"
     },
     "./lib/*": {
-      "import": "./lib/*.js",
+      "import": "./cmj/*.js",
       "require": "./cmj/*.js",
-      "default": "./lib/*.js"
+      "default": "./cmj/*.js"
     }
   },
   "scripts": {
diff --git a/test/import-test.mjs b/test/import-test.mjs
index d2779830..3cf67ab1 100644
--- a/test/import-test.mjs
+++ b/test/import-test.mjs
@@ -5,18 +5,18 @@ function equal(val1, val2, message) {
 }
 
 // try to import only core
-import Konva from '../lib/Core.js';
+import Konva from 'konva';
 
 // no external shapes
 // equal(Konva.Rect, undefined, 'no external shapes');
 
-import { Rect } from '../lib/shapes/Rect.js';
+import { Rect } from 'konva/lib/shapes/Rect';
 
 equal(Rect !== undefined, true, 'Rect is defined');
 
 equal(Konva.Rect, Rect, 'Rect is injected');
 
-import Konva2 from '../lib/index-node.js';
+import Konva2 from 'konva';
 
 equal(Konva2.Rect, Rect, 'Rect is injected');