Skip to content

Commit 070d381

Browse files
committed
🛠 revert name to react-scripts, closes facebook#4
1 parent edcef42 commit 070d381

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

‎packages/react-scripts/scripts/eject.js

+7-10
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ prompt(
6464
files.forEach(function(file) {
6565
console.log('Copying ' + file + ' to ' + appPath);
6666
var content = fs
67-
.readFileSync(path.join(ownPath, file), 'utf8')
68-
// Remove dead code from .js files on eject
69-
.replace(/\/\/ @remove-on-eject-begin([\s\S]*?)\/\/ @remove-on-eject-end/mg, '')
70-
// Remove dead code from .applescript files on eject
71-
.replace(/-- @remove-on-eject-begin([\s\S]*?)-- @remove-on-eject-end/mg, '')
72-
.trim() + '\n';
67+
.readFileSync(path.join(ownPath, file), 'utf8')
68+
// Remove dead code from .js files on eject
69+
.replace(/\/\/ @remove-on-eject-begin([\s\S]*?)\/\/ @remove-on-eject-end/mg, '')
70+
// Remove dead code from .applescript files on eject
71+
.replace(/-- @remove-on-eject-begin([\s\S]*?)-- @remove-on-eject-end/mg, '')
72+
.trim() + '\n';
7373
fs.writeFileSync(path.join(appPath, file), content);
7474
});
7575
console.log();
@@ -94,10 +94,7 @@ prompt(
9494
delete appPackage.scripts['eject'];
9595
Object.keys(appPackage.scripts).forEach(function (key) {
9696
appPackage.scripts[key] = appPackage.scripts[key]
97-
.replace(
98-
new RegExp(ownPackageName + ' (\\w+)', 'g'),
99-
'node scripts/$1.js'
100-
);
97+
.replace(/react-scripts (\w+)/g, 'node scripts/$1.js');
10198
});
10299

103100
// Add Jest config

‎packages/react-scripts/scripts/init.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ module.exports = function(appPath, appName, verbose, originalDirectory) {
2424

2525
// Setup the script rules
2626
appPackage.scripts = {
27-
'start': ownPackageName + ' start',
28-
'build': ownPackageName + ' build',
29-
'test': ownPackageName + ' test --env=jsdom',
30-
'eject': ownPackageName + ' eject'
27+
'start': 'react-scripts start',
28+
'build': 'react-scripts build',
29+
'test': 'react-scripts test --env=jsdom',
30+
'eject': 'react-scripts eject'
3131
};
3232

3333
fs.writeFileSync(
@@ -81,7 +81,7 @@ module.exports = function(appPath, appName, verbose, originalDirectory) {
8181
// backward compatibility with old global-cli's.
8282
var cdpath;
8383
if (originalDirectory &&
84-
path.join(originalDirectory, appName) === appPath) {
84+
path.join(originalDirectory, appName) === appPath) {
8585
cdpath = appName;
8686
} else {
8787
cdpath = appPath;

0 commit comments

Comments
 (0)