chore(build): restore inline-webgl-constants transform (#8563)

package.json

@@ -72,7 +72,7 @@
     "gl": "6.0.2",
     "glsl-transpiler": "^1.8.6",
     "jsdom": "^20.0.0",
-    "ocular-dev-tools": "2.0.0-alpha.26",
+    "ocular-dev-tools": "2.0.0-alpha.27",
     "pre-commit": "^1.2.2",
     "pre-push": "^0.1.1",
     "puppeteer": "^22.0.0",

tsconfig.module.json

@@ -18,6 +18,9 @@
         "transform": "ocular-dev-tools/ts-transform-remove-glsl-comments",
         "pattern": ["**/*.glsl.ts"]
       },
+      {
+        "transform": "ocular-dev-tools/ts-transform-inline-webgl-constants"
+      },
       {
         "transform": "ocular-dev-tools/ts-transform-append-extension",
         "extensions": [".js", ".glsl.js"],

website/babel.config.js

@@ -1,13 +1,6 @@
 module.exports = {
   presets: [require.resolve('@docusaurus/core/lib/babel/preset')],
   plugins: [
-    'version-inline',
-    [
-      'remove-glsl-comments',
-      {
-        patterns: ['**/*.glsl.js', '**/*.glsl.ts']
-      }
-    ],
     // Ensure consistently hashed component classNames between environments (a must for SSR)
     'styled-components'
   ]

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'),

website/package.json

@@ -42,7 +42,6 @@
     "@docusaurus/preset-classic": "^2.2.0",
     "@mdx-js/react": "^1.6.22",
     "babel-plugin-styled-components": "^2.0.0",
-    "babel-plugin-remove-glsl-comments": "^1.0.0",
     "prism-react-renderer": "^1.2.1",
     "ts-node": "~10.9.1"
   },

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
 

website/yarn.lock

@@ -4408,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"
@@ -7580,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==

yarn.lock

@@ -9659,10 +9659,10 @@ octokit-pagination-methods@^1.1.0:
   resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
   integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
 
-ocular-dev-tools@2.0.0-alpha.26:
-  version "2.0.0-alpha.26"
-  resolved "https://registry.yarnpkg.com/ocular-dev-tools/-/ocular-dev-tools-2.0.0-alpha.26.tgz#57995e199ff9aa641c9e3a3e59e7d08bd4ec9ad6"
-  integrity sha512-TaObwQPJrew2sxchf48qKXSJCXfHdiq85RoiuyrWRQAlfDZkrT/e9iKdBLu7sY7ckmxrRndl99j8jcrLqBeCNw==
+ocular-dev-tools@2.0.0-alpha.27:
+  version "2.0.0-alpha.27"
+  resolved "https://registry.yarnpkg.com/ocular-dev-tools/-/ocular-dev-tools-2.0.0-alpha.27.tgz#11e00d674fabdab62a792562a87ad1d02d3bb06a"
+  integrity sha512-HVMi+F4gfKhIUTMqUg3CbOoJ0FInl3NlJAZUCMMTXSd1GGDuKtLwFw5txTdOvPH8AKeVjdNGtfSEBnkeK5detg==
   dependencies:
     "@babel/cli" "^7.14.5"
     "@babel/core" "^7.14.5"