From db6b55cc3fbbed258317c23fca6e99e295e2dee9 Mon Sep 17 00:00:00 2001 From: Ib Green Date: Tue, 2 Apr 2019 15:16:07 -0700 Subject: [PATCH 1/2] Bump ocular --- .gitattributes | 1 - website/package.json | 4 ++-- website/src/components/site-query.jsx | 8 ++++---- yarn.lock | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitattributes b/.gitattributes index 821e16df88..613f95e8d6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,3 @@ -yarn.lock -diff build/** -diff dist/** -diff _docs/** -diff diff --git a/website/package.json b/website/package.json index 90659cd02d..be27e70dd8 100644 --- a/website/package.json +++ b/website/package.json @@ -18,8 +18,8 @@ "noise3d": "^1.0.0" }, "devDependencies": { - "gatsby": "2.1.38", - "ocular-gatsby": "1.0.0-alpha.12", + "gatsby": "^2.2.0-rc.2", + "ocular-gatsby": "1.0.0-alpha.14", "sharp": "0.21.1" } } diff --git a/website/src/components/site-query.jsx b/website/src/components/site-query.jsx index f6ddba78c9..2a9f090c3a 100644 --- a/website/src/components/site-query.jsx +++ b/website/src/components/site-query.jsx @@ -32,6 +32,10 @@ const QUERY = graphql` key value } + PROJECTS { + name + url + } } } } @@ -67,9 +71,7 @@ const QUERY = graphql` title level entries { - id childMarkdownRemark { - id frontmatter { title } @@ -80,9 +82,7 @@ const QUERY = graphql` } } entries { - id childMarkdownRemark { - id frontmatter { title } diff --git a/yarn.lock b/yarn.lock index 299c211f4a..eb592c18b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -774,6 +774,11 @@ save-pixels "^2.3.2" through "^2.3.8" +"@luma.gl/constants@7.0.0-beta.1": + version "7.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.0.0-beta.1.tgz#66dc10d22e3b6811eddf87c864154c97cef8557a" + integrity sha512-1C2361GQZsp94/xuO0qK2e8LcdKoLkujeRivCYI1SQS1Hn8rBRSXR13cl5YP726AWn/QqF4lzFZP/mTPykWM/Q== + "@luma.gl/glfx@^6.3.0-alpha.2": version "6.3.0" resolved "https://registry.yarnpkg.com/@luma.gl/glfx/-/glfx-6.3.0.tgz#08929e3488b58ddf339c6df0627282543d78c66a" From ab09f6580ca19a6a0d0c2b6c6ac2f006058c1861 Mon Sep 17 00:00:00 2001 From: Ib Green Date: Tue, 2 Apr 2019 16:19:23 -0700 Subject: [PATCH 2/2] Gatsby update --- .../package.json | 2 +- examples/core/cubemap/package.json | 4 +- examples/core/dof/package.json | 4 +- examples/core/fragment/package.json | 2 +- examples/core/gltf/package.json | 6 +- examples/core/instancing/package.json | 2 +- examples/core/mandelbrot/package.json | 2 +- examples/core/persistence/package.json | 2 +- examples/core/shadowmap/package.json | 4 +- examples/core/texture-3d/package.json | 2 +- examples/core/transform-feedback/package.json | 2 +- examples/core/transform/package.json | 2 +- examples/lessons/01/package.json | 2 +- examples/lessons/02/package.json | 2 +- examples/lessons/03/package.json | 2 +- examples/lessons/04/package.json | 2 +- examples/lessons/05/package.json | 4 +- examples/lessons/06/package.json | 6 +- examples/lessons/07/package.json | 6 +- examples/lessons/08/package.json | 6 +- examples/lessons/09/package.json | 4 +- examples/lessons/10/package.json | 6 +- examples/lessons/11/package.json | 6 +- examples/lessons/12/package.json | 4 +- examples/lessons/13/package.json | 4 +- examples/lessons/14/package.json | 2 +- examples/lessons/15/package.json | 4 +- examples/lessons/16/package.json | 4 +- modules/script/package.json | 4 +- test/apps/wip/cubemap2/package.json | 2 +- test/apps/wip/custom-picking/package.json | 2 +- test/apps/wip/debugger/package.json | 2 +- test/apps/wip/deferred-rendering/package.json | 2 +- test/apps/wip/imageproc/package.json | 2 +- test/apps/wip/particles/package.json | 2 +- test/apps/wip/picking/package.json | 2 +- test/apps/wip/voronoi/package.json | 2 +- website/gatsby-node.js | 99 ++++++++++++++++++- website/ocular-config.js | 2 +- website/package.json | 8 +- 40 files changed, 160 insertions(+), 67 deletions(-) diff --git a/dev-modules/babel-plugin-inline-webgl-constants/package.json b/dev-modules/babel-plugin-inline-webgl-constants/package.json index 14cea81faa..d3d0f5046d 100644 --- a/dev-modules/babel-plugin-inline-webgl-constants/package.json +++ b/dev-modules/babel-plugin-inline-webgl-constants/package.json @@ -15,6 +15,6 @@ ], "main": "index.js", "dependencies": { - "@luma.gl/constants": "^7.0.0-alpha.6" + "@luma.gl/constants": "^7.0.0-beta" } } \ No newline at end of file diff --git a/examples/core/cubemap/package.json b/examples/core/cubemap/package.json index 76be05b0ae..9975b94f4a 100644 --- a/examples/core/cubemap/package.json +++ b/examples/core/cubemap/package.json @@ -5,8 +5,8 @@ "build": "webpack --env.analyze" }, "dependencies": { - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/core/dof/package.json b/examples/core/dof/package.json index b37821963a..d0afca74e3 100644 --- a/examples/core/dof/package.json +++ b/examples/core/dof/package.json @@ -9,8 +9,8 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/core/fragment/package.json b/examples/core/fragment/package.json index 224ff28368..3348be51aa 100644 --- a/examples/core/fragment/package.json +++ b/examples/core/fragment/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/examples/core/gltf/package.json b/examples/core/gltf/package.json index 8a077d2b17..07afd18af6 100644 --- a/examples/core/gltf/package.json +++ b/examples/core/gltf/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@loaders.gl/core": "v1.0.0-alpha.2", - "@luma.gl/addons": "^7.0.0-alpha.16", - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/addons": "^7.0.0-beta", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/core/instancing/package.json b/examples/core/instancing/package.json index 56119029bb..ebc7686e2f 100644 --- a/examples/core/instancing/package.json +++ b/examples/core/instancing/package.json @@ -5,7 +5,7 @@ "build": "webpack --env.local --env.analyze --profile --json > stats.json" }, "dependencies": { - "@luma.gl/core": "7.0.0-alpha", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/core/mandelbrot/package.json b/examples/core/mandelbrot/package.json index bcc909b731..b5bccfe39c 100644 --- a/examples/core/mandelbrot/package.json +++ b/examples/core/mandelbrot/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "html-webpack-plugin": "^3.2.0", diff --git a/examples/core/persistence/package.json b/examples/core/persistence/package.json index 299347fbcc..4796604649 100644 --- a/examples/core/persistence/package.json +++ b/examples/core/persistence/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open --mode=development" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/core/shadowmap/package.json b/examples/core/shadowmap/package.json index 700d218895..c0ccbc9c6e 100644 --- a/examples/core/shadowmap/package.json +++ b/examples/core/shadowmap/package.json @@ -9,8 +9,8 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/core/texture-3d/package.json b/examples/core/texture-3d/package.json index 771a634f58..27ce1575ef 100644 --- a/examples/core/texture-3d/package.json +++ b/examples/core/texture-3d/package.json @@ -5,7 +5,7 @@ "build": "webpack --env.local --env.analyze --profile --json > stats.json" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1", "noise3d": "^1.0.0" }, diff --git a/examples/core/transform-feedback/package.json b/examples/core/transform-feedback/package.json index bcc909b731..b5bccfe39c 100644 --- a/examples/core/transform-feedback/package.json +++ b/examples/core/transform-feedback/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "html-webpack-plugin": "^3.2.0", diff --git a/examples/core/transform/package.json b/examples/core/transform/package.json index c0a02200f2..5a4e4b1df5 100644 --- a/examples/core/transform/package.json +++ b/examples/core/transform/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/core": "^7.0.0-beta", "probe.gl": "^3.0.1" }, "devDependencies": { diff --git a/examples/lessons/01/package.json b/examples/lessons/01/package.json index f2d3cc45fc..b034e31451 100644 --- a/examples/lessons/01/package.json +++ b/examples/lessons/01/package.json @@ -9,7 +9,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/examples/lessons/02/package.json b/examples/lessons/02/package.json index f2d3cc45fc..b034e31451 100644 --- a/examples/lessons/02/package.json +++ b/examples/lessons/02/package.json @@ -9,7 +9,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/examples/lessons/03/package.json b/examples/lessons/03/package.json index f2d3cc45fc..b034e31451 100644 --- a/examples/lessons/03/package.json +++ b/examples/lessons/03/package.json @@ -9,7 +9,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/examples/lessons/04/package.json b/examples/lessons/04/package.json index f2d3cc45fc..b034e31451 100644 --- a/examples/lessons/04/package.json +++ b/examples/lessons/04/package.json @@ -9,7 +9,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/examples/lessons/05/package.json b/examples/lessons/05/package.json index e6f60fb4d4..7014171f89 100644 --- a/examples/lessons/05/package.json +++ b/examples/lessons/05/package.json @@ -9,8 +9,8 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/lessons/06/package.json b/examples/lessons/06/package.json index 46fac97397..ca83e3aeaa 100644 --- a/examples/lessons/06/package.json +++ b/examples/lessons/06/package.json @@ -9,9 +9,9 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/addons": "^7.0.0-alpha", - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/addons": "^7.0.0-beta", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/lessons/07/package.json b/examples/lessons/07/package.json index 46fac97397..ca83e3aeaa 100644 --- a/examples/lessons/07/package.json +++ b/examples/lessons/07/package.json @@ -9,9 +9,9 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/addons": "^7.0.0-alpha", - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/addons": "^7.0.0-beta", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/lessons/08/package.json b/examples/lessons/08/package.json index 46fac97397..ca83e3aeaa 100644 --- a/examples/lessons/08/package.json +++ b/examples/lessons/08/package.json @@ -9,9 +9,9 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/addons": "^7.0.0-alpha", - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/addons": "^7.0.0-beta", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/lessons/09/package.json b/examples/lessons/09/package.json index d434e62e76..34ce612ff5 100644 --- a/examples/lessons/09/package.json +++ b/examples/lessons/09/package.json @@ -9,8 +9,8 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha", - "@luma.gl/addons": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta", + "@luma.gl/addons": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/examples/lessons/10/package.json b/examples/lessons/10/package.json index e9beb086f1..a43d781394 100644 --- a/examples/lessons/10/package.json +++ b/examples/lessons/10/package.json @@ -8,9 +8,9 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/addons": "^7.0.0-beta.1", - "@luma.gl/constants": "^7.0.0-beta.1", - "@luma.gl/core": "^7.0.0-beta.1", + "@luma.gl/addons": "^7.0.0-beta", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/lessons/11/package.json b/examples/lessons/11/package.json index ca507cdb9f..396bb3d5df 100644 --- a/examples/lessons/11/package.json +++ b/examples/lessons/11/package.json @@ -8,9 +8,9 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/addons": "^7.0.0-alpha", - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/addons": "^7.0.0-beta", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/lessons/12/package.json b/examples/lessons/12/package.json index c38bcaec5f..0246ad8824 100644 --- a/examples/lessons/12/package.json +++ b/examples/lessons/12/package.json @@ -8,8 +8,8 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/lessons/13/package.json b/examples/lessons/13/package.json index 202365f01c..07c1a82aa6 100644 --- a/examples/lessons/13/package.json +++ b/examples/lessons/13/package.json @@ -8,8 +8,8 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/lessons/14/package.json b/examples/lessons/14/package.json index 0690fa58d3..a802522fd5 100644 --- a/examples/lessons/14/package.json +++ b/examples/lessons/14/package.json @@ -8,7 +8,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/examples/lessons/15/package.json b/examples/lessons/15/package.json index 17b1a7a84e..ceee0e9c05 100644 --- a/examples/lessons/15/package.json +++ b/examples/lessons/15/package.json @@ -8,8 +8,8 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/examples/lessons/16/package.json b/examples/lessons/16/package.json index 60b146d57c..42d4f7e16d 100644 --- a/examples/lessons/16/package.json +++ b/examples/lessons/16/package.json @@ -4,8 +4,8 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/constants": "^7.0.0-alpha.3", - "@luma.gl/core": "^7.0.0-alpha", + "@luma.gl/constants": "^7.0.0-beta", + "@luma.gl/core": "^7.0.0-beta", "math.gl": "^2.3.1" }, "devDependencies": { diff --git a/modules/script/package.json b/modules/script/package.json index 6b1043301d..46ca79eb48 100644 --- a/modules/script/package.json +++ b/modules/script/package.json @@ -26,9 +26,9 @@ "dependencies": { "@luma.gl/constants": "^7.0.0-alpha.2", "@luma.gl/core": "^7.0.0-alpha.17", - "@luma.gl/debug": "^7.0.0-alpha", + "@luma.gl/debug": "^7.0.0-beta", "@luma.gl/glfx": "^6.3.0-alpha.2", - "@luma.gl/shadertools": "^7.0.0-alpha", + "@luma.gl/shadertools": "^7.0.0-beta", "math.gl": "^2.3.0-beta.2" } } diff --git a/test/apps/wip/cubemap2/package.json b/test/apps/wip/cubemap2/package.json index bd9b2c9fa2..bcf5fa32a3 100644 --- a/test/apps/wip/cubemap2/package.json +++ b/test/apps/wip/cubemap2/package.json @@ -5,7 +5,7 @@ "build": "webpack --env.analyze" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "html-webpack-plugin": "^3.2.0", diff --git a/test/apps/wip/custom-picking/package.json b/test/apps/wip/custom-picking/package.json index 224ff28368..3348be51aa 100644 --- a/test/apps/wip/custom-picking/package.json +++ b/test/apps/wip/custom-picking/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/test/apps/wip/debugger/package.json b/test/apps/wip/debugger/package.json index bd9b2c9fa2..bcf5fa32a3 100644 --- a/test/apps/wip/debugger/package.json +++ b/test/apps/wip/debugger/package.json @@ -5,7 +5,7 @@ "build": "webpack --env.analyze" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "html-webpack-plugin": "^3.2.0", diff --git a/test/apps/wip/deferred-rendering/package.json b/test/apps/wip/deferred-rendering/package.json index 224ff28368..3348be51aa 100644 --- a/test/apps/wip/deferred-rendering/package.json +++ b/test/apps/wip/deferred-rendering/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/test/apps/wip/imageproc/package.json b/test/apps/wip/imageproc/package.json index bcc909b731..b5bccfe39c 100644 --- a/test/apps/wip/imageproc/package.json +++ b/test/apps/wip/imageproc/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open -d" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "html-webpack-plugin": "^3.2.0", diff --git a/test/apps/wip/particles/package.json b/test/apps/wip/particles/package.json index 224ff28368..3348be51aa 100644 --- a/test/apps/wip/particles/package.json +++ b/test/apps/wip/particles/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/test/apps/wip/picking/package.json b/test/apps/wip/picking/package.json index 3ff15bacb2..51772436ca 100644 --- a/test/apps/wip/picking/package.json +++ b/test/apps/wip/picking/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@loaders.gl/core": "^0.5.3", - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "html-webpack-plugin": "^3.2.0", diff --git a/test/apps/wip/voronoi/package.json b/test/apps/wip/voronoi/package.json index 224ff28368..3348be51aa 100644 --- a/test/apps/wip/voronoi/package.json +++ b/test/apps/wip/voronoi/package.json @@ -4,7 +4,7 @@ "start-local": "webpack-dev-server --env.local --progress --hot --open" }, "dependencies": { - "@luma.gl/core": "^7.0.0-alpha" + "@luma.gl/core": "^7.0.0-beta" }, "devDependencies": { "webpack": "^4.3.0", diff --git a/website/gatsby-node.js b/website/gatsby-node.js index 08b65dc2b7..4f25056ade 100644 --- a/website/gatsby-node.js +++ b/website/gatsby-node.js @@ -1,8 +1,3 @@ -const config = require('./ocular-config'); -const getGatsbyNodeCallbacks = require('ocular-gatsby/gatsby-node'); - -module.exports = getGatsbyNodeCallbacks(config); - // NOTE: It is possible to override the ocular-provided callbacks // and this take control any aspect of gatsby: @@ -18,3 +13,97 @@ module.exports = getGatsbyNodeCallbacks(config); // // We use graphgl to query for nodes and iterate // exports.createPages = ({ graphql, actions }) => // ocular.createPages({ graphql, actions }); + +const config = require('./ocular-config'); +const getGatsbyNodeCallbacks = require('ocular-gatsby/gatsby-node'); + +const callbacks = getGatsbyNodeCallbacks(config); + +module.exports = callbacks; + +const onCreateWebpackConfig = callbacks.onCreateWebpackConfig; + +callbacks.onCreateWebpackConfig = function onCreateWebpackConfigOverride(opts) { + onCreateWebpackConfig(opts); + + const {ocularConfig} = global || {}; + + const { + stage, // build stage: ‘develop’, ‘develop-html’, ‘build-javascript’, or ‘build-html’ + getConfig, // Function that returns the current webpack config + rules, // Object (map): set of preconfigured webpack config rules + loaders, // Object (map): set of preconfigured webpack config loaders + plugins, // Object (map): A set of preconfigured webpack config plugins + actions + } = opts; + + + console.log(JSON.stringify(Object.keys(actions))); + + console.log(`App rewriting gatsby webpack config`); + + + const config = getConfig(); + + // Recreate it with custom exclude filter + const newJSRule = Object.assign(loaders.js(), { + // Called without any arguments, `loaders.js` will return an + // object like: + // { + // options: undefined, + // loader: '/path/to/node_modules/gatsby/dist/utils/babel-loader.js', + // } + // Unless you're replacing Babel with a different transpiler, you probably + // want this so that Gatsby will apply its required Babel + // presets/plugins. This will also merge in your configuration from + // `babel.config.js`. + + // JS and JSX + test: /\.jsx?$/, + + // Exclude all node_modules from transpilation, except for ocular + exclude: modulePath => + /node_modules/.test(modulePath) && + !/node_modules\/(ocular|ocular-gatsby|gatsby-plugin-ocular)/.test(modulePath), + }); + + const newConfig = { + module: { + rules: [ + ...config.module.rules, + // Omit the default rule where test === '\.jsx?$' + newJSRule + ] + }, + node: { + fs: 'empty' + } + }; + + + // Completely replace the webpack config for the current stage. + // This can be dangerous and break Gatsby if certain configuration options are changed. + // Generally only useful for cases where you need to handle config merging logic yourself, + // in which case consider using webpack-merge. + actions.setWebpackConfig(newConfig); + + /* + log.log({color: COLOR.YELLOW, priority: 2}, `Webpack delta config ${JSON.stringify(newConfig, null, 2)}`)(); + + // UNCOMMENT TO DEBUG THE CONFIG + config = getConfig(); + const jsRules = config.module.rules.filter(rule => String(rule.test) === String(/\.jsx?$/)) + const oldJSRule = jsRules[0]; + + log.log({color: COLOR.CYAN, priority: 1}, + `Webpack started with aliases ${JSON.stringify(config.resolve.alias, null, 2)}`)(); + + log.log({color: COLOR.MAGENTA, priority: 3}, + `Webpack config +rules ${JSON.stringify(jsRules[0])} => ${JSON.stringify(newJSRule)} +test ${oldJSRule.test} => ${newJSRule.test} +include ${oldJSRule.include} => ${newJSRule.include} +exclude ${oldJSRule.exclude} => ${newJSRule.exclude}` + )(); + */ +} \ No newline at end of file diff --git a/website/ocular-config.js b/website/ocular-config.js index a017082aa9..27c5b6bfe7 100644 --- a/website/ocular-config.js +++ b/website/ocular-config.js @@ -27,7 +27,7 @@ module.exports = { PROJECT_URL: `https://luma.gl`, PROJECT_DESC: 'WebGL2 Components', - PROJECTS: {}, + PROJECTS: [], HOME_HEADING: 'High-performance WebGL2 components for GPU-powered data visualization and computation.', diff --git a/website/package.json b/website/package.json index be27e70dd8..1d2361d056 100644 --- a/website/package.json +++ b/website/package.json @@ -13,13 +13,17 @@ "serve": "gatsby serve" }, "dependencies": { + "@loaders.gl/core": "^0.8.0", + "@loaders.gl/draco": "^0.8.0", + "@loaders.gl/gltf": "^0.8.1", "@probe.gl/stats-widget": "^3.0.1", "math.gl": "^2.3.1", "noise3d": "^1.0.0" }, "devDependencies": { - "gatsby": "^2.2.0-rc.2", - "ocular-gatsby": "1.0.0-alpha.14", + "gatsby": "2.2.0-rc.2", + "gatsby-plugin-styletron": "^3.0.5", + "ocular-gatsby": "1.0.0-alpha.16", "sharp": "0.21.1" } }