Skip to content

Commit b0270f7

Browse files
author
Bojan Zivkovic
committed
Updating Create ESRI React App install script
1 parent 18c38cb commit b0270f7

File tree

2 files changed

+31
-23
lines changed

2 files changed

+31
-23
lines changed

‎build/index.js‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env node
22

3+
34
'use strict';
45

56
var fs = require('fs');
@@ -10,30 +11,33 @@ var bootstrapAppJs3 = __dirname + '/resources/App3.js';
1011
var bootstrapAppJs4 = __dirname + '/resources/App4.js';
1112
var bootstrapAppHtml3 = __dirname + '/resources/index-api-3.html';
1213
var bootstrapAppHtml4 = __dirname + '/resources/index-api-4.html';
13-
var bootstrapAppCss = __dirname + '/resources/App.css';
14-
var greenColor = '\x1b[32m';
15-
var resetColor = '\x1b[0m';
14+
var bootstrapAppCss3 = __dirname + '/resources/App3.css';
15+
var bootstrapAppCss4 = __dirname + '/resources/App4.css';
16+
var colorGreen = '\x1b[32m';
17+
var colorReset = '\x1b[0m';
1618
var currentWorkingDirectory = path.resolve('./');
1719
var bootstrapAppJs;
1820
var bootstrapAppHtml;
21+
var bootstrapAppCss;
1922

20-
program.version('0.1.0').option('-a, --api [number]', 'Add API version', 4).parse(process.argv);
23+
program.version('0.1.0').option('-a, --api [number]', 'Add API version ' + colorGreen + '-v 3' + colorReset + ' or ' + colorGreen + '-v 4' + colorReset + '. Default version of ESRI API is v4', 4).parse(process.argv);
2124

2225
// Input app name from command line
2326
var appName = program.args[0];
2427

2528
if (program.api === '3') {
2629
bootstrapAppJs = bootstrapAppJs3;
2730
bootstrapAppHtml = bootstrapAppHtml3;
31+
bootstrapAppCss = bootstrapAppCss3;
2832
} else {
2933
bootstrapAppJs = bootstrapAppJs4;
3034
bootstrapAppHtml = bootstrapAppHtml4;
35+
bootstrapAppCss = bootstrapAppCss4;
3136
}
3237

3338
if (process.argv.length <= 2) {
34-
console.log('Run' + greenColor + ' create-esri-react-app app_name' + resetColor);
39+
console.log('Run' + colorGreen + ' create-esri-react-app app_name' + colorReset);
3540
} else {
36-
3741
/**
3842
* Move to App.js
3943
*/
@@ -88,20 +92,20 @@ if (process.argv.length <= 2) {
8892
var exec = require('child_process').exec;
8993

9094
// Create react App
91-
console.log('Creating a new ESRI React App in ' + greenColor + currentWorkingDirectory + '/' + appName + resetColor + '.');
95+
console.log('Creating a new ESRI React App in ' + colorGreen + currentWorkingDirectory + '/' + appName + colorReset + '.');
9296
console.log(' - ESRI api v%s', program.api);
9397
var createEsriApp = 'create-react-app ' + appName;
9498
exec(createEsriApp, function (error, stdout, stderr) {
95-
var addModule = 'cd ' + appName + ' && yarn add esri-loader';
99+
var addModule = 'cd ' + appName + ' && npm install esri-loader';
96100
exec(addModule, function (error, stdout, stderr) {
97101
console.log('');
98-
console.log('Success! ESRI React App ' + greenColor + appName + resetColor + ' is created at ' + greenColor + currentWorkingDirectory + resetColor + ' ');
102+
console.log('Success! ESRI React App ' + colorGreen + appName + colorReset + ' is created at ' + colorGreen + currentWorkingDirectory + colorReset + ' ');
99103
console.log('Inside that directory, you can run several commands:');
100104
console.log('');
101105
console.log('We suggest that you begin by typing:');
102106
console.log('');
103-
console.log(' ' + greenColor + 'cd' + resetColor + ' ' + appName);
104-
console.log(' ' + greenColor + 'yarn start' + resetColor);
107+
console.log(' ' + colorGreen + 'cd' + colorReset + ' ' + appName);
108+
console.log(' ' + colorGreen + 'npm start' + colorReset + ' or ' + colorGreen + 'yarn start' + colorReset);
105109
moveAppJS(bootstrapAppJs, appName);
106110
moveAppHTML(bootstrapAppHtml, appName);
107111
moveAppCSS(bootstrapAppCss, appName);

‎src/index.js‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env node
2+
23
'use strict';
34

45
var fs = require('fs');
@@ -9,33 +10,36 @@ var bootstrapAppJs3 = __dirname + '/resources/App3.js';
910
var bootstrapAppJs4 = __dirname + '/resources/App4.js';
1011
var bootstrapAppHtml3 = __dirname + '/resources/index-api-3.html';
1112
var bootstrapAppHtml4 = __dirname + '/resources/index-api-4.html';
12-
var bootstrapAppCss = __dirname + '/resources/App.css';
13-
var greenColor = '\x1b[32m';
14-
var resetColor = '\x1b[0m';
13+
var bootstrapAppCss3 = __dirname + '/resources/App3.css';
14+
var bootstrapAppCss4 = __dirname + '/resources/App4.css';
15+
var colorGreen = '\x1b[32m';
16+
var colorReset = '\x1b[0m';
1517
var currentWorkingDirectory = path.resolve('./');
1618
var bootstrapAppJs;
1719
var bootstrapAppHtml;
20+
var bootstrapAppCss;
1821

1922
program
2023
.version('0.1.0')
21-
.option('-a, --api [number]', 'Add API version', 4)
24+
.option('-a, --api [number]', 'Add API version ' + colorGreen + '-v 3' + colorReset + ' or ' + colorGreen + '-v 4' + colorReset + '. Default version of ESRI API is v4', 4)
2225
.parse(process.argv);
2326

2427
// Input app name from command line
2528
var appName = program.args[0];
2629

27-
if(program.api === '3' ){
30+
if (program.api === '3') {
2831
bootstrapAppJs = bootstrapAppJs3;
2932
bootstrapAppHtml = bootstrapAppHtml3;
33+
bootstrapAppCss = bootstrapAppCss3;
3034
} else {
3135
bootstrapAppJs = bootstrapAppJs4;
3236
bootstrapAppHtml = bootstrapAppHtml4;
37+
bootstrapAppCss = bootstrapAppCss4;
3338
}
3439

3540
if (process.argv.length <= 2) {
36-
console.log('Run' + greenColor + ' create-esri-react-app app_name' + resetColor);
41+
console.log('Run' + colorGreen + ' create-esri-react-app app_name' + colorReset);
3742
} else {
38-
3943
/**
4044
* Move to App.js
4145
*/
@@ -90,20 +94,20 @@ if (process.argv.length <= 2) {
9094
var exec = require('child_process').exec;
9195

9296
// Create react App
93-
console.log('Creating a new ESRI React App in ' + greenColor + currentWorkingDirectory + '/' + appName + resetColor + '.');
97+
console.log('Creating a new ESRI React App in ' + colorGreen + currentWorkingDirectory + '/' + appName + colorReset + '.');
9498
console.log(' - ESRI api v%s', program.api);
9599
var createEsriApp = 'create-react-app ' + appName;
96100
exec(createEsriApp, function (error, stdout, stderr) {
97-
var addModule = 'cd ' + appName + ' && yarn add esri-loader';
101+
var addModule = 'cd ' + appName + ' && npm install esri-loader';
98102
exec(addModule, function (error, stdout, stderr) {
99103
console.log('');
100-
console.log('Success! ESRI React App ' + greenColor + appName + resetColor + ' is created at ' + greenColor + currentWorkingDirectory + resetColor + ' ');
104+
console.log('Success! ESRI React App ' + colorGreen + appName + colorReset + ' is created at ' + colorGreen + currentWorkingDirectory + colorReset + ' ');
101105
console.log('Inside that directory, you can run several commands:');
102106
console.log('');
103107
console.log('We suggest that you begin by typing:');
104108
console.log('');
105-
console.log(' ' + greenColor + 'cd' + resetColor + ' ' + appName);
106-
console.log(' ' + greenColor + 'yarn start' + resetColor);
109+
console.log(' ' + colorGreen + 'cd' + colorReset + ' ' + appName);
110+
console.log(' ' + colorGreen + 'npm start' + colorReset + ' or ' + colorGreen + 'yarn start' + colorReset);
107111
moveAppJS(bootstrapAppJs, appName);
108112
moveAppHTML(bootstrapAppHtml, appName);
109113
moveAppCSS(bootstrapAppCss, appName);

0 commit comments

Comments
 (0)