From 45466e1fca5fb42b0fb096faedd4f6d5f8816485 Mon Sep 17 00:00:00 2001
From: lvisei <yunji.me@outlook.com>
Date: Thu, 6 Jun 2024 00:48:33 +0800
Subject: [PATCH] chore: move to extensions

---
 .prettierignore                                           | 3 +++
 eslint.config.js                                          | 3 +++
 {packages => extensions}/extension-maps/.fatherrc.ts      | 0
 {packages => extensions}/extension-maps/.gitignore        | 0
 {packages => extensions}/extension-maps/CHANGELOG.md      | 0
 {packages => extensions}/extension-maps/package.json      | 0
 {packages => extensions}/extension-maps/src/amap/index.ts | 0
 {packages => extensions}/extension-maps/src/amap/logo.css | 0
 {packages => extensions}/extension-maps/src/amap/map.ts   | 0
 {packages => extensions}/extension-maps/src/amap/theme.ts | 0
 .../extension-maps/src/bmap/bmapglloader.ts               | 0
 {packages => extensions}/extension-maps/src/bmap/index.ts | 0
 {packages => extensions}/extension-maps/src/bmap/logo.css | 0
 {packages => extensions}/extension-maps/src/bmap/map.ts   | 0
 {packages => extensions}/extension-maps/src/gmap/index.ts | 0
 {packages => extensions}/extension-maps/src/gmap/logo.css | 0
 {packages => extensions}/extension-maps/src/gmap/map.ts   | 0
 .../extension-maps/src/gmap/maploader.ts                  | 0
 {packages => extensions}/extension-maps/src/index.ts      | 0
 .../extension-maps/src/mapbox/index.ts                    | 0
 .../extension-maps/src/mapbox/logo.css                    | 0
 {packages => extensions}/extension-maps/src/mapbox/map.ts | 8 ++++----
 .../extension-maps/src/mapbox/theme.ts                    | 0
 .../extension-maps/src/maplibre/index.ts                  | 0
 .../extension-maps/src/maplibre/map.ts                    | 0
 .../extension-maps/src/tdtmap/index.ts                    | 0
 {packages => extensions}/extension-maps/src/tdtmap/map.ts | 0
 .../extension-maps/src/tdtmap/maploader.ts                | 0
 {packages => extensions}/extension-maps/src/tmap/index.ts | 0
 {packages => extensions}/extension-maps/src/tmap/logo.css | 0
 {packages => extensions}/extension-maps/src/tmap/map.ts   | 0
 .../extension-maps/src/tmap/maploader.ts                  | 0
 .../extension-maps/src/utils/index.ts                     | 0
 {packages => extensions}/extension-maps/style.d.ts        | 0
 {packages => extensions}/extension-maps/tsconfig.json     | 0
 pnpm-workspace.yaml                                       | 1 +
 site/.dumirc.ts                                           | 2 +-
 tsconfig.eslint.json                                      | 2 ++
 tsconfig.json                                             | 2 +-
 vite.config.ts                                            | 2 +-
 40 files changed, 16 insertions(+), 7 deletions(-)
 rename {packages => extensions}/extension-maps/.fatherrc.ts (100%)
 rename {packages => extensions}/extension-maps/.gitignore (100%)
 rename {packages => extensions}/extension-maps/CHANGELOG.md (100%)
 rename {packages => extensions}/extension-maps/package.json (100%)
 rename {packages => extensions}/extension-maps/src/amap/index.ts (100%)
 rename {packages => extensions}/extension-maps/src/amap/logo.css (100%)
 rename {packages => extensions}/extension-maps/src/amap/map.ts (100%)
 rename {packages => extensions}/extension-maps/src/amap/theme.ts (100%)
 rename {packages => extensions}/extension-maps/src/bmap/bmapglloader.ts (100%)
 rename {packages => extensions}/extension-maps/src/bmap/index.ts (100%)
 rename {packages => extensions}/extension-maps/src/bmap/logo.css (100%)
 rename {packages => extensions}/extension-maps/src/bmap/map.ts (100%)
 rename {packages => extensions}/extension-maps/src/gmap/index.ts (100%)
 rename {packages => extensions}/extension-maps/src/gmap/logo.css (100%)
 rename {packages => extensions}/extension-maps/src/gmap/map.ts (100%)
 rename {packages => extensions}/extension-maps/src/gmap/maploader.ts (100%)
 rename {packages => extensions}/extension-maps/src/index.ts (100%)
 rename {packages => extensions}/extension-maps/src/mapbox/index.ts (100%)
 rename {packages => extensions}/extension-maps/src/mapbox/logo.css (100%)
 rename {packages => extensions}/extension-maps/src/mapbox/map.ts (98%)
 rename {packages => extensions}/extension-maps/src/mapbox/theme.ts (100%)
 rename {packages => extensions}/extension-maps/src/maplibre/index.ts (100%)
 rename {packages => extensions}/extension-maps/src/maplibre/map.ts (100%)
 rename {packages => extensions}/extension-maps/src/tdtmap/index.ts (100%)
 rename {packages => extensions}/extension-maps/src/tdtmap/map.ts (100%)
 rename {packages => extensions}/extension-maps/src/tdtmap/maploader.ts (100%)
 rename {packages => extensions}/extension-maps/src/tmap/index.ts (100%)
 rename {packages => extensions}/extension-maps/src/tmap/logo.css (100%)
 rename {packages => extensions}/extension-maps/src/tmap/map.ts (100%)
 rename {packages => extensions}/extension-maps/src/tmap/maploader.ts (100%)
 rename {packages => extensions}/extension-maps/src/utils/index.ts (100%)
 rename {packages => extensions}/extension-maps/style.d.ts (100%)
 rename {packages => extensions}/extension-maps/tsconfig.json (100%)

diff --git a/.prettierignore b/.prettierignore
index 54404306532..13354e73cc5 100644
--- 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
index 8bf5dca352d..044088bbc21 100644
--- 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 b/extensions/extension-maps/.fatherrc.ts
similarity index 100%
rename from packages/extension-maps/.fatherrc.ts
rename to extensions/extension-maps/.fatherrc.ts
diff --git a/packages/extension-maps/.gitignore b/extensions/extension-maps/.gitignore
similarity index 100%
rename from packages/extension-maps/.gitignore
rename to extensions/extension-maps/.gitignore
diff --git a/packages/extension-maps/CHANGELOG.md b/extensions/extension-maps/CHANGELOG.md
similarity index 100%
rename from packages/extension-maps/CHANGELOG.md
rename to extensions/extension-maps/CHANGELOG.md
diff --git a/packages/extension-maps/package.json b/extensions/extension-maps/package.json
similarity index 100%
rename from packages/extension-maps/package.json
rename to extensions/extension-maps/package.json
diff --git a/packages/extension-maps/src/amap/index.ts b/extensions/extension-maps/src/amap/index.ts
similarity index 100%
rename from packages/extension-maps/src/amap/index.ts
rename to extensions/extension-maps/src/amap/index.ts
diff --git a/packages/extension-maps/src/amap/logo.css b/extensions/extension-maps/src/amap/logo.css
similarity index 100%
rename from packages/extension-maps/src/amap/logo.css
rename to extensions/extension-maps/src/amap/logo.css
diff --git a/packages/extension-maps/src/amap/map.ts b/extensions/extension-maps/src/amap/map.ts
similarity index 100%
rename from packages/extension-maps/src/amap/map.ts
rename to extensions/extension-maps/src/amap/map.ts
diff --git a/packages/extension-maps/src/amap/theme.ts b/extensions/extension-maps/src/amap/theme.ts
similarity index 100%
rename from packages/extension-maps/src/amap/theme.ts
rename to extensions/extension-maps/src/amap/theme.ts
diff --git a/packages/extension-maps/src/bmap/bmapglloader.ts b/extensions/extension-maps/src/bmap/bmapglloader.ts
similarity index 100%
rename from packages/extension-maps/src/bmap/bmapglloader.ts
rename to extensions/extension-maps/src/bmap/bmapglloader.ts
diff --git a/packages/extension-maps/src/bmap/index.ts b/extensions/extension-maps/src/bmap/index.ts
similarity index 100%
rename from packages/extension-maps/src/bmap/index.ts
rename to extensions/extension-maps/src/bmap/index.ts
diff --git a/packages/extension-maps/src/bmap/logo.css b/extensions/extension-maps/src/bmap/logo.css
similarity index 100%
rename from packages/extension-maps/src/bmap/logo.css
rename to extensions/extension-maps/src/bmap/logo.css
diff --git a/packages/extension-maps/src/bmap/map.ts b/extensions/extension-maps/src/bmap/map.ts
similarity index 100%
rename from packages/extension-maps/src/bmap/map.ts
rename to extensions/extension-maps/src/bmap/map.ts
diff --git a/packages/extension-maps/src/gmap/index.ts b/extensions/extension-maps/src/gmap/index.ts
similarity index 100%
rename from packages/extension-maps/src/gmap/index.ts
rename to extensions/extension-maps/src/gmap/index.ts
diff --git a/packages/extension-maps/src/gmap/logo.css b/extensions/extension-maps/src/gmap/logo.css
similarity index 100%
rename from packages/extension-maps/src/gmap/logo.css
rename to extensions/extension-maps/src/gmap/logo.css
diff --git a/packages/extension-maps/src/gmap/map.ts b/extensions/extension-maps/src/gmap/map.ts
similarity index 100%
rename from packages/extension-maps/src/gmap/map.ts
rename to extensions/extension-maps/src/gmap/map.ts
diff --git a/packages/extension-maps/src/gmap/maploader.ts b/extensions/extension-maps/src/gmap/maploader.ts
similarity index 100%
rename from packages/extension-maps/src/gmap/maploader.ts
rename to extensions/extension-maps/src/gmap/maploader.ts
diff --git a/packages/extension-maps/src/index.ts b/extensions/extension-maps/src/index.ts
similarity index 100%
rename from packages/extension-maps/src/index.ts
rename to extensions/extension-maps/src/index.ts
diff --git a/packages/extension-maps/src/mapbox/index.ts b/extensions/extension-maps/src/mapbox/index.ts
similarity index 100%
rename from packages/extension-maps/src/mapbox/index.ts
rename to extensions/extension-maps/src/mapbox/index.ts
diff --git a/packages/extension-maps/src/mapbox/logo.css b/extensions/extension-maps/src/mapbox/logo.css
similarity index 100%
rename from packages/extension-maps/src/mapbox/logo.css
rename to extensions/extension-maps/src/mapbox/logo.css
diff --git a/packages/extension-maps/src/mapbox/map.ts b/extensions/extension-maps/src/mapbox/map.ts
similarity index 98%
rename from packages/extension-maps/src/mapbox/map.ts
rename to extensions/extension-maps/src/mapbox/map.ts
index f9d833fe13c..40429ef4337 100644
--- a/packages/extension-maps/src/mapbox/map.ts
+++ b/extensions/extension-maps/src/mapbox/map.ts
@@ -49,7 +49,7 @@ export default class MapboxService extends BaseMapService<Map> {
      */
 
     // 判断全局 mapboxgl 对象的加载
-    if (!mapInstance && !window.mapboxgl) {
+    if (!mapInstance && window?.mapboxgl) {
       // 用户有时传递进来的实例是继承于 mapbox 实例化的，不一定是 mapboxgl 对象。
       console.error(this.configService.getSceneWarninfo('SDK'));
     }
@@ -57,14 +57,14 @@ export default class MapboxService extends BaseMapService<Map> {
     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 b/extensions/extension-maps/src/mapbox/theme.ts
similarity index 100%
rename from packages/extension-maps/src/mapbox/theme.ts
rename to extensions/extension-maps/src/mapbox/theme.ts
diff --git a/packages/extension-maps/src/maplibre/index.ts b/extensions/extension-maps/src/maplibre/index.ts
similarity index 100%
rename from packages/extension-maps/src/maplibre/index.ts
rename to extensions/extension-maps/src/maplibre/index.ts
diff --git a/packages/extension-maps/src/maplibre/map.ts b/extensions/extension-maps/src/maplibre/map.ts
similarity index 100%
rename from packages/extension-maps/src/maplibre/map.ts
rename to extensions/extension-maps/src/maplibre/map.ts
diff --git a/packages/extension-maps/src/tdtmap/index.ts b/extensions/extension-maps/src/tdtmap/index.ts
similarity index 100%
rename from packages/extension-maps/src/tdtmap/index.ts
rename to extensions/extension-maps/src/tdtmap/index.ts
diff --git a/packages/extension-maps/src/tdtmap/map.ts b/extensions/extension-maps/src/tdtmap/map.ts
similarity index 100%
rename from packages/extension-maps/src/tdtmap/map.ts
rename to extensions/extension-maps/src/tdtmap/map.ts
diff --git a/packages/extension-maps/src/tdtmap/maploader.ts b/extensions/extension-maps/src/tdtmap/maploader.ts
similarity index 100%
rename from packages/extension-maps/src/tdtmap/maploader.ts
rename to extensions/extension-maps/src/tdtmap/maploader.ts
diff --git a/packages/extension-maps/src/tmap/index.ts b/extensions/extension-maps/src/tmap/index.ts
similarity index 100%
rename from packages/extension-maps/src/tmap/index.ts
rename to extensions/extension-maps/src/tmap/index.ts
diff --git a/packages/extension-maps/src/tmap/logo.css b/extensions/extension-maps/src/tmap/logo.css
similarity index 100%
rename from packages/extension-maps/src/tmap/logo.css
rename to extensions/extension-maps/src/tmap/logo.css
diff --git a/packages/extension-maps/src/tmap/map.ts b/extensions/extension-maps/src/tmap/map.ts
similarity index 100%
rename from packages/extension-maps/src/tmap/map.ts
rename to extensions/extension-maps/src/tmap/map.ts
diff --git a/packages/extension-maps/src/tmap/maploader.ts b/extensions/extension-maps/src/tmap/maploader.ts
similarity index 100%
rename from packages/extension-maps/src/tmap/maploader.ts
rename to extensions/extension-maps/src/tmap/maploader.ts
diff --git a/packages/extension-maps/src/utils/index.ts b/extensions/extension-maps/src/utils/index.ts
similarity index 100%
rename from packages/extension-maps/src/utils/index.ts
rename to extensions/extension-maps/src/utils/index.ts
diff --git a/packages/extension-maps/style.d.ts b/extensions/extension-maps/style.d.ts
similarity index 100%
rename from packages/extension-maps/style.d.ts
rename to extensions/extension-maps/style.d.ts
diff --git a/packages/extension-maps/tsconfig.json b/extensions/extension-maps/tsconfig.json
similarity index 100%
rename from packages/extension-maps/tsconfig.json
rename to extensions/extension-maps/tsconfig.json
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 749e3674809..a7ce757177d 100644
--- 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
index 529b7471a6f..39593d8ed36 100644
--- 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
index c45858ea25a..9346b5a3e4b 100644
--- 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
index 7c135795c88..734cf5a04f1 100644
--- 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
index dbab3b571d3..4df66ce5fd7 100644
--- 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: [