diff --git a/init.js b/init.js index 2905afe7..8c5d982b 100644 --- a/init.js +++ b/init.js @@ -3,4 +3,4 @@ require('safestart')(__dirname, { }); require('babel-core/register'); require('babel-polyfill'); -require('localenv'); +require('dotenv').config({ silent: true }); diff --git a/package.json b/package.json index d8cf22da..e50ef439 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,11 @@ "main": "index.js", "scripts": { "clean": "rimraf dist", - "build:webpack": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js", - "build:analyze": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js --json | webpack-bundle-size-analyzer", + "build:webpack": "NODE_ENV=production webpack --config webpack.config.prod.js", + "build:analyze": "NODE_ENV=production webpack --config webpack.config.prod.js --json | webpack-bundle-size-analyzer", "build": "npm run clean && npm run build:webpack", "start": "node index.js", - "dev": "cross-env NODE_ENV=development DEBUG=sql,cache,presenters ./node_modules/.bin/nodemon --watch server index.js", + "dev": "NODE_ENV=development DEBUG=sql,cache,presenters ./node_modules/.bin/nodemon --watch server index.js", "lint": "npm run lint:js && npm run lint:flow", "lint:js": "eslint frontend", "lint:flow": "flow check", @@ -80,7 +80,6 @@ "boundless-popover": "^1.0.4", "bugsnag": "^1.7.0", "classnames": "2.2.3", - "cross-env": "1.0.7", "css-loader": "0.23.1", "debug": "2.2.0", "dotenv": "^4.0.0", @@ -119,7 +118,6 @@ "koa-mount": "^3.0.0", "koa-router": "7.0.1", "koa-sendfile": "2.0.0", - "localenv": "0.2.2", "lodash": "^4.17.4", "lodash.orderby": "4.4.0", "marked": "0.3.6", diff --git a/server/static/dev.html b/server/static/dev.html index 04b8c94d..1933c80b 100644 --- a/server/static/dev.html +++ b/server/static/dev.html @@ -1,28 +1,33 @@ - - Atlas - - - - -
- - - + body { + display: flex; + width: 100%; + height: 100%; + } + + #root { + flex: 1; + height: 100%; + } + + + + +
+ + + + \ No newline at end of file diff --git a/server/static/index.html b/server/static/index.html index 01e0eca1..0b3a902c 100644 --- a/server/static/index.html +++ b/server/static/index.html @@ -1,16 +1,30 @@ - - Atlas - - - - - + + + Atlas + + + + +
+ + + \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index d8865ca3..28fe5d82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1639,10 +1639,6 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.5.0.tgz#d777b6a4d847d423e5d475da864294ac1ff5aa9d" - commander@2.8.x: version "2.8.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" @@ -1899,20 +1895,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2: create-hash "^1.1.0" inherits "^2.0.1" -cross-env@1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-1.0.7.tgz#dd6cea13b31df4ffab4591343e605e370182647e" - dependencies: - cross-spawn-async "2.0.0" - lodash.assign "^3.2.0" - -cross-spawn-async@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.0.0.tgz#4af143df4156900d012be41cabf4da3abfc797c0" - dependencies: - lru-cache "^2.6.5" - which "^1.1.1" - cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -5161,12 +5143,6 @@ loader-utils@0.2.x, loader-utils@^0.2.11, loader-utils@^0.2.14, loader-utils@^0. json5 "^0.5.0" object-assign "^4.0.1" -localenv@0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/localenv/-/localenv-0.2.2.tgz#c508f29d3485bdc9341d3ead17f61c5abd1b0bab" - dependencies: - commander "2.5.0" - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -5289,7 +5265,7 @@ lodash._topath@^3.0.0: dependencies: lodash.isarray "^3.0.0" -lodash.assign@^3.0.0, lodash.assign@^3.2.0: +lodash.assign@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa" dependencies: @@ -5560,7 +5536,7 @@ lowercase-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" -lru-cache@2, lru-cache@^2.6.5: +lru-cache@2: version "2.7.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" @@ -8965,7 +8941,7 @@ which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" -which@1, which@^1.0.5, which@^1.1.1, which@^1.2.10, which@^1.2.12, which@^1.2.9: +which@1, which@^1.0.5, which@^1.2.10, which@^1.2.12, which@^1.2.9: version "1.2.14" resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" dependencies: