Merge pull request #58 from antvis/fix-example-error

fix: gatsby site examples

.gitignore

@@ -69,3 +69,6 @@ lib/
 .DS_Store
 public
 .cache
+
+yarn.lock
+package-lock.json

babel.config.js

@@ -1,18 +1,29 @@
 // @see https://babeljs.io/docs/en/next/config-files#project-wide-configuration
 module.exports = (api) => {
   api.cache(() => process.env.NODE_ENV);
-  if(api.env("site")) { //
+  if(api.env('site')) {
     return {
       "presets": [
+        "babel-preset-gatsby"
+      ],
+      "plugins": [
         [
-          "@babel/preset-env",
+          '@babel/plugin-proposal-decorators',
           {
-            "loose": true,
+            legacy: true,
-            "modules": false
+          }
+        ],
+        [
+          // import glsl as raw text
+          'babel-plugin-inline-import',
+          {
+            extensions: [
+              // 由于使用了 TS 的 resolveJsonModule 选项，JSON 可以直接引入，不需要当作纯文本
+              // '.json',
+              '.glsl',
+            ]
           }
         ],
-        '@babel/preset-react',
-        "babel-preset-gatsby"
       ]
     };
   }

examples/point/chartmap/demo/chart.js

@@ -1,6 +1,7 @@
 import { Scene } from '@l7/scene';
 import { Marker } from '@l7/component'
-import  * as G2Plot from '@antv/g2plot'
+import G2Plot from '@antv/g2plot'
+
 const scene = new Scene({
   id: 'map',
   type: 'amap',
@@ -137,5 +138,3 @@ const scene = new Scene({
 //     });
 
 //   });
-
-

gatsby-browser.js

@@ -1,6 +1,6 @@
-import './packages/component/src/css/l7.css';
+require('./packages/component/src/css/l7.css');
 // window.GeoTIFF = require('geotiff/dist/geotiff.bundle.js')
-window.scene = require('@l7/scene');
+window.scene = require('./packages/scene/src');
-window.layers= require('@l7/layers');
+window.layers= require('./packages/layers/src');
-window.component= require('@l7/component');
+window.component= require('./packages/component/src');
-window.G2Plot = require('@antv/g2plot');
+window.g2plot = require('@antv/g2plot');

gatsby-node.js

@@ -0,0 +1,17 @@
+const path = require('path');
+
+exports.onCreateWebpackConfig = ({ getConfig, stage, plugins }) => {
+  const config = getConfig();
+  config.resolve.extensions.push('.glsl');
+  config.resolve.alias = {
+    ...config.resolve.alias,
+    '@l7/core': path.resolve(__dirname, 'packages/core/src'),
+    '@l7/component': path.resolve(__dirname, 'packages/component/src'),
+    '@l7/layers': path.resolve(__dirname, 'packages/layers/src'),
+    '@l7/maps': path.resolve(__dirname, 'packages/maps/src'),
+    '@l7/renderer': path.resolve(__dirname, 'packages/renderer/src'),
+    '@l7/scene': path.resolve(__dirname, 'packages/scene/src'),
+    '@l7/source': path.resolve(__dirname, 'packages/source/src'),
+    '@l7/utils': path.resolve(__dirname, 'packages/utils/src'),
+  };
+};

package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/antvis/L7"
   },
   "devDependencies": {
-    "@antv/gatsby-theme-antv": "^0.9.7",
+    "@antv/gatsby-theme-antv": "^0.9.52",
     "@babel/cli": "^7.6.4",
     "@babel/core": "^7.6.4",
     "@babel/plugin-proposal-decorators": "^7.6.0",
@@ -90,7 +90,7 @@
     "worker-loader": "^2.0.0"
   },
   "scripts": {
-    "start": "export NODE_ENV=site && npm run site:develop",
+    "start": "NODE_ENV=site npm run site:develop",
     "site:develop": "gatsby develop --open -H 0.0.0.0",
     "site:build": "npm run site:clean && export NODE_ENV=site &&  gatsby build --prefix-paths",
     "site:clean": "gatsby clean",