Moved back {src/pages => pages} and {src/* => lib/*} due to vercel/next.js#4315

Author: amercier

.babelrc.js

@@ -1,4 +1,17 @@
-const env = require('./src/env.config.js');
+const AUTO_ENV_VARS = /^REACT_APP_/i;
+
+/**
+ * Extracts all environment variables starting by REACT_APP_.
+ *
+ * @type {Object} An object sub-set of process.env containing only REACT_APP_ variables.
+ */
+const env = Object.entries(process.env).reduce(
+  (exports, [key, value]) =>
+    AUTO_ENV_VARS.test(key)
+      ? { ...exports, [`process.env.${key}`]: value }
+      : exports,
+  {},
+);
 
 // TODO Find a way to move this back to package.json
 module.exports = {

.travis.yml

@@ -18,8 +18,9 @@ before_deploy:
 deploy:
   provider: script
   script: >
-    npx now -t $NOW_TOKEN && npx now alias $CNAME -t $NOW_TOKEN;
-    npx now rm gilded-rose-visitor --safe --yes -t $NOW_TOKEN || echo "Failed to clean aliases, aborting." >& 2
+    npx now -t $NOW_TOKEN
+    && npx now -t $NOW_TOKEN alias $CNAME
+    && (npx now -t $NOW_TOKEN rm gilded-rose-visitor --safe --yes || echo "Failed to clean aliases, aborting." >& 2)
   skip_cleanup: true
   on:
     branch: master

src/actions/item.js lib/actions/item.js

@@ -35,12 +35,12 @@
     "redux-mock-store": "^1.5.3"
   },
   "scripts": {
-    "dev": "next src",
-    "build": "next build src",
-    "start": "next start src",
+    "dev": "next",
+    "build": "next build",
+    "start": "next start",
     "lint": "run-p lint:*",
     "lint:prettier": "prettier --list-different '**/*'",
-    "lint:eslint": "eslint --ignore-path .gitignore --ignore-pattern src/serviceWorker.js --ext .js,.jsx .",
+    "lint:eslint": "eslint --ignore-path .gitignore --ext .js,.jsx .",
     "test": "jest"
   },
   "prettier": {
@@ -81,6 +81,6 @@
     "snapshotSerializers": [
       "enzyme-to-json/serializer"
     ],
-    "setupTestFrameworkScriptFile": "<rootDir>/src/jest.config.js"
+    "setupTestFrameworkScriptFile": "<rootDir>/setup-tests.js"
   }
 }

src/actions/item.spec.js lib/actions/item.spec.js

@@ -3,7 +3,7 @@ import App, { Container } from 'next/app';
 import { Provider } from 'react-redux';
 import withRedux from 'next-redux-wrapper';
 import withReduxSaga from 'next-redux-saga';
-import makeStore from '../store';
+import makeStore from '../lib/store';
 
 /**
  * Redux-connected app, using next-redux-wrapper.

src/constants/actionTypes.js lib/constants/actionTypes.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { string, number, arrayOf, shape } from 'prop-types';
 import { connect } from 'react-redux';
-import { doStartPollingItems, doFetchItems } from '../actions/item';
+import { doStartPollingItems, doFetchItems } from '../lib/actions/item';
 
 /**
  * Home page.

src/constants/api.js lib/constants/api.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import configureStore from 'redux-mock-store';
 import { mount, shallow } from 'enzyme';
-import { doStartPollingItems, doFetchItems } from '../actions/item';
+import { doStartPollingItems, doFetchItems } from '../lib/actions/item';
 import ConnectedIndex, { Index } from '.';
 
 const itemsStub = {