Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix dependency cycle for .env #2241

Closed
wants to merge 2 commits into from
Closed

Fix dependency cycle for .env #2241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6523aaa
Fix dependency cycle
Timer May 19, 2017
2a63f30
Add a note
Timer May 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions packages/react-scripts/config/env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'use strict';

const fs = require('fs');
const paths = require('./paths');
const path = require('path');

const NODE_ENV = process.env.NODE_ENV;
if (!NODE_ENV) {
Expand All @@ -20,12 +20,37 @@ if (!NODE_ENV) {
);
}

// Make sure any symlinks in the project folder are resolved:
// https://github.com/facebookincubator/create-react-app/issues/637
const appDirectory = fs.realpathSync(process.cwd());
const resolveApp = relativePath => path.resolve(appDirectory, relativePath);

let dotenvPath = resolveApp('.env');

// @remove-on-eject-begin
// NOTE: Keep this in sync with paths.js
const resolveOwn = relativePath => path.resolve(__dirname, '..', relativePath);

const ownPackageJson = require('../package.json');
const reactScriptsPath = resolveApp(`node_modules/${ownPackageJson.name}`);
const reactScriptsLinked = fs.existsSync(reactScriptsPath) &&
fs.lstatSync(reactScriptsPath).isSymbolicLink();

// config before publish: we're in ./packages/react-scripts/config/
if (
!reactScriptsLinked &&
__dirname.indexOf(path.join('packages', 'react-scripts', 'config')) !== -1
) {
dotenvPath = resolveOwn('template/.env');
}
// @remove-on-eject-end

// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
var dotenvFiles = [
`${paths.dotenv}.${NODE_ENV}.local`,
`${paths.dotenv}.${NODE_ENV}`,
`${paths.dotenv}.local`,
paths.dotenv,
`${dotenvPath}.${NODE_ENV}.local`,
`${dotenvPath}.${NODE_ENV}`,
`${dotenvPath}.local`,
dotenvPath,
];
// Load environment variables from .env* files. Suppress warnings using silent
// if this file is missing. dotenv will never modify any environment variables
Expand Down