updates deps, removes json styling

googlemaps-samples · Mar 15, 2022 · efbc461 · efbc461
1 parent 44fe56b
commit efbc461
Show file tree

Hide file tree

Showing 12 changed files with 11,208 additions and 8,435 deletions.
diff --git a/screenshot.png b/screenshot.png
diff --git a/solution/package-lock.json b/solution/package-lock.json
diff --git a/solution/package.json b/solution/package.json
@@ -3,14 +3,14 @@
   "version": "0.1.0",
   "license": "Apache-2.0",
   "scripts": {
-    "start": "webpack-dev-server --progress --hot --open"
+    "start": "webpack serve --progress --hot --open"
   },
   "dependencies": {
-    "@deck.gl/core": "7.0.0",
-    "@deck.gl/google-maps": "^7.0.0",
-    "@deck.gl/layers": "^7.0.0",
-    "webpack": "^4.20.2",
-    "webpack-cli": "^3.1.2",
-    "webpack-dev-server": "^3.1.1"
+    "@deck.gl/core": "^8.7.0",
+    "@deck.gl/google-maps": "^8.7.0",
+    "@deck.gl/layers": "^8.7.0",
+    "webpack": "^5.70.0",
+    "webpack-cli": "^4.9.2",
+    "webpack-dev-server": "^4.7.4"
   }
 }
diff --git a/solution/src/app.js b/solution/src/app.js
@@ -56,8 +56,7 @@ function loadJSAPI() {
 function initMap() {
   const mapOptions = {
     center: { lat: 40.75097, lng: -73.98765 },
-    zoom: 14,
-    styles: mapStyle
+    zoom: 14
   };
   const mapDiv = document.getElementById('map');
   return new google.maps.Map(mapDiv, mapOptions);

diff --git a/solution/src/styles/map-style.js b/solution/src/styles/map-style.js
diff --git a/solution/webpack.config.js b/solution/webpack.config.js
@@ -24,12 +24,10 @@ const CONFIG = {
     app: './src/app.js'
   },
   devServer: {
-    contentBase: path.join(__dirname, 'src')
-  },
-  plugins: [
-    // Read google maps token from environment variable
-    new webpack.EnvironmentPlugin(['GoogleMapsAPIKey'])
-  ]
+    static: {
+      directory: path.join(__dirname, 'src'),
+    }
+  }
 };
 
 module.exports = CONFIG;