🐛 FIX: Eject code removal

Author: Ahmad Awais

packages/cgb-scripts/config/paths.js

@@ -32,5 +32,4 @@ module.exports = {
 	// These properties only exist before ejecting:
 	ownPath: resolveOwn( '.' ),
 };
-
-console.log( resolveApp( '.' ) );
+// @remove-on-eject-end

packages/cgb-scripts/config/webpack.config.dev.js

@@ -93,8 +93,10 @@ module.exports = {
 				use: {
 					loader: 'babel-loader',
 					options: {
+						// @remove-on-eject-begin
 						babelrc: false,
 						presets: [ require.resolve( 'babel-preset-cgb' ) ],
+						// @remove-on-eject-end
 						// This is a feature of `babel-loader` for webpack (not Babel itself).
 						// It enables caching results in ./node_modules/.cache/babel-loader/
 						// directory for faster rebuilds.

packages/cgb-scripts/config/webpack.config.prod.js

@@ -93,8 +93,10 @@ module.exports = {
 				use: {
 					loader: 'babel-loader',
 					options: {
+						// @remove-on-eject-begin
 						babelrc: false,
 						presets: [ require.resolve( 'babel-preset-cgb' ) ],
+						// @remove-on-eject-end
 						// This is a feature of `babel-loader` for webpack (not Babel itself).
 						// It enables caching results in ./node_modules/.cache/babel-loader/
 						// directory for faster rebuilds.

packages/cgb-scripts/scripts/eject.js

@@ -29,10 +29,15 @@ const chalk = require( 'chalk' );
 const paths = require( '../config/paths' );
 const inquirer = require( 'inquirer' );
 const spawnSync = require( 'cross-spawn' ).sync;
+const resolvePkg = require( 'resolve-pkg' );
+const cgbDevUtilsPath = resolvePkg( 'cgb-dev-utils', { cwd: __dirname } );
+const clearConsole = require( cgbDevUtilsPath + '/clearConsole' );
 
 const green = chalk.green;
 const cyan = chalk.cyan;
 
+clearConsole();
+
 function getGitStatus() {
 	try {
 		const stdout = execSync( 'git status --porcelain', {
@@ -53,7 +58,7 @@ inquirer
 	} )
 	.then( answer => {
 		if ( ! answer.shouldEject ) {
-			console.log( cyan( 'Close one! Eject aborted.' ) );
+			console.log( cyan( '\n\nClose one! Eject aborted.\n\n' ) );
 			return;
 		}
 
@@ -171,11 +176,12 @@ inquirer
 			delete appPackage.dependencies[ ownPackageName ];
 		}
 
-		// For some reason optionalDependencies end up in dependencies after install.
+		// Add deps to appPackage.
 		Object.keys( ownPackage.dependencies ).forEach( key => {
-			if ( ownPackage.optionalDependencies[ key ] ) {
-				return;
-			}
+			// // For some reason optionalDependencies end up in dependencies after install.
+			// if ( ownPackage.optionalDependencies[ key ] ) {
+			// 	return;
+			// }
 			console.log( `  Adding ${ cyan( key ) } to dependencies` );
 			appPackage.dependencies[ key ] = ownPackage.dependencies[ key ];
 		} );