From fa17c7ffe1d374bb272cda06b617debdbc653f13 Mon Sep 17 00:00:00 2001 From: Xiaoji Chen Date: Fri, 1 Mar 2024 09:24:43 -0800 Subject: [PATCH] website use ts transformed source --- website/babel.config.js | 8 -------- website/docusaurus.config.js | 24 ++++++++++++------------ website/package.json | 2 -- website/scripts/build.sh | 6 ++++++ website/yarn.lock | 21 +-------------------- 5 files changed, 19 insertions(+), 42 deletions(-) diff --git a/website/babel.config.js b/website/babel.config.js index 9da704d1c6b..4e26c95b8b1 100644 --- a/website/babel.config.js +++ b/website/babel.config.js @@ -1,14 +1,6 @@ module.exports = { presets: [require.resolve('@docusaurus/core/lib/babel/preset')], plugins: [ - 'version-inline', - "inline-webgl-constants", - [ - 'remove-glsl-comments', - { - patterns: ['**/*.glsl.js', '**/*.glsl.ts'] - } - ], // Ensure consistently hashed component classNames between environments (a must for SSR) 'styled-components' ] diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 24bfdb253fd..ae18cbfb256 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -48,18 +48,18 @@ const config = { resolve: { modules: [resolve('node_modules'), resolve('../node_modules')], alias: { - '@deck.gl/aggregation-layers': resolve('../modules/aggregation-layers/src'), - '@deck.gl/arcgis': resolve('../modules/arcgis/src'), - '@deck.gl/carto': resolve('../modules/carto/src'), - '@deck.gl/core': resolve('../modules/core/src'), - '@deck.gl/extensions': resolve('../modules/extensions/src'), - '@deck.gl/geo-layers': resolve('../modules/geo-layers/src'), - '@deck.gl/google-maps': resolve('../modules/google-maps/src'), - '@deck.gl/json': resolve('../modules/json/src'), - '@deck.gl/layers': resolve('../modules/layers/src'), - '@deck.gl/mapbox': resolve('../modules/mapbox/src'), - '@deck.gl/mesh-layers': resolve('../modules/mesh-layers/src'), - '@deck.gl/react': resolve('../modules/react/src'), + '@deck.gl/aggregation-layers': resolve('../modules/aggregation-layers'), + '@deck.gl/arcgis': resolve('../modules/arcgis'), + '@deck.gl/carto': resolve('../modules/carto'), + '@deck.gl/core': resolve('../modules/core'), + '@deck.gl/extensions': resolve('../modules/extensions'), + '@deck.gl/geo-layers': resolve('../modules/geo-layers'), + '@deck.gl/google-maps': resolve('../modules/google-maps'), + '@deck.gl/json': resolve('../modules/json'), + '@deck.gl/layers': resolve('../modules/layers'), + '@deck.gl/mapbox': resolve('../modules/mapbox'), + '@deck.gl/mesh-layers': resolve('../modules/mesh-layers'), + '@deck.gl/react': resolve('../modules/react'), 'website-examples': resolve('../examples/website'), react: resolve('node_modules/react'), 'react-dom': resolve('node_modules/react-dom'), diff --git a/website/package.json b/website/package.json index f4c538c7b8f..75b57c4406b 100644 --- a/website/package.json +++ b/website/package.json @@ -42,8 +42,6 @@ "@docusaurus/preset-classic": "^2.2.0", "@mdx-js/react": "^1.6.22", "babel-plugin-styled-components": "^2.0.0", - "babel-plugin-inline-webgl-constants": "^2.0.0-alpha", - "babel-plugin-remove-glsl-comments": "^1.0.0", "prism-react-renderer": "^1.2.1", "ts-node": "~10.9.1" }, diff --git a/website/scripts/build.sh b/website/scripts/build.sh index 3e7912f4970..ecd23419884 100755 --- a/website/scripts/build.sh +++ b/website/scripts/build.sh @@ -10,6 +10,12 @@ MODE=$1 WEBSITE_DIR=`pwd` OUTPUT_DIR=build +# rebuild modules from source +( + cd .. + yarn build +) + # clean up cache docusaurus clear diff --git a/website/yarn.lock b/website/yarn.lock index 0cf95edc37e..b35ec093d69 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2105,11 +2105,6 @@ dependencies: "@babel/runtime" "^7.3.1" -"@luma.gl/constants@9.0.0-alpha.45": - version "9.0.0-alpha.45" - resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-9.0.0-alpha.45.tgz#f19c9c3c26b95e1dcf118cb1fbf2dbd93ffd8a1e" - integrity sha512-ZTLw0YMnPE1efXEoJ5FxUzwOwxTMNswfEUctu6liWM3EpI7s8kC33CX4M8Kr7xcaQLN09X836uKOmGRpyD8yVg== - "@mapbox/geojson-rewind@^0.5.2": version "0.5.2" resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a" @@ -4389,13 +4384,6 @@ babel-plugin-extract-import-names@1.6.22: dependencies: "@babel/helper-plugin-utils" "7.10.4" -babel-plugin-inline-webgl-constants@^2.0.0-alpha: - version "2.0.0-alpha.1" - resolved "https://registry.yarnpkg.com/babel-plugin-inline-webgl-constants/-/babel-plugin-inline-webgl-constants-2.0.0-alpha.1.tgz#a03ad8e9d650a1ea681b4fd46261d8659f54d274" - integrity sha512-VJqBM6hK5iq8BNZ7yoD3+fD8deFAKpnW/NNHRNtseActfksp26l6rdF/4HvoKoK5TmedQMlWzgNQH8jelcwzAg== - dependencies: - "@luma.gl/constants" "9.0.0-alpha.45" - babel-plugin-polyfill-corejs2@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" @@ -4420,13 +4408,6 @@ babel-plugin-polyfill-regenerator@^0.4.1: dependencies: "@babel/helper-define-polyfill-provider" "^0.3.3" -babel-plugin-remove-glsl-comments@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-remove-glsl-comments/-/babel-plugin-remove-glsl-comments-1.0.0.tgz#62c0910707798a60504b70d09f9e2733ae10fc93" - integrity sha512-Z11LLl2UgZHiNTHkwHAyB8/eTaJpq9ih28aR7VtXk1ky3dwQJFGHUqOQFy8MH6ZQ6Ky9PmoWreWeoRxT1Zs68w== - dependencies: - minimatch "^3.0.0" - "babel-plugin-styled-components@>= 1.12.0", babel-plugin-styled-components@^2.0.0: version "2.0.7" resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086" @@ -7592,7 +7573,7 @@ minimalistic-assert@^1.0.0: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimatch@3.1.2, minimatch@^3.0.0, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1: +minimatch@3.1.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==