Merge remote-tracking branch 'origin/next' into feat-text-height-adpa…

…tive
antvis · Nov 19, 2024 · d5ee559 · d5ee559
2 parents e200143 + e243e89
commit d5ee559
Show file tree

Hide file tree

Showing 150 changed files with 6,593 additions and 2,449 deletions.
diff --git a/build.config.base.mjs b/build.config.base.mjs
@@ -6,7 +6,10 @@ import path from 'path';
 import peerDepsExternal from 'rollup-plugin-peer-deps-external';
 import { visualizer } from 'rollup-plugin-visualizer';
 
-export const getBaseConfig = () => {
+export const getBaseConfig = ({
+  aliasReact = false,
+  aliasReactComponents = false,
+} = {}) => {
   const entry = './src/index.ts';
 
   const OUT_DIR_NAME_MAP = {
@@ -45,7 +48,22 @@ export const getBaseConfig = () => {
           find: /^@antv\/s2$/,
           replacement: path.join(__dirname, './packages/s2-core/src'),
         },
-      ],
+        {
+          find: /^@antv\/s2\/extends$/,
+          replacement: path.join(__dirname, './packages/s2-core/src/extends'),
+        },
+        aliasReact && {
+          find: /^@antv\/s2-react$/,
+          replacement: path.join(__dirname, './packages/s2-react/src'),
+        },
+        aliasReactComponents && {
+          find: /^@antv\/s2-react-components$/,
+          replacement: path.join(
+            __dirname,
+            './packages/s2-react-components/src',
+          ),
+        },
+      ].filter(Boolean),
     );
   }
 

diff --git a/jest.config.base.js b/jest.config.base.js
@@ -48,6 +48,7 @@ module.exports = {
     '^tests/(.*)': '<rootDir>/__tests__/$1',
     '^@antv/s2$': path.join(__dirname, 'packages/s2-core/src'),
     '^@antv/s2/esm/(.*)$': path.join(__dirname, 'packages/s2-core/src/$1'),
+    '^@antv/s2/extends$': path.join(__dirname, 'packages/s2-core/src/extends'),
     '^@antv/s2-react$': path.join(__dirname, 'packages/s2-react/src'),
     '^@antv/s2-react-components$': path.join(
       __dirname,