Skip to content

Commit 6c8713b

Browse files
Jiansengaearon
Jiansen
authored and
gaearon
committed
tagging dev-only code (@remove-on-publish-begin/end) and pre-eject-only code (@remove-on-eject-begin/end) #257 (#257)
1 parent 2d99415 commit 6c8713b

23 files changed

+203
-68
lines changed

‎config/babel.dev.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @remove-on-eject-begin
12
/**
23
* Copyright (c) 2015-present, Facebook, Inc.
34
* All rights reserved.
@@ -6,6 +7,7 @@
67
* LICENSE file in the root directory of this source tree. An additional grant
78
* of patent rights can be found in the PATENTS file in the same directory.
89
*/
10+
// @remove-on-eject-end
911

1012
var path = require('path');
1113

‎config/babel.prod.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @remove-on-eject-begin
12
/**
23
* Copyright (c) 2015-present, Facebook, Inc.
34
* All rights reserved.
@@ -6,6 +7,7 @@
67
* LICENSE file in the root directory of this source tree. An additional grant
78
* of patent rights can be found in the PATENTS file in the same directory.
89
*/
10+
// @remove-on-eject-end
911

1012
var path = require('path');
1113

‎config/env.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @remove-on-eject-begin
12
/**
23
* Copyright (c) 2015-present, Facebook, Inc.
34
* All rights reserved.
@@ -6,6 +7,7 @@
67
* LICENSE file in the root directory of this source tree. An additional grant
78
* of patent rights can be found in the PATENTS file in the same directory.
89
*/
10+
// @remove-on-eject-end
911

1012
// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
1113
// injected into the application via DefinePlugin in Webpack configuration.

‎config/eslint.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @remove-on-eject-begin
12
/**
23
* Copyright (c) 2015-present, Facebook, Inc.
34
* All rights reserved.
@@ -6,6 +7,7 @@
67
* LICENSE file in the root directory of this source tree. An additional grant
78
* of patent rights can be found in the PATENTS file in the same directory.
89
*/
10+
// @remove-on-eject-end
911

1012
// Inspired by https://github.com/airbnb/javascript but less opinionated.
1113

‎config/jest/CSSStub.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @remove-on-eject-begin
12
/**
23
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
34
*
@@ -7,5 +8,6 @@
78
*
89
* @flow
910
*/
11+
// @remove-on-eject-end
1012

1113
module.exports = {};

‎config/jest/FileStub.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @remove-on-eject-begin
12
/**
23
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
34
*
@@ -7,5 +8,6 @@
78
*
89
* @flow
910
*/
11+
// @remove-on-eject-end
1012

1113
module.exports = "test-file-stub";

‎config/jest/transform.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
// @remove-on-eject-begin
12
/**
23
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
34
*
45
* This source code is licensed under the BSD-style license found in the
56
* LICENSE file in the root directory of this source tree. An additional grant
67
* of patent rights can be found in the PATENTS file in the same directory.
78
*/
9+
// @remove-on-eject-end
810

911
const babelDev = require('../babel.dev');
1012
const babelJest = require('babel-jest');

‎config/paths.js‎

Lines changed: 36 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @remove-on-eject-begin
12
/**
23
* Copyright (c) 2015-present, Facebook, Inc.
34
* All rights reserved.
@@ -6,60 +7,47 @@
67
* LICENSE file in the root directory of this source tree. An additional grant
78
* of patent rights can be found in the PATENTS file in the same directory.
89
*/
9-
10-
// TODO: we can split this file into several files (pre-eject, post-eject, test)
11-
// and use those instead. This way we don't need to branch here.
10+
// @remove-on-eject-end
1211

1312
var path = require('path');
1413

15-
// True after ejecting, false when used as a dependency
16-
var isEjected = (
17-
path.resolve(path.join(__dirname, '..')) ===
18-
path.resolve(process.cwd())
19-
);
14+
function resolveApp(relativePath) {
15+
return path.resolve(relativePath);
16+
}
2017

21-
// Are we developing create-react-app locally?
22-
var isInCreateReactAppSource = (
23-
process.argv.some(arg => arg.indexOf('--debug-template') > -1)
24-
);
18+
// config after eject: we're in ./config/
19+
module.exports = {
20+
appBuild: resolveApp('build'),
21+
appHtml: resolveApp('index.html'),
22+
appPackageJson: resolveApp('package.json'),
23+
appSrc: resolveApp('src'),
24+
appNodeModules: resolveApp('node_modules'),
25+
ownNodeModules: resolveApp('node_modules')
26+
};
2527

28+
// @remove-on-eject-begin
2629
function resolveOwn(relativePath) {
2730
return path.resolve(__dirname, relativePath);
2831
}
32+
// config before eject: we're in ./node_modules/react-scripts/config/
33+
module.exports = {
34+
appBuild: resolveApp('build'),
35+
appHtml: resolveApp('index.html'),
36+
appPackageJson: resolveApp('package.json'),
37+
appSrc: resolveApp('src'),
38+
appNodeModules: resolveApp('node_modules'),
39+
// this is empty with npm3 but node resolution searches higher anyway:
40+
ownNodeModules: resolveOwn('../node_modules')
41+
};
42+
// @remove-on-eject-end
2943

30-
function resolveApp(relativePath) {
31-
return path.resolve(relativePath);
32-
}
33-
34-
if (isInCreateReactAppSource) {
35-
// create-react-app development: we're in ./config/
36-
module.exports = {
37-
appBuild: resolveOwn('../build'),
38-
appHtml: resolveOwn('../template/index.html'),
39-
appPackageJson: resolveOwn('../package.json'),
40-
appSrc: resolveOwn('../template/src'),
41-
appNodeModules: resolveOwn('../node_modules'),
42-
ownNodeModules: resolveOwn('../node_modules')
43-
};
44-
} else if (!isEjected) {
45-
// before eject: we're in ./node_modules/react-scripts/config/
46-
module.exports = {
47-
appBuild: resolveApp('build'),
48-
appHtml: resolveApp('index.html'),
49-
appPackageJson: resolveApp('package.json'),
50-
appSrc: resolveApp('src'),
51-
appNodeModules: resolveApp('node_modules'),
52-
// this is empty with npm3 but node resolution searches higher anyway:
53-
ownNodeModules: resolveOwn('../node_modules')
54-
};
55-
} else {
56-
// after eject: we're in ./config/
57-
module.exports = {
58-
appBuild: resolveApp('build'),
59-
appHtml: resolveApp('index.html'),
60-
appPackageJson: resolveApp('package.json'),
61-
appSrc: resolveApp('src'),
62-
appNodeModules: resolveApp('node_modules'),
63-
ownNodeModules: resolveApp('node_modules')
64-
};
65-
}
44+
// @remove-on-publish-begin
45+
module.exports = {
46+
appBuild: resolveOwn('../build'),
47+
appHtml: resolveOwn('../template/index.html'),
48+
appPackageJson: resolveOwn('../package.json'),
49+
appSrc: resolveOwn('../template/src'),
50+
appNodeModules: resolveOwn('../node_modules'),
51+
ownNodeModules: resolveOwn('../node_modules')
52+
};
53+
// @remove-on-publish-end

‎config/polyfills.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
// @remove-on-eject-begin
2+
/**
3+
* Copyright (c) 2015-present, Facebook, Inc.
4+
* All rights reserved.
5+
*
6+
* This source code is licensed under the BSD-style license found in the
7+
* LICENSE file in the root directory of this source tree. An additional grant
8+
* of patent rights can be found in the PATENTS file in the same directory.
9+
*/
10+
// @remove-on-eject-end
11+
112
if (typeof Promise === 'undefined') {
213
// Rejection tracking prevents a common issue where React gets into an
314
// inconsistent state due to an error, but it gets swallowed by a Promise,

‎config/webpack.config.dev.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @remove-on-eject-begin
12
/**
23
* Copyright (c) 2015-present, Facebook, Inc.
34
* All rights reserved.
@@ -6,6 +7,7 @@
67
* LICENSE file in the root directory of this source tree. An additional grant
78
* of patent rights can be found in the PATENTS file in the same directory.
89
*/
10+
// @remove-on-eject-end
911

1012
var path = require('path');
1113
var autoprefixer = require('autoprefixer');

0 commit comments

Comments
 (0)