Skip to content

Commit 0aa2bd3

Browse files
ahmadawaisahmadawais
committed
👌 IMPROVE: Support
1 parent a5ef6cb commit 0aa2bd3

3 files changed

Lines changed: 24 additions & 73 deletions

File tree

‎packages/cgb-scripts/scripts/build.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ async function build( webpackConfig ) {
111111
console.log( `\n ${ chalk.dim( 'Let\'s build and compile the files...' ) }` );
112112
console.log( '\n✅ ', chalk.black.bgGreen( ' Built successfully! \n' ) );
113113

114-
console.log( `${ chalk.dim( '\n Support Awais via VSCode Power User at https://VSCode.pro →' ) }` );
115-
116114
console.log(
117115
'\n\n',
118116
'File sizes after gzip:',
@@ -129,10 +127,11 @@ async function build( webpackConfig ) {
129127
getFileSize( fileStyleCSS ),
130128
`${ chalk.dim( '— ./dist/' ) }`,
131129
`${ chalk.green( 'blocks.style.build.css' ) }`,
132-
133130
'\n\n'
134131
);
135132

133+
console.log( '\n👌 ', chalk.black.bgGreen( ' Support Awais via VSCode Power User at https://VSCode.pro → \n' ) );
134+
136135
return true;
137136
} );
138137
}

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

Lines changed: 19 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,22 @@ inquirer
5454
} )
5555
.then( answer => {
5656
if ( ! answer.shouldEject ) {
57-
console.log(
58-
'\n\n— ' + chalk.black.bgWhite( ' Close one! Eject aborted. ' ),
59-
'\n\n'
60-
);
57+
console.log( '\n\n— ' + chalk.black.bgWhite( ' Close one! Eject aborted. ' ), '\n\n' );
6158
return;
6259
}
6360

6461
const gitStatus = getGitStatus();
6562
if ( gitStatus ) {
6663
console.error(
6764
'\n\n' +
68-
chalk.black.bgRed(
69-
' This git repository has untracked files or uncommitted changes: '
70-
) +
65+
chalk.black.bgRed( ' This git repository has untracked files or uncommitted changes: ' ) +
7166
'\n\n' +
7267
gitStatus
7368
.split( '\n' )
7469
.map( line => line.match( / .*/g )[ 0 ].trim() )
7570
.join( '\n' ) +
7671
'\n\n' +
77-
chalk.black.bgRed(
78-
' Remove untracked files, stash or commit any changes, and try again. '
79-
),
72+
chalk.black.bgRed( ' Remove untracked files, stash or commit any changes, and try again. ' ),
8073
'\n\n'
8174
);
8275
process.exit( 1 );
@@ -92,9 +85,7 @@ inquirer
9285
if ( fs.existsSync( path.join( appPath, file ) ) ) {
9386
console.error(
9487
'\n\n' +
95-
`\`${ chalk.red(
96-
file
97-
) }\` already exists in your plugin's folder. We cannot ` +
88+
`\`${ chalk.red( file ) }\` already exists in your plugin's folder. We cannot ` +
9889
'continue as you would lose all the changes in that file or directory. ' +
9990
'Please move or delete it (maybe make a copy for backup) and run this ' +
10091
'command again.'
@@ -145,19 +136,11 @@ inquirer
145136
content =
146137
content
147138
// Remove dead code from .js files on eject.
148-
.replace(
149-
/\/\/ @remove-on-eject-begin([\s\S]*?)\/\/ @remove-on-eject-end/gm,
150-
''
151-
)
139+
.replace( /\/\/ @remove-on-eject-begin([\s\S]*?)\/\/ @remove-on-eject-end/gm, '' )
152140
// Remove dead code from .applescript files on eject.
153-
.replace(
154-
/-- @remove-on-eject-begin([\s\S]*?)-- @remove-on-eject-end/gm,
155-
''
156-
)
141+
.replace( /-- @remove-on-eject-begin([\s\S]*?)-- @remove-on-eject-end/gm, '' )
157142
.trim() + '\n';
158-
console.log(
159-
` ➕ Adding ${ green( file.replace( ownPath, '' ) ) } to your plugin.`
160-
);
143+
console.log( ` ➕ Adding ${ green( file.replace( ownPath, '' ) ) } to your plugin.` );
161144
fs.writeFileSync( file.replace( ownPath, appPath ), content );
162145
} );
163146

@@ -167,11 +150,7 @@ inquirer
167150
// Assume a file called package.json file in current folder.
168151
const appPackage = require( path.join( appPath, 'package.json' ) );
169152

170-
console.log(
171-
'\n 👉 ',
172-
`${ chalk.black.bgYellow( ' Updating the dependencies... ' ) }`,
173-
'\n'
174-
);
153+
console.log( '\n 👉 ', `${ chalk.black.bgYellow( ' Updating the dependencies... ' ) }`, '\n' );
175154

176155
// Name: cgb-scripts.
177156
const ownPackageName = ownPackage.name;
@@ -180,9 +159,7 @@ inquirer
180159
if ( appPackage.devDependencies ) {
181160
// We used to put cgb-scripts in devDependencies.
182161
if ( appPackage.devDependencies[ ownPackageName ] ) {
183-
console.log(
184-
` ➖ Removing ${ cyan( ownPackageName ) } from devDependencies.`
185-
);
162+
console.log( ` ➖ Removing ${ cyan( ownPackageName ) } from devDependencies.` );
186163
delete appPackage.devDependencies[ ownPackageName ];
187164
}
188165
}
@@ -216,11 +193,7 @@ inquirer
216193
console.log( ` ♻ ${ green( 'Sorting... ' ) }` );
217194

218195
// Update the scripts.
219-
console.log(
220-
'\n 👉 ',
221-
`${ chalk.black.bgYellow( ' Updating the scripts... ' ) }`,
222-
'\n'
223-
);
196+
console.log( '\n 👉 ', `${ chalk.black.bgYellow( ' Updating the scripts... ' ) }`, '\n' );
224197

225198
// Del the eject script.
226199
delete appPackage.scripts.eject;
@@ -232,23 +205,12 @@ inquirer
232205
if ( ! regex.test( appPackage.scripts[ key ] ) ) {
233206
return;
234207
}
235-
appPackage.scripts[ key ] = appPackage.scripts[ key ].replace(
236-
regex,
237-
'node scripts/$1.js'
238-
);
239-
console.log(
240-
` ♻ Replacing ${ cyan( `"${ binKey } ${ key }"` ) } with ${ green(
241-
`"node scripts/${ key }.js"`
242-
) }`
243-
);
208+
appPackage.scripts[ key ] = appPackage.scripts[ key ].replace( regex, 'node scripts/$1.js' );
209+
console.log( ` ♻ Replacing ${ cyan( `"${ binKey } ${ key }"` ) } with ${ green( `"node scripts/${ key }.js"` ) }` );
244210
} );
245211
} );
246212

247-
console.log(
248-
'\n 👉 ',
249-
`${ chalk.black.bgYellow( ' Configuring package.json... ' ) }`,
250-
'\n'
251-
);
213+
console.log( '\n 👉 ', `${ chalk.black.bgYellow( ' Configuring package.json... ' ) }`, '\n' );
252214

253215
// Add Babel config.
254216
console.log( ` ➕ Adding ${ green( 'Babel' ) } preset.` );
@@ -300,10 +262,7 @@ inquirer
300262
// // Add ESlint config — already there.
301263
// console.log( ` Adding ${ cyan( 'ESLint' ) } configuration` );
302264

303-
fs.writeFileSync(
304-
path.join( appPath, 'package.json' ),
305-
JSON.stringify( appPackage, null, 2 ) + '\n'
306-
);
265+
fs.writeFileSync( path.join( appPath, 'package.json' ), JSON.stringify( appPackage, null, 2 ) + '\n' );
307266

308267
// "Don't destroy what isn't ours".
309268
if ( ownPath.indexOf( appPath ) === 0 ) {
@@ -335,23 +294,15 @@ inquirer
335294
// console.log(cyan('Running yarn...'));
336295
// spawnSync('yarnpkg', [], { stdio: 'inherit' });
337296
} else {
338-
console.log(
339-
'\n\n 👉 ',
340-
`${ chalk.black.bgYellow( ' Running npm install... ' ) }`,
341-
'\n'
342-
);
297+
console.log( '\n\n 👉 ', `${ chalk.black.bgYellow( ' Running npm install... ' ) }`, '\n' );
343298
spawnSync( 'npm', [ 'install', '--loglevel', 'error' ], {
344299
stdio: 'inherit',
345300
} );
346301
}
347-
console.log(
348-
'\n\n✅ ',
349-
chalk.black.bgGreen( ' Ejected successfully! ' ),
350-
'\n'
351-
);
302+
console.log( '\n\n✅ ', chalk.black.bgGreen( ' Ejected successfully! ' ), '\n' );
352303

353-
console.log(
354-
green( ' Kindly, consider sharing why you ejected in this survey:\n' )
355-
);
304+
console.log( green( ' Kindly, consider sharing why you ejected in this survey:\n' ) );
356305
console.log( green( ' → https://goo.gl/forms/T901kvHr1kNsJGaJ3 \n' ) );
306+
307+
console.log( '\n👌 ', chalk.black.bgGreen( ' Support Awais via VSCode Power User at https://VSCode.pro → \n' ) );
357308
} );

‎packages/cgb-scripts/scripts/start.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@ async function build( webpackConfig ) {
113113
chalk.white( 'run build\n' )
114114
);
115115
return spinner.start(
116-
`${ chalk.dim( 'Watching for changes... (Press CTRL + C to stop).' ) }`,
117-
`${ chalk.dim( '\n Support Awais via VSCode Power User at https://VSCode.pro →' ) }`
116+
`${ chalk.dim(
117+
'Watching for changes... (Press CTRL + C to stop). \n\n 👌 Support Awais via VSCode Power User at https://VSCode.pro →'
118+
) }`
118119
);
119120
} );
120121
}

0 commit comments

Comments
 (0)