diff --git a/babel.config.js b/babel.config.js index 22e7ca2b07..411f735e9e 100644 --- a/babel.config.js +++ b/babel.config.js @@ -6,13 +6,20 @@ module.exports = api => { const isCommonJS = api.env('cjs'); const isESModule = api.env('esm'); const isTest = api.env('test'); - + if (isSite) { return { presets: [ - 'babel-preset-gatsby', { - silence: true - } + '@babel/preset-env', + [ + '@babel/preset-react', + { + development: isCommonJS + } + ], + // 'babel-preset-gatsby', { + // silence: true + // }, ], plugins: [ '@babel/plugin-proposal-optional-chaining', diff --git a/lerna.json b/lerna.json index 6339131b3c..8579fe9903 100644 --- a/lerna.json +++ b/lerna.json @@ -14,7 +14,7 @@ "message": "chore: publish" } }, - "version": "2.5.8", + "version": "2.5.10", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/package.json b/package.json index a76bbb0903..85740cf5ac 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "babel-plugin-transform-inline-environment-variables": "^0.4.3", "babel-plugin-transform-node-env-inline": "^0.4.3", "babel-plugin-transform-postcss": "^0.3.0", - "babel-preset-gatsby": "^0.5.8", + "babel-preset-gatsby": "^1.12.0", "babel-template": "^6.26.0", "clean-webpack-plugin": "^3.0.0", "commitizen": "^4.0.3", diff --git a/packages/component/package.json b/packages/component/package.json index 7b6606d47e..dbc2e14f4f 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-component", - "version": "2.5.8", + "version": "2.5.10", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ "author": "lzxue", "license": "ISC", "dependencies": { - "@antv/l7-core": "^2.5.8", - "@antv/l7-utils": "^2.5.8", + "@antv/l7-core": "^2.5.10", + "@antv/l7-utils": "^2.5.10", "@babel/runtime": "^7.7.7", "eventemitter3": "^4.0.0", "inversify": "^5.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index 9438cdb564..74ea1bf210 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-core", - "version": "2.5.8", + "version": "2.5.10", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -24,7 +24,7 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-utils": "^2.5.8", + "@antv/l7-utils": "^2.5.10", "@babel/runtime": "^7.7.7", "@mapbox/tiny-sdf": "^1.1.1", "ajv": "^6.10.2", diff --git a/packages/l7/package.json b/packages/l7/package.json index 6021c45214..3edd8b1484 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "2.5.8", + "version": "2.5.10", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -25,12 +25,12 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-component": "^2.5.8", - "@antv/l7-core": "^2.5.8", - "@antv/l7-layers": "^2.5.8", - "@antv/l7-maps": "^2.5.8", - "@antv/l7-scene": "^2.5.8", - "@antv/l7-utils": "^2.5.8", + "@antv/l7-component": "^2.5.10", + "@antv/l7-core": "^2.5.10", + "@antv/l7-layers": "^2.5.10", + "@antv/l7-maps": "^2.5.10", + "@antv/l7-scene": "^2.5.10", + "@antv/l7-utils": "^2.5.10", "@babel/runtime": "^7.7.7" }, "gitHead": "7eb8382ede52d803fae13a85fe6af074400260ee", diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index fc9fbe6622..390641061c 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.5.7'; +const version = '2.5.9'; export { version }; diff --git a/packages/layers/package.json b/packages/layers/package.json index 277ce71d92..17cbb3f6d4 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-layers", - "version": "2.5.8", + "version": "2.5.10", "description": "L7's collection of built-in layers", "main": "lib/index.js", "module": "es/index.js", @@ -24,9 +24,9 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-core": "^2.5.8", - "@antv/l7-source": "^2.5.8", - "@antv/l7-utils": "^2.5.8", + "@antv/l7-core": "^2.5.10", + "@antv/l7-source": "^2.5.10", + "@antv/l7-utils": "^2.5.10", "@babel/runtime": "^7.7.7", "@mapbox/martini": "^0.2.0", "@turf/meta": "^6.0.2", diff --git a/packages/map/package.json b/packages/map/package.json index 4af4d996c8..666f9bec71 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.5.8", + "version": "2.5.10", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -37,7 +37,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-utils": "^2.5.8", + "@antv/l7-utils": "^2.5.10", "@babel/runtime": "^7.7.7", "@mapbox/point-geometry": "^0.1.0", "@mapbox/unitbezier": "^0.0.0", diff --git a/packages/map/src/utils/dom.ts b/packages/map/src/utils/dom.ts index 888ddf56fb..39c5adc188 100644 --- a/packages/map/src/utils/dom.ts +++ b/packages/map/src/utils/dom.ts @@ -77,7 +77,9 @@ try { passiveSupported = true; }, }); + // @ts-ignore window.addEventListener('test', options, options); + // @ts-ignore window.removeEventListener('test', options, options); } catch (err) { passiveSupported = false; diff --git a/packages/maps/package.json b/packages/maps/package.json index c22ab12e82..c03bc8d2b0 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-maps", - "version": "2.5.8", + "version": "2.5.10", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -27,9 +27,9 @@ "license": "ISC", "dependencies": { "@amap/amap-jsapi-loader": "^0.0.3", - "@antv/l7-core": "^2.5.8", - "@antv/l7-map": "^2.5.8", - "@antv/l7-utils": "^2.5.8", + "@antv/l7-core": "^2.5.10", + "@antv/l7-map": "^2.5.10", + "@antv/l7-utils": "^2.5.10", "@babel/runtime": "^7.7.7", "@types/amap-js-api": "^1.4.6", "@types/mapbox-gl": "^1.11.2", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index f1aa909a13..e7e29f1aa9 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-renderer", - "version": "2.5.8", + "version": "2.5.10", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,12 +26,12 @@ "gl": "^4.4.0" }, "dependencies": { - "@antv/l7-core": "^2.5.8", + "@antv/l7-core": "^2.5.10", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", + "l7regl": "^0.0.10", "lodash": "^4.17.15", - "reflect-metadata": "^0.1.13", - "l7regl": "^0.0.10" + "reflect-metadata": "^0.1.13" }, "gitHead": "7eb8382ede52d803fae13a85fe6af074400260ee", "publishConfig": { diff --git a/packages/scene/package.json b/packages/scene/package.json index 5d2f21b365..656c54c80e 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-scene", - "version": "2.5.8", + "version": "2.5.10", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -23,12 +23,12 @@ "author": "xiaoiver", "license": "ISC", "dependencies": { - "@antv/l7-component": "^2.5.8", - "@antv/l7-core": "^2.5.8", - "@antv/l7-layers": "^2.5.8", - "@antv/l7-maps": "^2.5.8", - "@antv/l7-renderer": "^2.5.8", - "@antv/l7-utils": "^2.5.8", + "@antv/l7-component": "^2.5.10", + "@antv/l7-core": "^2.5.10", + "@antv/l7-layers": "^2.5.10", + "@antv/l7-maps": "^2.5.10", + "@antv/l7-renderer": "^2.5.10", + "@antv/l7-utils": "^2.5.10", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "mapbox-gl": "^1.2.1", diff --git a/packages/source/package.json b/packages/source/package.json index 1d1a1b38f6..cc23df4fe0 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-source", - "version": "2.5.8", + "version": "2.5.10", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,8 +26,8 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-core": "^2.5.8", - "@antv/l7-utils": "^2.5.8", + "@antv/l7-core": "^2.5.10", + "@antv/l7-utils": "^2.5.10", "@babel/runtime": "^7.7.7", "@mapbox/geojson-rewind": "^0.4.0", "@turf/helpers": "^6.1.4", diff --git a/packages/three/package.json b/packages/three/package.json index e9d876c938..7b750e10d4 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-three", - "version": "2.5.8", + "version": "2.5.10", "description": "three for L7 ", "keywords": [ "3D", @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7": "^2.5.8", + "@antv/l7": "^2.5.10", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "reflect-metadata": "^0.1.13", diff --git a/packages/utils/package.json b/packages/utils/package.json index a19a5e45be..8ae0ce6851 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-utils", - "version": "2.5.8", + "version": "2.5.10", "description": "", "main": "lib/index.js", "module": "es/index.js",