merge maptalks into maptalks.js (#2501)

* prepare Abstract Classes for webgpu

* mv Shader.ts

* some method renames for consistency between gl and gpu

* simplify some regl command config and change createMeshCommand parameter to mesh

* implement all needed by GPUShader.run

* implement DynamicBufferPool, DynamicBuffer and GraphicsDevice

* implement Geometry.createBuffer/createElementBuffer and fix Geometry buffer descriptor

* fix typo

* merge GL Classes and GPUClasses, add device in getCommandKey and fix bundling

* fix reshader.gl

* add GraphicsDevice.commandEncoder and Shader._getCurrentRenderPassEncoder

* fix rendering call for example cube.html

* add webgpu cube.html

* first successful webgpu rendering

* add GraphicsTexture and fix cube-texture.html

* implement InstancedMesh on webgpu

* fix WGSL preprocess

* initial commit for GraphicsFramebuffer

* fix depthTexture and incorrect dynamicOffsets

* fix webgpu/shadowmapping.html

* add support of device.framebuffer(width, height)

* adaption of gl renderer for VectorTileLayer and Vector3DLayer

* merge maptalks-canvas into @maptalks/map and add LayerGLRenderer, MapGLAbstractRenderer TileLayerRenderable for maptalks-gl

* @maptalks/maptalks => maptalks

* fix build

* fixing circleci

* updating circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing

* fixing

* fixing

* fixing

* fixing

* fixing

* fixing

* fixing

* fixing specs

* fixing specs

* fixing specs

* fixing specs

* fixing specs

* fixing specs

* add OverlayLayerGLRenderer

* fixing OverlayLayerGLRenderer

Author: fuzhenn

.circleci/config.yml

@@ -3,42 +3,44 @@
 # Check https://circleci.com/docs/2.0/language-javascript/ for more details
 #
 version: 2.1
+executors:
+  node-browser-executor:
+    docker:
+      - image: cimg/node:22.14-browsers
 orbs:
   browser-tools: circleci/browser-tools@1.4.8
 jobs:
-  build:
-    docker:
-      # specify the version you desire here
-      - image: cimg/node:20.11-browsers
-        environment:
-          CHROME_BIN: "/usr/bin/google-chrome"
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/mongo:3.4.4
+  maptalks-test:
+    executor: node-browser-executor
 
-    working_directory: ~/repo
+    working_directory: ~/repo/
 
     steps:
       - browser-tools/install-chrome
       - checkout
 
       # Download and cache dependencies
       - restore_cache:
+          name: Restore pnpm Package Cache
           keys:
-          - v1-dependencies-{{ checksum "package-lock.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
+            - pnpm-packages-{{ checksum "pnpm-lock.yaml" }}
 
-      - run: npm install
+      - run:
+          name: Install pnpm package manager
+          command: |
+            sudo npm install --global pnpm
+
+      - run: pnpm i
 
       - save_cache:
+          name: Save pnpm Package Cache
+          key: pnpm-packages-{{ checksum "pnpm-lock.yaml" }}
           paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package-lock.json" }}
-
+            - .pnpm-store
       # run tests!
-      - run: npm test
-
+      - run: npm run maptalks-test
 
+workflows:
+  maptalks:
+    jobs:
+      - maptalks-test

package.json

@@ -11,7 +11,7 @@
     "build-dev": "turbo run build-dev*",
     "lint": "turbo run lint",
     "prettier": "prettier --parser=typescript --write **/*.{js,ts,md}",
-    "test": "turbo run test",
+    "maptalks-test": "pnpm --filter=maptalks run test",
     "changeset": "changeset",
     "changeset-version": "changeset version",
     "release": "pnpm build && changeset publish"
@@ -43,6 +43,6 @@
       "git add"
     ]
   },
-  "packageManager": "pnpm@9.1.2",
+  "packageManager": "pnpm@10.4.1",
   "license": "MIT"
 }

packages/analysis/package.json

@@ -48,7 +48,7 @@
     "karma-expect": "^1.1.3",
     "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
-    "@maptalks/map": "workspace:*",
+    "maptalks": "workspace:*",
     "mocha": "^10.3.0",
     "pixelmatch": "^4.0.2",
     "rollup": "^4.17.2"

packages/analysis/src/Analysis.js

@@ -1,5 +1,5 @@
 import { reshader, mat4, quat, earcut } from '@maptalks/gl';
-import { Class, Eventable, Handlerable, Polygon } from '@maptalks/map';
+import { Class, Eventable, Handlerable, Polygon } from 'maptalks';
 import ExtentPass from './pass/ExtentPass';
 import { coordinateToWorld } from './common/Util';
 

packages/analysis/src/CrossCutAnalysis.js

@@ -1,5 +1,5 @@
 import Analysis from './Analysis';
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import { reshader, mat4 } from '@maptalks/gl';
 import CrossCutPass from './pass/CrossCutPass';
 import pickingVert from './pass/glsl/picking.vert';

packages/analysis/src/ExcavateRenderer.js

@@ -1,5 +1,5 @@
 import { reshader, mat4, vec4 } from '@maptalks/gl';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import HeightmapPass from './pass/HeightmapPass';
 import { coordinateToWorld, altitudeToDistance } from './common/Util';
 import { ExtrudePolygonLayer } from '@maptalks/vt';

packages/analysis/src/common/Util.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 
 
 export function containerPointToWorldPoint(point, map) {

packages/analysis/src/pass/CrossCutPass.js

@@ -1,7 +1,7 @@
 import { reshader, mat4 } from '@maptalks/gl';
 import vert from './glsl/crosscut.vert';
 import frag from './glsl/crosscut.frag';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import AnalysisPass from './AnalysisPass';
 
 export default class CrossCutPass extends AnalysisPass {

packages/analysis/src/pass/CutAnalysisController.js

@@ -1,6 +1,6 @@
 import { reshader, mat4, quat, vec3, vec2 } from '@maptalks/gl';
 import partsModels from '../common/parts';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import { defined } from '../common/Util';
 import pickingVert from './glsl/picking.vert';
 

packages/analysis/src/pass/CutPass.js

@@ -2,7 +2,7 @@ import { mat4 } from '@maptalks/gl';
 import { reshader } from '@maptalks/gl';
 import vert from './glsl/cut.vert';
 import frag from './glsl/cut.frag';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import CutAnalysisController from './CutAnalysisController';
 import CutShader from './CutShader';
 import AnalysisPass from './AnalysisPass';