Bump ocular-gatsby (#1115)

visgl · May 21, 2019 · fcc485c · fcc485c
1 parent 94b8f96
commit fcc485c
Show file tree

Hide file tree

Showing 32 changed files with 65 additions and 51 deletions.
diff --git a/website-gatsby/.gitignore b/website-gatsby/.gitignore
@@ -1,5 +1,3 @@
 public
 .cache
 report*.json
-examples
-
diff --git a/website-gatsby/ocular-config.js b/website-gatsby/ocular-config.js
@@ -4,7 +4,7 @@ const DOCS = require('../docs/table-of-contents.json');
 const DEPENDENCIES = require('./package.json').dependencies;
 // eslint-disable-next-line import/no-extraneous-dependencies
 const ALIASES = require('ocular-dev-tools/config/ocular.config')({
-  root: resolve(__dirname, '../..')
+  root: resolve(__dirname, '..')
 }).aliases;
 
 // When duplicating example dependencies in website, autogenerate
@@ -67,7 +67,24 @@ module.exports = {
     }
   ],
 
-  PROJECTS: [],
+  PROJECTS: [
+    {
+      name: 'deck.gl',
+      url: 'https://deck.gl'
+    },
+    {
+      name: 'luma.gl',
+      url: 'https://luma.gl'
+    },
+    {
+      name: 'react-map-gl',
+      url: 'https://uber.github.io/react-map-gl'
+    },
+    {
+      name: 'react-vis',
+      url: 'https://uber.github.io/react-vis'
+    }
+  ],
 
   ADDITIONAL_LINKS: [],
 
@@ -247,15 +264,14 @@ module.exports = {
   // Ocular adds this to gatsby's webpack config
   webpack: {
     resolve: {
-      // modules: [resolve(__dirname, './node_modules')],
       alias: Object.assign({}, ALIASES, dependencyAliases, {
-        //   '@luma.gl/addons': `${__dirname}/node_modules/@luma.gl/addons/src`,
-        //   '@luma.gl/core': `${__dirname}/node_modules/@luma.gl/core/src`,
-        //   '@luma.gl/constants': `${__dirname}/node_modules/@luma.gl/constants/src`,
-        //   '@luma.gl/webgl': `${__dirname}/node_modules/@luma.gl/webgl/src`,
-        //   '@deck.gl/core': `${__dirname}/node_modules/@deck.gl/core/src`,
-        //   '@deck.gl/layers': `${__dirname}/node_modules/@deck.gl/layers/src`,
-        //   '@deck.gl/react': `${__dirname}/node_modules/@deck.gl/react/src`
+        // '@luma.gl/addons': `${__dirname}/node_modules/@luma.gl/addons/src`,
+        // '@luma.gl/core': `${__dirname}/node_modules/@luma.gl/core/src`,
+        // '@luma.gl/constants': `${__dirname}/node_modules/@luma.gl/constants/src`,
+        // '@luma.gl/webgl': `${__dirname}/node_modules/@luma.gl/webgl/src`,
+        // '@deck.gl/core': `${__dirname}/node_modules/@deck.gl/core/src`,
+        // '@deck.gl/layers': `${__dirname}/node_modules/@deck.gl/layers/src`,
+        // '@deck.gl/react': `${__dirname}/node_modules/@deck.gl/react/src`
       })
     }
   }

diff --git a/website-gatsby/package.json b/website-gatsby/package.json
@@ -8,30 +8,23 @@
   ],
   "main": "index.js",
   "scripts": {
-    "start": "yarn copy-examples && yarn clean && yarn develop",
+    "start": "yarn clean-examples && yarn clean && yarn develop",
     "clean": "rm -rf ./.cache ./public",
     "develop": "gatsby develop --port=8001",
     "build": "yarn copy-examples && gatsby build",
     "serve": "gatsby serve",
     "deploy": "gh-pages -d public",
-    "copy-examples": "rm -rf examples ; find ../examples -name node_modules -exec rm -r {} \\; ; cp -r ../examples . "
+    "clean-examples": "rm -rf examples ; (find ../examples -name node_modules -exec rm -rf {} \\; || true)"
   },
   "dependencies": {
-    "@deck.gl/core": "^7.0.2",
-    "@deck.gl/layers": "^7.0.2",
-    "@deck.gl/react": "^7.0.2",
-    "@luma.gl/addons": "^7.0.0",
-    "@luma.gl/constants": "^7.0.0",
-    "@luma.gl/core": "^7.0.0",
-    "@luma.gl/webgl": "^7.0.0",
     "@probe.gl/stats-widget": "^3.0.1",
     "react": "^16.6.0",
     "react-dom": "^16.6.0"
   },
   "devDependencies": {
     "gatsby": "^2.3.0",
     "gatsby-plugin-styletron": "^3.0.5",
-    "ocular-gatsby": "1.0.0-alpha.21",
-    "sharp": "0.22"
+    "ocular-gatsby": "1.0.0-alpha.32",
+    "sharp": "^0.22"
   }
 }
diff --git a/website-gatsby/src/components/site-query.jsx b/website-gatsby/src/components/site-query.jsx
@@ -18,6 +18,8 @@ const QUERY = graphql`
         PROJECT_NAME
         PROJECT_TYPE
         PROJECT_DESC
+        PROJECT_URL
+        PROJECT_ORG
         HOME_HEADING
         HOME_BULLETS {
           text
@@ -36,6 +38,11 @@ const QUERY = graphql`
           name
           url
         }
+        ADDITIONAL_LINKS {
+          name
+          href
+          index
+        }
       }
     }
   }

diff --git a/website-gatsby/templates/core/example-cubemap.jsx b/website-gatsby/templates/core/example-cubemap.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/cubemap/app';
+import AnimationLoop from '../../../examples/core/cubemap/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-dof.jsx b/website-gatsby/templates/core/example-dof.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/dof/app';
+import AnimationLoop from '../../../examples/core/dof/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-fragment.jsx b/website-gatsby/templates/core/example-fragment.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/fragment/app';
+import AnimationLoop from '../../../examples/core/fragment/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-gltf.jsx b/website-gatsby/templates/core/example-gltf.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/gltf/app';
+import AnimationLoop from '../../../examples/core/gltf/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-instancing.jsx b/website-gatsby/templates/core/example-instancing.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/instancing/app';
+import AnimationLoop from '../../../examples/core/instancing/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-mandelbrot.jsx b/website-gatsby/templates/core/example-mandelbrot.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/mandelbrot/app';
+import AnimationLoop from '../../../examples/core/mandelbrot/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-persistence.jsx b/website-gatsby/templates/core/example-persistence.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/persistence/app';
+import AnimationLoop from '../../../examples/core/persistence/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-quasicrystals.jsx b/website-gatsby/templates/core/example-quasicrystals.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/quasicrystals/app';
+import AnimationLoop from '../../../examples/core/quasicrystals/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-shadowmap.jsx b/website-gatsby/templates/core/example-shadowmap.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/shadowmap/app';
+import AnimationLoop from '../../../examples/core/shadowmap/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-texture-3d.jsx b/website-gatsby/templates/core/example-texture-3d.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/texture-3d/app';
+import AnimationLoop from '../../../examples/core/texture-3d/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-transform-feedback.jsx b/website-gatsby/templates/core/example-transform-feedback.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/transform-feedback/app';
+import AnimationLoop from '../../../examples/core/transform-feedback/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/core/example-transform.jsx b/website-gatsby/templates/core/example-transform.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/core/transform/app';
+import AnimationLoop from '../../../examples/core/transform/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-01.jsx b/website-gatsby/templates/lessons/example-01.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/01/app';
+import AnimationLoop from '../../../examples/lessons/01/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-02.jsx b/website-gatsby/templates/lessons/example-02.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/02/app';
+import AnimationLoop from '../../../examples/lessons/02/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-03.jsx b/website-gatsby/templates/lessons/example-03.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/03/app';
+import AnimationLoop from '../../../examples/lessons/03/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-04.jsx b/website-gatsby/templates/lessons/example-04.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/04/app';
+import AnimationLoop from '../../../examples/lessons/04/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-05.jsx b/website-gatsby/templates/lessons/example-05.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/05/app';
+import AnimationLoop from '../../../examples/lessons/05/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-06.jsx b/website-gatsby/templates/lessons/example-06.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/06/app';
+import AnimationLoop from '../../../examples/lessons/06/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-07.jsx b/website-gatsby/templates/lessons/example-07.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/07/app';
+import AnimationLoop from '../../../examples/lessons/07/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-08.jsx b/website-gatsby/templates/lessons/example-08.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/08/app';
+import AnimationLoop from '../../../examples/lessons/08/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-09.jsx b/website-gatsby/templates/lessons/example-09.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/09/app';
+import AnimationLoop from '../../../examples/lessons/09/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-10.jsx b/website-gatsby/templates/lessons/example-10.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/10/app';
+import AnimationLoop from '../../../examples/lessons/10/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-11.jsx b/website-gatsby/templates/lessons/example-11.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/11/app';
+import AnimationLoop from '../../../examples/lessons/11/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-12.jsx b/website-gatsby/templates/lessons/example-12.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/12/app';
+import AnimationLoop from '../../../examples/lessons/12/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-13.jsx b/website-gatsby/templates/lessons/example-13.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/13/app';
+import AnimationLoop from '../../../examples/lessons/13/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-14.jsx b/website-gatsby/templates/lessons/example-14.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/14/app';
+import AnimationLoop from '../../../examples/lessons/14/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-15.jsx b/website-gatsby/templates/lessons/example-15.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/15/app';
+import AnimationLoop from '../../../examples/lessons/15/app';
 
 export default class Example extends React.Component {
   render() {

diff --git a/website-gatsby/templates/lessons/example-16.jsx b/website-gatsby/templates/lessons/example-16.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import AnimationLoopRunner from '../../src/components/animation-loop-runner';
-import AnimationLoop from '../../examples/lessons/16/app';
+import AnimationLoop from '../../../examples/lessons/16/app';
 
 export default class Example extends React.Component {
   render() {