test: fix unit test esmodule error

VisActor · Dec 5, 2023 · 39c1c24 · 39c1c24
1 parent 2f7e9b6
commit 39c1c24
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/packages/vgrammar-core/__tests__/mark/element.test.ts b/packages/vgrammar-core/__tests__/mark/element.test.ts
@@ -1,4 +1,4 @@
-import { Rect } from '@visactor/vrender-core';
+import { Rect } from '@visactor/vrender/es/core';
 import { createSimpleElement } from '../util';
 import { initBrowserEnv } from '../../src/env';
 

diff --git a/packages/vgrammar-core/__tests__/mark/glyph.test.ts b/packages/vgrammar-core/__tests__/mark/glyph.test.ts
@@ -1,4 +1,4 @@
-import { Glyph, Rect, Line } from '@visactor/vrender-core';
+import { Glyph, Rect, Line } from '@visactor/vrender/es/core';
 import { createElement } from '../../src/graph/util/element';
 import type { IGlyphElement } from '../../src/types';
 import { emptyFunction, getMockedView, registerDefaultGraphics } from '../util';

diff --git a/packages/vgrammar-plot/jest.config.js b/packages/vgrammar-plot/jest.config.js
@@ -4,9 +4,11 @@ const baseJestConfig = require('@internal/jest-config/jest.base');
 module.exports = {
   ...baseJestConfig,
   moduleNameMapper: {
+    ...baseJestConfig.moduleNameMapper,
     '@visactor/vgrammar-util': path.resolve(__dirname, '../vgrammar-util/src/index.ts'),
     '@visactor/vgrammar-coordinate': path.resolve(__dirname, '../vgrammar-coordinate/src/'),
     '@visactor/vgrammar-core': path.resolve(__dirname, '../vgrammar-core/src/index.ts'),
     '@visactor/vgrammar-projection': path.resolve(__dirname, '../vgrammar-projection/src/'),
+
   }
 };
diff --git a/packages/vgrammar-projection/jest.config.js b/packages/vgrammar-projection/jest.config.js
@@ -4,10 +4,11 @@ const baseJestConfig = require('@internal/jest-config/jest.base');
 module.exports = {
   ...baseJestConfig,
   moduleNameMapper: {
+    ...baseJestConfig.moduleNameMapper,
     'd3-geo': path.resolve(__dirname, './node_modules/d3-geo/dist/d3-geo.js'),
     'd3-array': path.resolve(__dirname, './node_modules/d3-array/dist/d3-array.js'),
     '@visactor/vgrammar-util': path.resolve(__dirname, '../vgrammar-util/src/index.ts'),
     '@visactor/vgrammar-coordinate': path.resolve(__dirname, '../vgrammar-coordinate/src/index.ts'),
-    '@visactor/vgrammar-core': path.resolve(__dirname, '../vgrammar-core/src/index.ts')
+    '@visactor/vgrammar-core': path.resolve(__dirname, '../vgrammar-core/src/index.ts'),
   }
 };
diff --git a/packages/vgrammar-wordcloud-shape/__tests__/wordcloud-shape.test.ts b/packages/vgrammar-wordcloud-shape/__tests__/wordcloud-shape.test.ts
@@ -1,5 +1,5 @@
 import { transform } from '../src/wordcloud-shape';
-import { initBrowserEnv } from '@visactor/vrender-kits';
+import { initBrowserEnv } from '@visactor/vrender/es/kits';
 
 initBrowserEnv();
 

diff --git a/packages/vgrammar-wordcloud-shape/src/util.ts b/packages/vgrammar-wordcloud-shape/src/util.ts
@@ -1,4 +1,6 @@
-import { vglobal, createImage } from '@visactor/vrender/es/core';
+import { vglobal } from '@visactor/vrender/es/core';
+import { createImage } from '@visactor/vrender/es/register-image';
+
 import { isBase64, isNil, isValidUrl, Logger } from '@visactor/vutils';
 import type { CloudWordType, LayoutConfigType, SegmentationOutputType } from './interface';
 

diff --git a/share/jest-config/jest.base.js b/share/jest-config/jest.base.js
@@ -25,8 +25,7 @@ module.exports = {
   },
   verbose: false,
   moduleNameMapper: {
-    // 'd3-color': path.resolve(__dirname, './node_modules/d3-color/dist/d3-color.min.js'),
-    // 'd3-array': path.resolve(__dirname, './node_modules/d3-array/dist/d3-array.min.js')
+    '@visactor/vrender/es/*': path.resolve(__dirname, '../../packages/vgrammar-core/node_modules/@visactor/vrender')
   },
   coverageDirectory: "coverage",
   coverageProvider: "v8",