create-three-blocks-starter 0.0.8 → 0.0.9

package/bin/index.js

@@ -20,13 +20,17 @@ const LOGIN_CLI = 'three-blocks-login'; // public login CLI
 const LOGIN_SPEC = `${LOGIN_CLI}@latest`; // force-fresh npx install
 const SCOPE = '@three-blocks';
 
-const BLOCKED_NPM_ENV_KEYS = new Set( [
+const RAW_BLOCKED_NPM_ENV_KEYS = [
 	'npm_config__three_blocks_registry',
 	'npm_config_verify_deps_before_run',
 	'npm_config_global_bin_dir',
 	'npm_config__jsr_registry',
 	'npm_config_node_linker',
-].map( ( key ) => key.replace( /-/g, '_' ).toLowerCase() ) );
+];
+const BLOCKED_NPM_ENV_KEYS = new Set( RAW_BLOCKED_NPM_ENV_KEYS.map( ( key ) => key.replace( /-/g, '_' ).toLowerCase() ) );
+const LOGIN_HELPER_RELATIVE_PATH = path.join( 'scripts', 'three-blocks-login.cjs' );
+const LOGIN_HELPER_POSIX_PATH = LOGIN_HELPER_RELATIVE_PATH.split( path.sep ).join( '/' );
+const LOGIN_HELPER_COMMAND = `node ./${LOGIN_HELPER_POSIX_PATH}`;
 
 let DEBUG = /^1|true|yes$/i.test( String( process.env.THREE_BLOCKS_DEBUG || '' ).trim() );
 
@@ -184,6 +188,67 @@ const stripAuthTokens = ( npmrcPath, hostPatterns = [] ) => {
 
 };
 
+const buildLoginHelperContent = () => `#!/usr/bin/env node
+'use strict';
+
+const { spawnSync } = require('node:child_process');
+
+const RAW_BLOCKED_KEYS = ${JSON.stringify( RAW_BLOCKED_NPM_ENV_KEYS, null, 2 )};
+const BLOCKED_KEYS = new Set(
+	RAW_BLOCKED_KEYS.map( ( key ) => key.replace( /-/g, '_' ).toLowerCase() )
+);
+
+const normalize = ( key ) => key.replace( /-/g, '_' ).toLowerCase();
+
+const scrubEnv = ( source ) => {
+
+	const next = { ...source };
+	for ( const key of Object.keys( next ) ) {
+
+		if ( BLOCKED_KEYS.has( normalize( key ) ) ) {
+
+			delete next[ key ];
+
+		}
+
+	}
+
+	return next;
+
+};
+
+const shouldSkip = /^1|true|yes$/i.test( String( process.env.THREE_BLOCKS_LOGIN_SKIP || '' ) );
+if ( shouldSkip ) {
+
+	process.exit( 0 );
+
+}
+
+const env = scrubEnv( process.env );
+const cmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+const args = [ '-y', 'three-blocks-login@latest', ...process.argv.slice( 2 ) ];
+const result = spawnSync( cmd, args, { stdio: 'inherit', env } );
+
+if ( result.error ) {
+
+	console.error( result.error.message || result.error );
+	process.exit( 1 );
+
+}
+
+process.exit( result.status ?? 0 );
+`;
+
+const ensureLoginHelperScript = async ( targetDir ) => {
+
+	const helperPath = path.join( targetDir, LOGIN_HELPER_RELATIVE_PATH );
+	const helperDir = path.dirname( helperPath );
+	await fsp.mkdir( helperDir, { recursive: true } );
+	await fsp.writeFile( helperPath, buildLoginHelperContent(), { mode: 0o755 } );
+	return helperPath;
+
+};
+
 const die = ( m ) => {
 
 	throw new CliError( m );
@@ -766,40 +831,40 @@ async function main() {
 
 	}
 
-		// Extract registry URL from temp .npmrc so we can pass it explicitly to npm create
-		let registryUrl = '';
-		const tempAuthLines = [];
-		const tempAuthHosts = new Set();
-		try {
-
-			const txt = fs.readFileSync( tmpNpmrc, 'utf8' );
-			const lines = txt.split( /\r?\n/ );
-			for ( const rawLine of lines ) {
+	// Extract registry URL from temp .npmrc so we can pass it explicitly to npm create
+	let registryUrl = '';
+	const tempAuthLines = [];
+	const tempAuthHosts = new Set();
+	try {
 
-				const line = rawLine.replace( /\r/g, '' );
-				if ( ! line ) continue;
-				if ( ! registryUrl ) {
+		const txt = fs.readFileSync( tmpNpmrc, 'utf8' );
+		const lines = txt.split( /\r?\n/ );
+		for ( const rawLine of lines ) {
 
-					const m = line.match( /^@[^:]+:registry=(.+)$/ );
-					if ( m && m[ 1 ] ) registryUrl = m[ 1 ].trim();
+			const line = rawLine.replace( /\r/g, '' );
+			if ( ! line ) continue;
+			if ( ! registryUrl ) {
 
-				}
+				const m = line.match( /^@[^:]+:registry=(.+)$/ );
+				if ( m && m[ 1 ] ) registryUrl = m[ 1 ].trim();
 
-				const authMatch = line.match( /^\/\/([^:]+):_authToken=.+$/ );
-				if ( authMatch && authMatch[ 1 ] ) {
+			}
 
-					tempAuthLines.push( line );
-					tempAuthHosts.add( authMatch[ 1 ] );
+			const authMatch = line.match( /^\/\/([^:]+):_authToken=.+$/ );
+			if ( authMatch && authMatch[ 1 ] ) {
 
-				}
+				tempAuthLines.push( line );
+				tempAuthHosts.add( authMatch[ 1 ] );
 
 			}
 
-		} catch ( readErr ) {
+		}
 
-			logDebug( `Could not read temp .npmrc: ${readErr?.message || readErr}` );
+	} catch ( readErr ) {
 
-		}
+		logDebug( `Could not read temp .npmrc: ${readErr?.message || readErr}` );
+
+	}
 
 	if ( ! headerRegistry && registryUrl ) headerRegistry = registryUrl;
 	const authHostList = Array.from( tempAuthHosts );
@@ -967,6 +1032,19 @@ async function main() {
 		logWarn( `Warning: could not write .npmrc: ${e?.message || String( e )}` );
 
 	} );
+	let loginHelperReady = false;
+	try {
+
+		await ensureLoginHelperScript( targetDir );
+		loginHelperReady = true;
+		logSuccess( `Prepared login helper script (${LOGIN_HELPER_POSIX_PATH}).` );
+
+	} catch ( helperErr ) {
+
+		logWarn( `Warning: could not write ${LOGIN_HELPER_POSIX_PATH}: ${helperErr?.message || String( helperErr )}` );
+
+	}
+
 	const primedAuth = appendAuthTokenLines( npmrcPath, tempAuthLines );
 	if ( primedAuth ) logDebug( 'Primed .npmrc with short-lived auth token.' );
 
@@ -980,8 +1058,7 @@ async function main() {
 		pkg.scripts = pkg.scripts || {};
 		if ( ! pkg.scripts.preinstall ) {
 
-			// Simplified: defaults to --mode project in CI, --scope @three-blocks, --channel stable
-			pkg.scripts.preinstall = `npx -y ${LOGIN_CLI}@latest`;
+			pkg.scripts.preinstall = loginHelperReady ? LOGIN_HELPER_COMMAND : `npx -y ${LOGIN_CLI}@latest`;
 
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-three-blocks-starter",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "private": false,
   "type": "module",
   "description": "Create a new Three Blocks starter app",