chore: merge master

examples/district/basic/demo/china_map_2.js

@@ -1,4 +1,3 @@
-/* eslint-disable */
 import { Scene } from '@antv/l7';
 import { CountryLayer } from '@antv/l7-district';
 import { Mapbox } from '@antv/l7-maps';
@@ -188,8 +187,8 @@ const scene = new Scene({
 
 scene.on('loaded', () => {
   new CountryLayer(scene, {
-    // data: ProvinceData,
+    data: ProvinceData,
-    // joinBy: [ 'NAME_CHN', 'name' ],
+    joinBy: [ 'NAME_CHN', 'name' ],
     depth: 1,
     fill: {
       color: {

gatsby-browser.js

@@ -1,7 +1,6 @@
 
 require('./site/css/demo.css');
 require('./packages/component/src/css/l7.css');
-require('antd/dist/antd.css');
 window.geotiff = require('geotiff');
 window.g2 = require('@antv/g2');
 window.l7 = require('@antv/l7');

package.json

@@ -133,7 +133,7 @@
     "site:deploy": "yarn run site:build && gh-pages -d public",
     "site:publish": "gh-pages -d public",
     "lint:fix": "prettier --write docs/api/**/*.md docs/api/*.md  packages/**/*.ts{,x}  packages/**/*.{spec,story}.ts{,x} stories/**/**/*.tsx  *.md",
-    "lint:examples": "eslint examples/**/**/*.js --fix",
+    "lint:examples": "eslint examples --fix --ext .js",
     "prebuild": "run-p tsc lint",
     "build": "yarn clean && lerna run build",
     "postbuild": "yarn build:declarations",
@@ -186,6 +186,5 @@
   },
   "tnpm": {
     "mode": "yarn"
-  },
+  }
-  "version": "0.0.0"
 }

packages/renderer/src/regl/__tests__/model.uniform.spec.ts

@@ -137,6 +137,7 @@ describe('uniforms in ReglModel', () => {
     expect(model2.uniforms['u_Struct.k'] instanceof ReglTexture2D).toBeTruthy();
     // @ts-ignore
     expect(
+      // @ts-ignore
       model2.uniforms['u_Struct.l'] instanceof ReglFramebuffer,
     ).toBeTruthy();
     // @ts-ignore
@@ -179,6 +180,7 @@ describe('uniforms in ReglModel', () => {
       u_4: {
         a: 2,
       },
+      // @ts-ignore
       u_5: [
         {
           c: 100, // 只修改第一个