chore(deps): Upgrade to [email protected] (#31)

visgl · Feb 2, 2024 · 907136f · 907136f
1 parent 0bde156
commit 907136f
Show file tree

Hide file tree

Showing 58 changed files with 3,613 additions and 3,180 deletions.
diff --git a/.ocularrc.js b/.ocularrc.js
@@ -5,13 +5,6 @@ export default {
   },
 
   aliases: {
-    '@deck.gl/core': './node_modules/@deck.gl/core',
-    '@deck.gl/layers': './node_modules/@deck.gl/layers',
-    '@deck.gl/aggregation-layers': './node_modules/@deck.gl/aggregation-layers',
-    '@deck.gl/geo-layers': './node_modules/@deck.gl/geo-layers',
-    '@deck.gl/mesh-layers': './node_modules/@deck.gl/mesh-layers',
-    '@deck.gl/extensions': './node_modules/@deck.gl/extensions',
-    '@deck.gl/react': './node_modules/@deck.gl/react',
     test: './test'
   },
 

diff --git a/examples/bing-maps/app.js b/examples/bing-maps/app.js
@@ -1,4 +1,4 @@
-import {loadModule} from 'deck.gl-bing-maps';
+import {loadModule} from '@deck.gl-community/bing-maps';
 import {GeoJsonLayer, ArcLayer} from 'deck.gl';
 
 // set your Bing Maps API key here

diff --git a/examples/bing-maps/index.html b/examples/bing-maps/index.html
@@ -1,23 +1,23 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>deck.gl w/ Bing Maps example</title>
-    <style>
-      #map {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-      }
-      .deck-tooltip {
-        white-space: nowrap;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="map"></div>
-    <script src="app.js"></script>
-  </body>
+    <head>
+        <meta charset="UTF-8" />
+        <title>deck.gl w/ Bing Maps example</title>
+        <style>
+            #map {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+            }
+            .deck-tooltip {
+                white-space: nowrap;
+            }
+        </style>
+    </head>
+    <body>
+        <div id="map"></div>
+        <script type="module" src="app.js"></script>
+    </body>
 </html>
diff --git a/examples/bing-maps/package.json b/examples/bing-maps/package.json
@@ -2,16 +2,13 @@
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "start": "webpack-dev-server --progress --hot --open",
-    "start-local": "webpack-dev-server --env.local --progress --hot --open",
-    "build": "webpack -p"
+    "start": "vite --open",
+    "start-local": "vite --config ../vite.config.local.mjs"
   },
   "dependencies": {
     "deck.gl": "^8.8.26"
   },
   "devDependencies": {
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1"
+    "vite": "^5.0.12"
   }
 }
diff --git a/examples/bing-maps/webpack.config.js b/examples/bing-maps/webpack.config.js
diff --git a/examples/minimal/app.js → examples/minimal/app.jsx b/examples/minimal/app.js → examples/minimal/app.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {add} from '@deck.gl-community/submodule';
+import {add} from '@deck.gl-community/template';
 
 export default function App() {
   const a = 1;

diff --git a/examples/minimal/index.html b/examples/minimal/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>deck.gl Community Example</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+    </head>
+    <body></body>
+    <script type="module" src="./index.jsx"></script>
+</html>
diff --git a/examples/minimal/index.js → examples/minimal/index.jsx b/examples/minimal/index.js → examples/minimal/index.jsx
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -1,21 +1,15 @@
 {
   "license": "MIT",
   "scripts": {
-    "start": "webpack-dev-server --progress --hot --open",
-    "start-local": "webpack-dev-server --env.local --progress --hot --open"
+    "start": "vite --open",
+    "start-local": "vite --config ../vite.config.local.mjs"
   },
   "dependencies": {
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "@deck.gl-community/submodule": "^0.0.1"
+    "@deck.gl-community/template": "^0.0.1"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.0.0",
-    "babel-loader": "^9.1.2",
-    "html-webpack-plugin": "^5.5.0",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1"
+    "vite": "^5.0.12"
   }
 }
diff --git a/examples/minimal/webpack.config.js b/examples/minimal/webpack.config.js
diff --git a/examples/react-graph-gl/index.html b/examples/react-graph-gl/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>deck.gl Community Example</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+    </head>
+    <body></body>
+    <script type="module" src="./index.jsx"></script>
+</html>
diff --git a/...act-graph-gl/simple-graph-viewer/index.js → examples/react-graph-gl/index.jsx b/...act-graph-gl/simple-graph-viewer/index.js → examples/react-graph-gl/index.jsx
@@ -1,8 +1,9 @@
 import React, {Component} from 'react';
 
-import GraphGL, {D3ForceLayout, JSONLoader, NODE_TYPE} from 'modules/react-graph-layers';
+import {D3ForceLayout, JSONLoader, NODE_TYPE} from 'deck-graph-layers';
+import {GraphGL} from 'react-deck-graph-layers';
 
-import SAMPLE_GRAPH_DATASETS from '../../utils/data/sample-datasets';
+import SAMPLE_GRAPH_DATASETS from 'react-deck-graph-layers/test/utils/data/sample-datasets.js';
 
 const DEFAULT_NODE_SIZE = 5;
 

diff --git a/examples/react-graph-gl/package.json b/examples/react-graph-gl/package.json
@@ -0,0 +1,16 @@
+{
+  "license": "MIT",
+  "type": "module",
+  "scripts": {
+    "start": "vite --open",
+    "start-local": "vite --config ../vite.config.local.mjs"
+  },
+  "dependencies": {
+    "deck.gl": "^8.8.26",
+    "deck-graph-layers": "^0.0.22",
+    "react-deck-graph-layers": "^0.0.24"
+  },
+  "devDependencies": {
+    "vite": "^5.0.12"
+  }
+}
diff --git a/examples/react-graph-gl/simple-graph-viewer/package.json b/examples/react-graph-gl/simple-graph-viewer/package.json
diff --git a/examples/vite.config.local.mjs b/examples/vite.config.local.mjs
@@ -0,0 +1,41 @@
+// This file contains webpack configuration settings that allow
+// examples to be built against the source code in this repo instead
+// of building against their installed version of the modules.
+
+import {defineConfig} from 'vite';
+import {getOcularConfig} from 'ocular-dev-tools';
+import {join} from 'path';
+
+const rootDir = join(__dirname, '..');
+
+/** https://vitejs.dev/config/ */
+export default defineConfig(async () => {
+  const {aliases} = await getOcularConfig({root: rootDir});
+
+  console.log(aliases);
+
+  return {
+    resolve: {
+      alias: {
+        ...aliases,
+        // Use root dependencies
+        '@luma.gl': join(rootDir, './node_modules/@luma.gl'),
+        '@math.gl': join(rootDir, './node_modules/@math.gl'),
+        '@loaders.gl': join(rootDir, './node_modules/@loaders.gl')
+      }
+    },
+    define: {
+      'process.env.GoogleMapsAPIKey': JSON.stringify(process.env.GoogleMapsAPIKey),
+      'process.env.GoogleMapsMapId': JSON.stringify(process.env.GoogleMapsMapId),
+      'process.env.MapboxAccessToken': JSON.stringify(process.env.MapboxAccessToken),
+      'process.env.BingMapsAPIKey': JSON.stringify(process.env.BingMapsAPIKey)
+    },
+    server: {
+      open: true,
+      port: 8080
+    },
+    optimizeDeps: {
+      esbuildOptions: {target: 'es2020'}
+    }
+  };
+});
diff --git a/examples/webpack.config.local.cjs b/examples/webpack.config.local.cjs
diff --git a/lerna.json b/lerna.json
@@ -1,9 +1,6 @@
 {
   "version": "independent",
   "npmClient": "yarn",
-  "packages": [
-    "modules/*"
-  ],
   "command": {
     "bootstrap": {}
   }

diff --git a/modules-wip/submodule/package.json b/modules-wip/submodule/package.json
diff --git a/modules-wip/submodule/src/add.js b/modules-wip/submodule/src/add.js
diff --git a/modules-wip/submodule/src/index.js b/modules-wip/submodule/src/index.js
diff --git a/modules-wip/submodule/test/add.spec.js b/modules-wip/submodule/test/add.spec.js
diff --git a/modules-wip/submodule/test/index.js b/modules-wip/submodule/test/index.js