dhis2 · amcgee · Apr 17, 2019 · Apr 17, 2019 · Apr 17, 2019 · Apr 17, 2019
diff --git a/extractor.js b/extractor.js
diff --git a/favorites.html b/favorites.html
diff --git a/index.html b/index.html
diff --git a/layout.html b/layout.html
diff --git a/netlify.toml b/netlify.toml
@@ -13,7 +13,7 @@ ID = "79053cdd-851c-479d-b6cd-1c6d77f679a3"
   publish = "build"
 
   # Default build command.
-  command = "yarn install && yarn build && yarn run manifest package.json build/manifest.webapp --manifest.activities.dhis.href=\"https://play.dhis2.org/dev\""
+  command = "yarn install && yarn build:netlify"
 
 # /dhis-web-core-resource/react/16.2.0/umd/react.production.min.js            https://unpkg.com/react@16.5/umd/react.production.min.js
 # /dhis-web-core-resource/react-dom/16.2.0/umd/react-dom.production.min.js    https://unpkg.com/react-dom@16.5/umd/react-dom.production.min.js

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
         "lint"
     ],
     "scripts": {
-        "prestart": "yarn localize && d2-manifest package.json manifest.webapp",
+        "prestart": "yarn localize && yarn manifest",
         "start": "webpack-dev-server",
         "coverage": "yarn test --coverage",
         "test": "jest",
@@ -32,10 +32,10 @@
         "cy:e2e:run": "CYPRESS_E2E=true cypress run",
         "cy:e2e:update": "CYPRESS_GEN_FIXTURES=true cypress run --config video=false",
         "cy:e2e:open:update": "CYPRESS_GEN_FIXTURES=true cypress open",
-        "prebuild": "yarn test",
-        "build": "yarn localize && rm -rf build && NODE_ENV=production webpack --progress && yarn manifest && cp -r i18n build && cp -r i18n_old build",
-        "postbuild": "cp icon.png ./build/ && cp -r images ./build",
-        "manifest": "d2-manifest package.json build/manifest.webapp",
+        "prebuild": "yarn test && yarn localize && yarn manifest && rm -rf build && mkdir build && cp -r public/* ./build/",
+        "build": "NODE_ENV=production webpack --progress",
+        "build:netlify": "yarn build && d2-manifest package.json build/manifest.webapp --manifest.activities.dhis.href=\"https://play.dhis2.org/dev\"",
+        "manifest": "d2-manifest package.json public/manifest.webapp",
         "lint": "eslint ./src",
         "validate": "npm ls --depth 0 || yarn list",
         "profile": "yarn start --profile",

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/i18n_old/i18n_module_en.properties → public/i18n_old/i18n_module_en.properties b/i18n_old/i18n_module_en.properties → public/i18n_old/i18n_module_en.properties
diff --git a/icon.png → public/icon.png b/icon.png → public/icon.png
diff --git a/images/boundaries.png → public/images/boundaries.png b/images/boundaries.png → public/images/boundaries.png
diff --git a/images/cluster.png → public/images/cluster.png b/images/cluster.png → public/images/cluster.png
diff --git a/images/elevation.png → public/images/elevation.png b/images/elevation.png → public/images/elevation.png
diff --git a/images/events.png → public/images/events.png b/images/events.png → public/images/events.png
diff --git a/images/facilities.png → public/images/facilities.png b/images/facilities.png → public/images/facilities.png
diff --git a/images/googlehybrid.jpeg → public/images/googlehybrid.jpeg b/images/googlehybrid.jpeg → public/images/googlehybrid.jpeg
diff --git a/images/googlestreets.png → public/images/googlestreets.png b/images/googlestreets.png → public/images/googlestreets.png
diff --git a/images/labels.png → public/images/labels.png b/images/labels.png → public/images/labels.png
diff --git a/images/landcover.png → public/images/landcover.png b/images/landcover.png → public/images/landcover.png
diff --git a/images/mapsapp-128.png → public/images/mapsapp-128.png b/images/mapsapp-128.png → public/images/mapsapp-128.png
diff --git a/images/mapsapp-16.png → public/images/mapsapp-16.png b/images/mapsapp-16.png → public/images/mapsapp-16.png
diff --git a/images/mapsapp-48.png → public/images/mapsapp-48.png b/images/mapsapp-48.png → public/images/mapsapp-48.png
diff --git a/images/marker-icon-2x.png → public/images/marker-icon-2x.png b/images/marker-icon-2x.png → public/images/marker-icon-2x.png
diff --git a/images/marker-icon.png → public/images/marker-icon.png b/images/marker-icon.png → public/images/marker-icon.png
diff --git a/images/marker-shadow.png → public/images/marker-shadow.png b/images/marker-shadow.png → public/images/marker-shadow.png
diff --git a/images/nighttime.png → public/images/nighttime.png b/images/nighttime.png → public/images/nighttime.png
diff --git a/images/nocluster.png → public/images/nocluster.png b/images/nocluster.png → public/images/nocluster.png
diff --git a/images/osm.png → public/images/osm.png b/images/osm.png → public/images/osm.png
diff --git a/images/osmdark.png → public/images/osmdark.png b/images/osmdark.png → public/images/osmdark.png
diff --git a/images/osmlight.png → public/images/osmlight.png b/images/osmlight.png → public/images/osmlight.png
diff --git a/images/population.png → public/images/population.png b/images/population.png → public/images/population.png
diff --git a/images/precipitation.png → public/images/precipitation.png b/images/precipitation.png → public/images/precipitation.png
diff --git a/images/temperature.png → public/images/temperature.png b/images/temperature.png → public/images/temperature.png
diff --git a/images/terrain.png → public/images/terrain.png b/images/terrain.png → public/images/terrain.png
diff --git a/images/thematic.png → public/images/thematic.png b/images/thematic.png → public/images/thematic.png
diff --git a/images/trackedentities.png → public/images/trackedentities.png b/images/trackedentities.png → public/images/trackedentities.png
diff --git a/public/index.html b/public/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+    <head>
+        <meta charset="UTF-8" />
+        <title>DHIS2 Maps</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <link href="./favicon.ico" rel="shortcut icon" />
+        <link
+            href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"
+            rel="stylesheet"
+        />
+        <!-- jss-insertion-point -->
+    </head>
+
+    <body>
+        <div id="app"></div>
+        <div id="context-menu"></div>
+
+        <%= htmlWebpackPlugin.options.vendorScripts %>
+    </body>
+</html>
diff --git a/plugin.html → public/plugin.html b/plugin.html → public/plugin.html
diff --git a/webpack.config.js b/webpack.config.js
@@ -112,23 +112,15 @@ const webpackConfig = {
     },
     plugins: [
         new HTMLWebpackPlugin({
-            template: 'index.html',
+            template: 'public/index.html',
             chunks: ['app'],
         }),
     ],
     devServer: {
-        contentBase: './',
+        contentBase: './public',
         port: 8082,
         inline: true,
         compress: true,
-        proxy: [
-            {
-                path: '/polyfill.min.js',
-                target:
-                    'http://localhost:8082/node_modules/babel-polyfill/dist',
-                bypass: log,
-            },
-        ],
     },
 };