diff --git a/webapp/.gitignore b/webapp/.gitignore index 2c2c90e..17f6074 100644 --- a/webapp/.gitignore +++ b/webapp/.gitignore @@ -9,6 +9,9 @@ # production /build +# css files always generated from scss +*.css + npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/webapp/config/paths.js b/webapp/config/paths.js index 639245f..bacc5f5 100644 --- a/webapp/config/paths.js +++ b/webapp/config/paths.js @@ -40,7 +40,6 @@ function getServedPath(appPackageJson) { // config after eject: we're in ./config/ module.exports = { - dotenv: resolveApp('.env'), appBuild: resolveApp('build'), appPublic: resolveApp('public'), appHtml: resolveApp('public/index.html'), diff --git a/webapp/package.json b/webapp/package.json index 2d22d61..dec9385 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -7,26 +7,30 @@ "babel-eslint": "7.2.3", "babel-jest": "20.0.3", "babel-loader": "7.1.2", + "babel-preset-es2015": "^6.1.18", "babel-runtime": "6.26.0", "bulma": "^0.6.1", "copy-webpack-plugin": "4.3.1", + "css-loader": "0.28.8", "eslint": "4.10.0", "eslint-loader": "1.9.0", "eslint-plugin-flowtype": "2.39.1", "eslint-plugin-import": "2.8.0", + "hyperapp": "1.0.2", "jest": "20.0.4", "node-sass-chokidar": "0.0.3", "npm-run-all": "^4.1.2", "promise": "8.0.1", "rimraf": "2.6.2", + "style-loader": "0.19.1", "webpack": "3.8.1", "webpack-dev-server": "2.9.4", "whatwg-fetch": "2.0.3" }, "scripts": { - "watch-css": "npm run build-css && node-sass-chokidar --include-path ./src --include-path ./node_modules src/ -o build/ --watch --recursive", + "watch-css": "npm run build-css && node-sass-chokidar --include-path ./src --include-path ./node_modules src/ -o src/ --watch --recursive", "watch-js": "webpack --watch", - "build-css": "node-sass-chokidar --include-path ./src --include-path ./node_modules src/ -o build/", + "build-css": "node-sass-chokidar --include-path ./src --include-path ./node_modules src/ -o src/", "build-js": "webpack", "start-js": "webpack-dev-server --hot --inline", "start": "npm-run-all -p watch-css start-js", diff --git a/webapp/public/index.html b/webapp/public/index.html index 06bb43a..5a5b01d 100644 --- a/webapp/public/index.html +++ b/webapp/public/index.html @@ -8,8 +8,8 @@ manifest.json provides metadata used when your web app is added to the homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/ --> - - + +