refactor(structure): Move files around

.travis.yml

@@ -1,16 +1,11 @@
 sudo: false
 language: node_js
-cache:
-  yarn: true
 notifications:
   email: false
 node_js:
-  - '8'
-before_install:
-  - yarn global add codecov
+  - '10'
 scripts:
-  - yarn test -- --coverage --coverage-paths src/**/*.js
-  - codecov
+  - yarn test
   - yarn run build
 after_success:
   - yarn run semantic-release

jest.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  testPathIgnorePatterns: ['<rootDir>/src/.next/', '<rootDir>/node_modules/']
+  testPathIgnorePatterns: ['<rootDir>/.next/', '<rootDir>/node_modules/']
 }

src/next.config.js → next.config.js

@@ -7,7 +7,7 @@ const {PHASE_PRODUCTION_SERVER} =
       : require('next-server/constants')
 
 const config = {
-  publicRuntimeConfig: {
+  env: {
     CACHE_DATA: process.env.CACHE_DATA, // Only used in Development
     MAPBOX_ACCESS_TOKEN: process.env.MAPBOX_ACCESS_TOKEN
   }

now.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "builds": [
-    {"src": "src/next.config.js", "use": "@now/next"}
+    {"src": "next.config.js", "use": "@now/next"}
   ],
   "env": {
     "MAPBOX_ACCESS_TOKEN": "@mapbox-access-token"

package.json

@@ -3,11 +3,11 @@
   "description": "Isochrone & accessibility analysis",
   "main": "src/index.js",
   "scripts": {
-    "build": "next build src",
-    "dev": "node --require dotenv/config node_modules/.bin/next src",
+    "build": "next build",
+    "dev": "node --require dotenv/config node_modules/.bin/next",
     "predev": "yarn",
     "semantic-release": "semantic-release",
-    "start": "next start src",
+    "start": "next start",
     "test": "jest",
     "test-debug": "node --inspect-brk node_modules/.bin/jest --runInBand"
   },
@@ -35,7 +35,7 @@
     "jsolines": "^2.1.1",
     "lodash": "^4.17.10",
     "mapbox-gl": "^0.53.0",
-    "next": "latest",
+    "next": "v8.0.3",
     "next-cookies": "^1.1.2",
     "node-fetch": "^2.3.0",
     "react": "v16.8.3",

src/pages/_app.js → pages/_app.js

@@ -5,8 +5,8 @@ import nextCookies from 'next-cookies'
 import React from 'react'
 import {Provider} from 'react-redux'
 
-import defaultStore from '../../store.json'
-import {getOrCreateStore} from '../with-redux-store'
+import defaultStore from '../store.json'
+import {getOrCreateStore} from '../src/with-redux-store'
 
 const iconLink = 'https://d2f1n6ed3ipuic.cloudfront.net/conveyal-128x128.png'
 

src/pages/index.js → pages/index.js

@@ -1,12 +1,12 @@
 import {connect} from 'react-redux'
 
-import actions from '../actions'
-import Application from '../components/application'
-import message from '../message'
-import * as select from '../selectors'
-import configureTaui from '../services/config'
+import actions from '../src/actions'
+import Application from '../src/components/application'
+import message from '../src/message'
+import * as select from '../src/selectors'
+import configureTaui from '../src/services/config'
 
-import '../style.css'
+import '../src/style.css'
 
 // Set the title
 if (typeof document !== 'undefined') document.title = message('Title')

src/env.js

@@ -1,6 +1,5 @@
-import get from 'lodash/get'
-import getConfig from 'next/config'
-
-const configs = getConfig()
-
-export default get(configs, 'publicRuntimeConfig', {})
+// Options must be explicit
+export default {
+  CACHE_DATA: process.env.CACHE_DATA,
+  MAPBOX_ACCESS_TOKEN: process.env.MAPBOX_ACCESS_TOKEN
+}