chore: move to extensions

antvis · Jun 5, 2024 · 45466e1 · 45466e1
1 parent b443a94
commit 45466e1
Show file tree

Hide file tree

Showing 40 changed files with 16 additions and 7 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -18,6 +18,9 @@ LICENSE
 packages/*/es/**
 packages/*/lib/**
 packages/*/dist/**
+extensions/*/es/**
+extensions/*/lib/**
+extensions/*/dist/**
 
 # legacy
 legacy/

diff --git a/eslint.config.js b/eslint.config.js
@@ -33,6 +33,9 @@ export default tseslint.config(
       'packages/*/es/*',
       'packages/*/lib/*',
       'packages/*/dist/*',
+      'extensions/*/es/*',
+      'extensions/*/lib/*',
+      'extensions/*/dist/*',
 
       // Website static files
       'site/public/*',

diff --git a/packages/extension-maps/.fatherrc.ts → extensions/extension-maps/.fatherrc.ts b/packages/extension-maps/.fatherrc.ts → extensions/extension-maps/.fatherrc.ts
diff --git a/packages/extension-maps/.gitignore → extensions/extension-maps/.gitignore b/packages/extension-maps/.gitignore → extensions/extension-maps/.gitignore
diff --git a/packages/extension-maps/CHANGELOG.md → extensions/extension-maps/CHANGELOG.md b/packages/extension-maps/CHANGELOG.md → extensions/extension-maps/CHANGELOG.md
diff --git a/packages/extension-maps/package.json → extensions/extension-maps/package.json b/packages/extension-maps/package.json → extensions/extension-maps/package.json
diff --git a/packages/extension-maps/src/amap/index.ts → extensions/extension-maps/src/amap/index.ts b/packages/extension-maps/src/amap/index.ts → extensions/extension-maps/src/amap/index.ts
diff --git a/packages/extension-maps/src/amap/logo.css → extensions/extension-maps/src/amap/logo.css b/packages/extension-maps/src/amap/logo.css → extensions/extension-maps/src/amap/logo.css
diff --git a/packages/extension-maps/src/amap/map.ts → extensions/extension-maps/src/amap/map.ts b/packages/extension-maps/src/amap/map.ts → extensions/extension-maps/src/amap/map.ts
diff --git a/packages/extension-maps/src/amap/theme.ts → extensions/extension-maps/src/amap/theme.ts b/packages/extension-maps/src/amap/theme.ts → extensions/extension-maps/src/amap/theme.ts
diff --git a/...s/extension-maps/src/bmap/bmapglloader.ts → ...s/extension-maps/src/bmap/bmapglloader.ts b/...s/extension-maps/src/bmap/bmapglloader.ts → ...s/extension-maps/src/bmap/bmapglloader.ts
diff --git a/packages/extension-maps/src/bmap/index.ts → extensions/extension-maps/src/bmap/index.ts b/packages/extension-maps/src/bmap/index.ts → extensions/extension-maps/src/bmap/index.ts
diff --git a/packages/extension-maps/src/bmap/logo.css → extensions/extension-maps/src/bmap/logo.css b/packages/extension-maps/src/bmap/logo.css → extensions/extension-maps/src/bmap/logo.css
diff --git a/packages/extension-maps/src/bmap/map.ts → extensions/extension-maps/src/bmap/map.ts b/packages/extension-maps/src/bmap/map.ts → extensions/extension-maps/src/bmap/map.ts
diff --git a/packages/extension-maps/src/gmap/index.ts → extensions/extension-maps/src/gmap/index.ts b/packages/extension-maps/src/gmap/index.ts → extensions/extension-maps/src/gmap/index.ts
diff --git a/packages/extension-maps/src/gmap/logo.css → extensions/extension-maps/src/gmap/logo.css b/packages/extension-maps/src/gmap/logo.css → extensions/extension-maps/src/gmap/logo.css
diff --git a/packages/extension-maps/src/gmap/map.ts → extensions/extension-maps/src/gmap/map.ts b/packages/extension-maps/src/gmap/map.ts → extensions/extension-maps/src/gmap/map.ts
diff --git a/...ages/extension-maps/src/gmap/maploader.ts → ...ions/extension-maps/src/gmap/maploader.ts b/...ages/extension-maps/src/gmap/maploader.ts → ...ions/extension-maps/src/gmap/maploader.ts
diff --git a/packages/extension-maps/src/index.ts → extensions/extension-maps/src/index.ts b/packages/extension-maps/src/index.ts → extensions/extension-maps/src/index.ts
diff --git a/packages/extension-maps/src/mapbox/index.ts → ...nsions/extension-maps/src/mapbox/index.ts b/packages/extension-maps/src/mapbox/index.ts → ...nsions/extension-maps/src/mapbox/index.ts
diff --git a/packages/extension-maps/src/mapbox/logo.css → ...nsions/extension-maps/src/mapbox/logo.css b/packages/extension-maps/src/mapbox/logo.css → ...nsions/extension-maps/src/mapbox/logo.css
diff --git a/packages/extension-maps/src/mapbox/map.ts → extensions/extension-maps/src/mapbox/map.ts b/packages/extension-maps/src/mapbox/map.ts → extensions/extension-maps/src/mapbox/map.ts
@@ -49,22 +49,22 @@ export default class MapboxService extends BaseMapService<Map> {
      */
 
     // 判断全局 mapboxgl 对象的加载
-    if (!mapInstance && !window.mapboxgl) {
+    if (!mapInstance && window?.mapboxgl) {
       // 用户有时传递进来的实例是继承于 mapbox 实例化的，不一定是 mapboxgl 对象。
       console.error(this.configService.getSceneWarninfo('SDK'));
     }
 
     if (
       token === MAPBOX_API_KEY &&
       style !== 'blank' &&
-      !window.mapboxgl.accessToken &&
+      window?.mapboxgl?.accessToken &&
       !mapInstance // 如果用户传递了 mapInstance，应该不去干预实例的 accessToken。
     ) {
       console.warn(this.configService.getSceneWarninfo('MapToken'));
     }
 
     // 判断是否设置了 accessToken
-    if (!mapInstance && !window.mapboxgl.accessToken) {
+    if (!mapInstance && window?.mapboxgl?.accessToken) {
       // 用户有时传递进来的实例是继承于 mapbox 实例化的，不一定是 mapboxgl 对象。
       window.mapboxgl.accessToken = token;
     }
@@ -74,7 +74,7 @@ export default class MapboxService extends BaseMapService<Map> {
       this.mapContainer = this.map.getContainer();
     } else {
       this.mapContainer = this.creatMapContainer(id);
-      this.map = new (window.mapboxgl || mapboxgl).Map({
+      this.map = new (window?.mapboxgl || mapboxgl).Map({
         container: this.mapContainer,
         style: this.getMapStyleValue(style),
         attributionControl,

diff --git a/packages/extension-maps/src/mapbox/theme.ts → ...nsions/extension-maps/src/mapbox/theme.ts b/packages/extension-maps/src/mapbox/theme.ts → ...nsions/extension-maps/src/mapbox/theme.ts
diff --git a/...ages/extension-maps/src/maplibre/index.ts → ...ions/extension-maps/src/maplibre/index.ts b/...ages/extension-maps/src/maplibre/index.ts → ...ions/extension-maps/src/maplibre/index.ts
diff --git a/packages/extension-maps/src/maplibre/map.ts → ...nsions/extension-maps/src/maplibre/map.ts b/packages/extension-maps/src/maplibre/map.ts → ...nsions/extension-maps/src/maplibre/map.ts
diff --git a/packages/extension-maps/src/tdtmap/index.ts → ...nsions/extension-maps/src/tdtmap/index.ts b/packages/extension-maps/src/tdtmap/index.ts → ...nsions/extension-maps/src/tdtmap/index.ts
diff --git a/packages/extension-maps/src/tdtmap/map.ts → extensions/extension-maps/src/tdtmap/map.ts b/packages/extension-maps/src/tdtmap/map.ts → extensions/extension-maps/src/tdtmap/map.ts
diff --git a/...es/extension-maps/src/tdtmap/maploader.ts → ...ns/extension-maps/src/tdtmap/maploader.ts b/...es/extension-maps/src/tdtmap/maploader.ts → ...ns/extension-maps/src/tdtmap/maploader.ts
diff --git a/packages/extension-maps/src/tmap/index.ts → extensions/extension-maps/src/tmap/index.ts b/packages/extension-maps/src/tmap/index.ts → extensions/extension-maps/src/tmap/index.ts
diff --git a/packages/extension-maps/src/tmap/logo.css → extensions/extension-maps/src/tmap/logo.css b/packages/extension-maps/src/tmap/logo.css → extensions/extension-maps/src/tmap/logo.css
diff --git a/packages/extension-maps/src/tmap/map.ts → extensions/extension-maps/src/tmap/map.ts b/packages/extension-maps/src/tmap/map.ts → extensions/extension-maps/src/tmap/map.ts
diff --git a/...ages/extension-maps/src/tmap/maploader.ts → ...ions/extension-maps/src/tmap/maploader.ts b/...ages/extension-maps/src/tmap/maploader.ts → ...ions/extension-maps/src/tmap/maploader.ts
diff --git a/packages/extension-maps/src/utils/index.ts → extensions/extension-maps/src/utils/index.ts b/packages/extension-maps/src/utils/index.ts → extensions/extension-maps/src/utils/index.ts
diff --git a/packages/extension-maps/style.d.ts → extensions/extension-maps/style.d.ts b/packages/extension-maps/style.d.ts → extensions/extension-maps/style.d.ts
diff --git a/packages/extension-maps/tsconfig.json → extensions/extension-maps/tsconfig.json b/packages/extension-maps/tsconfig.json → extensions/extension-maps/tsconfig.json
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,5 +1,6 @@
 packages:
   # all packages
   - 'packages/*'
+  - 'extensions/*'
   # website
   - 'site'
diff --git a/site/.dumirc.ts b/site/.dumirc.ts
@@ -713,6 +713,6 @@ export default defineConfig({
     '@antv/l7-scene': path.resolve(__dirname, '../packages/scene/src'),
     '@antv/l7-source': path.resolve(__dirname, '../packages/source/src'),
     '@antv/l7-utils': path.resolve(__dirname, '../packages/utils/src'),
-    '@antv/l7-extension-maps': path.resolve(__dirname, '../packages/extension-maps/src'),
+    '@antv/l7-extension-maps': path.resolve(__dirname, '../extensions/extension-maps/src'),
   },
 });
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
@@ -8,6 +8,8 @@
     "./*.?*.ts",
     "packages",
     "packages/*/.?*.ts",
+    "extensions",
+    "extensions/*/.?*.ts",
     // examples workspace lint
     "examples",
     // test workspace lint

diff --git a/tsconfig.json b/tsconfig.json
@@ -33,7 +33,7 @@
       "@antv/l7-source": ["packages/source/src"],
       "@antv/l7-utils": ["packages/utils/src"],
       "@antv/l7-test-utils": ["packages/test-utils/src"],
-      "@antv/l7-extension-maps": ["packages/extension-maps/src"]
+      "@antv/l7-extension-maps": ["extensions/extension-maps/src"]
     },
 
     // Interop Constraints

diff --git a/vite.config.ts b/vite.config.ts
@@ -21,7 +21,7 @@ export default defineConfig({
       '@antv/l7-scene': path.resolve(__dirname, './packages/scene/src'),
       '@antv/l7-source': path.resolve(__dirname, './packages/source/src'),
       '@antv/l7-utils': path.resolve(__dirname, './packages/utils/src'),
-      '@antv/l7-extension-maps': path.resolve(__dirname, './packages/extension-maps/src'),
+      '@antv/l7-extension-maps': path.resolve(__dirname, './extensions/extension-maps/src'),
     },
   },
   plugins: [