Skip to content

Commit 42e27cb

Browse files
author
David Silva
committed
Ran npm run eject, added sass to the config, and sass files
1 parent a0a50a7 commit 42e27cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+9645
-1656
lines changed

.eslintrc

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,6 @@
1111
"sinon": true,
1212
"__DEV__": true
1313
},
14-
"ecmaFeatures": {
15-
"arrowFunctions": true,
16-
"blockBindings": true,
17-
"classes": true,
18-
"defaultParams": true,
19-
"destructuring": true,
20-
"forOf": true,
21-
"generators": false,
22-
"modules": true,
23-
"objectLiteralComputedProperties": true,
24-
"objectLiteralDuplicateProperties": false,
25-
"objectLiteralShorthandMethods": true,
26-
"objectLiteralShorthandProperties": true,
27-
"spread": true,
28-
"superInFunctions": true,
29-
"templateStrings": true,
30-
"jsx": true
31-
},
3214
"rules": {
3315
"no-var": 2, // http://eslint.org/docs/rules/no-var
3416
"prefer-const": 2, // http://eslint.org/docs/rules/prefer-const

config/env.js

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
'use strict';
2+
3+
const fs = require('fs');
4+
const path = require('path');
5+
const paths = require('./paths');
6+
7+
// Make sure that including paths.js after env.js will read .env variables.
8+
delete require.cache[require.resolve('./paths')];
9+
10+
const NODE_ENV = process.env.NODE_ENV;
11+
if (!NODE_ENV) {
12+
throw new Error(
13+
'The NODE_ENV environment variable is required but was not specified.'
14+
);
15+
}
16+
17+
// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
18+
const dotenvFiles = [
19+
`${paths.dotenv}.${NODE_ENV}.local`,
20+
`${paths.dotenv}.${NODE_ENV}`,
21+
// Don't include `.env.local` for `test` environment
22+
// since normally you expect tests to produce the same
23+
// results for everyone
24+
NODE_ENV !== 'test' && `${paths.dotenv}.local`,
25+
paths.dotenv,
26+
].filter(Boolean);
27+
28+
// Load environment variables from .env* files. Suppress warnings using silent
29+
// if this file is missing. dotenv will never modify any environment variables
30+
// that have already been set.
31+
// https://github.com/motdotla/dotenv
32+
dotenvFiles.forEach(dotenvFile => {
33+
if (fs.existsSync(dotenvFile)) {
34+
require('dotenv').config({
35+
path: dotenvFile,
36+
});
37+
}
38+
});
39+
40+
// We support resolving modules according to `NODE_PATH`.
41+
// This lets you use absolute paths in imports inside large monorepos:
42+
// https://github.com/facebookincubator/create-react-app/issues/253.
43+
// It works similar to `NODE_PATH` in Node itself:
44+
// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
45+
// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
46+
// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
47+
// https://github.com/facebookincubator/create-react-app/issues/1023#issuecomment-265344421
48+
// We also resolve them to make sure all tools using them work consistently.
49+
const appDirectory = fs.realpathSync(process.cwd());
50+
process.env.NODE_PATH = (process.env.NODE_PATH || '')
51+
.split(path.delimiter)
52+
.filter(folder => folder && !path.isAbsolute(folder))
53+
.map(folder => path.resolve(appDirectory, folder))
54+
.join(path.delimiter);
55+
56+
// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
57+
// injected into the application via DefinePlugin in Webpack configuration.
58+
const REACT_APP = /^REACT_APP_/i;
59+
60+
function getClientEnvironment(publicUrl) {
61+
const raw = Object.keys(process.env)
62+
.filter(key => REACT_APP.test(key))
63+
.reduce(
64+
(env, key) => {
65+
env[key] = process.env[key];
66+
return env;
67+
},
68+
{
69+
// Useful for determining whether we’re running in production mode.
70+
// Most importantly, it switches React into the correct mode.
71+
NODE_ENV: process.env.NODE_ENV || 'development',
72+
// Useful for resolving the correct path to static assets in `public`.
73+
// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
74+
// This should only be used as an escape hatch. Normally you would put
75+
// images into the `src` and `import` them in code to get their paths.
76+
PUBLIC_URL: publicUrl,
77+
}
78+
);
79+
// Stringify all values so we can feed into Webpack DefinePlugin
80+
const stringified = {
81+
'process.env': Object.keys(raw).reduce((env, key) => {
82+
env[key] = JSON.stringify(raw[key]);
83+
return env;
84+
}, {}),
85+
};
86+
87+
return { raw, stringified };
88+
}
89+
90+
module.exports = getClientEnvironment;

config/jest/cssTransform.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
// This is a custom Jest transformer turning style imports into empty objects.
4+
// http://facebook.github.io/jest/docs/tutorial-webpack.html
5+
6+
module.exports = {
7+
process() {
8+
return 'module.exports = {};';
9+
},
10+
getCacheKey() {
11+
// The output is always the same.
12+
return 'cssTransform';
13+
},
14+
};

config/jest/fileTransform.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
'use strict';
2+
3+
const path = require('path');
4+
5+
// This is a custom Jest transformer turning file imports into filenames.
6+
// http://facebook.github.io/jest/docs/tutorial-webpack.html
7+
8+
module.exports = {
9+
process(src, filename) {
10+
return `module.exports = ${JSON.stringify(path.basename(filename))};`;
11+
},
12+
};

config/paths.js

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
'use strict';
2+
3+
const path = require('path');
4+
const fs = require('fs');
5+
const url = require('url');
6+
7+
// Make sure any symlinks in the project folder are resolved:
8+
// https://github.com/facebookincubator/create-react-app/issues/637
9+
const appDirectory = fs.realpathSync(process.cwd());
10+
const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
11+
12+
const envPublicUrl = process.env.PUBLIC_URL;
13+
14+
function ensureSlash(_path, needsSlash) {
15+
const hasSlash = _path.endsWith('/');
16+
if (hasSlash && !needsSlash) {
17+
return _path.substr(_path, _path.length - 1);
18+
} else if (!hasSlash && needsSlash) {
19+
return `${_path}/`;
20+
}
21+
return _path;
22+
}
23+
24+
const getPublicUrl = appPackageJson =>
25+
envPublicUrl || require(appPackageJson).homepage;
26+
27+
// We use `PUBLIC_URL` environment variable or "homepage" field to infer
28+
// "public path" at which the app is served.
29+
// Webpack needs to know it to put the right <script> hrefs into HTML even in
30+
// single-page apps that may serve index.html for nested URLs like /todos/42.
31+
// We can't use a relative path in HTML because we don't want to load something
32+
// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
33+
function getServedPath(appPackageJson) {
34+
const publicUrl = getPublicUrl(appPackageJson);
35+
const servedUrl =
36+
envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
37+
return ensureSlash(servedUrl, true);
38+
}
39+
40+
// config after eject: we're in ./config/
41+
module.exports = {
42+
dotenv: resolveApp('.env'),
43+
appBuild: resolveApp('build'),
44+
appPublic: resolveApp('public'),
45+
appHtml: resolveApp('public/index.html'),
46+
appIndexJs: resolveApp('src/index.js'),
47+
appPackageJson: resolveApp('package.json'),
48+
appSrc: resolveApp('src'),
49+
yarnLockFile: resolveApp('yarn.lock'),
50+
testsSetup: resolveApp('src/setupTests.js'),
51+
appNodeModules: resolveApp('node_modules'),
52+
publicUrl: getPublicUrl(resolveApp('package.json')),
53+
servedPath: getServedPath(resolveApp('package.json')),
54+
};

config/polyfills.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
'use strict';
2+
3+
if (typeof Promise === 'undefined') {
4+
// Rejection tracking prevents a common issue where React gets into an
5+
// inconsistent state due to an error, but it gets swallowed by a Promise,
6+
// and the user has no idea what causes React's erratic future behavior.
7+
require('promise/lib/rejection-tracking').enable();
8+
window.Promise = require('promise/lib/es6-extensions.js');
9+
}
10+
11+
// fetch() polyfill for making API calls.
12+
require('whatwg-fetch');
13+
14+
// Object.assign() is commonly used with React.
15+
// It will use the native implementation if it's present and isn't buggy.
16+
Object.assign = require('object-assign');
17+
18+
// In tests, polyfill requestAnimationFrame since jsdom doesn't provide it yet.
19+
// We don't polyfill it in the browser--this is user's responsibility.
20+
if (process.env.NODE_ENV === 'test') {
21+
require('raf').polyfill(global);
22+
}
Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
1-
'use strict';
2-
31
const path = require('path');
42

5-
module.exports = (config) => {
6-
config.module.loaders.push(
7-
{
8-
enforce: 'pre',
9-
test: /\.js?$/,
10-
exclude: /node_modules/,
11-
loader: 'eslint-loader',
12-
options: {
13-
configFile: '.eslintrc',
14-
failOnWarning: false,
15-
failOnError: false
16-
}
17-
},
18-
{
3+
module.exports = {
4+
module: {
5+
rules: [
6+
{
197
test: /\.scss/,
208
use: [
219
{
@@ -31,18 +19,14 @@ module.exports = (config) => {
3119
{
3220
loader: 'sass-loader',
3321
options: {
34-
data: `@import "${path.join(__dirname, 'app/styles/_mixins.scss')}";`
22+
data: `@import "${path.join(__dirname, '../src/styles/_variables.scss')}";`
3523
}
3624
}
3725
]
3826
},
39-
{
40-
test: /\.css$/,
41-
use: [ 'style-loader', 'css-loader' ]
42-
},
4327
{ test: /\.woff(2)?(\?[a-z0-9#=&.]+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
4428
{ test: /\.(ttf|eot|svg)(\?[a-z0-9#=&.]+)?$/, loader: 'file-loader?name=assets/fonts/[name].[ext]' },
4529
{ test: /\.(gif|jpg|png)(\?[a-z0-9#=&.]+)?$/, loader: 'file-loader?name=assets/images/[name].[ext]' }
46-
);
47-
return config;
30+
],
31+
}
4832
};

0 commit comments

Comments
 (0)