From 365f0158d1b007f6993ca5dd7d3d15bcd6761c36 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 14 Nov 2019 22:24:31 +0800 Subject: [PATCH] fix: babel.config.js for gatsby --- babel.config.js | 35 ++++++++++++++++++++++++++++++++++- gatsby-browser.js | 2 +- gatsby-node.js | 14 ++++++++++++-- package.json | 2 +- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/babel.config.js b/babel.config.js index e6c0d9b36b..2f109408b7 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,6 +1,40 @@ // @see https://babeljs.io/docs/en/next/config-files#project-wide-configuration module.exports = (api) => { api.cache(() => process.env.NODE_ENV); + if(process.env.NODE_ENV === 'site') { + return { + "presets": [ + [ + "@babel/preset-env", + { + "loose": true, + "modules": false + } + ], + '@babel/preset-react', + "babel-preset-gatsby" + ], + "plugins": [ + [ + '@babel/plugin-proposal-decorators', + { + legacy: true, + } + ], + [ + // import glsl as raw text + 'babel-plugin-inline-import', + { + extensions: [ + // 由于使用了 TS 的 resolveJsonModule 选项,JSON 可以直接引入,不需要当作纯文本 + // '.json', + '.glsl', + ] + } + ], + ] + }; + } return { presets: [ [ @@ -14,7 +48,6 @@ module.exports = (api) => { ], '@babel/preset-react', '@babel/preset-typescript', - 'babel-preset-gatsby', ], plugins: [ '@babel/plugin-proposal-optional-chaining', diff --git a/gatsby-browser.js b/gatsby-browser.js index 5bd70d1b0b..61026a61e4 100644 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -1,4 +1,4 @@ -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('./packages/scene/src'); window.layers= require('./packages/layers/src'); diff --git a/gatsby-node.js b/gatsby-node.js index e516d2726a..62210f2ac1 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -1,7 +1,17 @@ -const setWebpackConfig = require('./.storybook/webpack.config'); +const path = require('path'); exports.onCreateWebpackConfig = ({ getConfig, stage, plugins }) => { const config = getConfig(); config.resolve.extensions.push('.glsl'); - console.log(config); + 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'), + }; }; diff --git a/package.json b/package.json index bb62c03c80..90daf5641d 100644 --- a/package.json +++ b/package.json @@ -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",