@@ -27,6 +27,7 @@ const pkgJsonOrder = [
2727 'main' ,
2828 'module' ,
2929 'browser' ,
30+ 'exports' ,
3031 'man' ,
3132 'preferGlobal' ,
3233 'bin' ,
@@ -52,6 +53,8 @@ const pkgJsonOrder = [
5253 'publishConfig' ,
5354] ;
5455
56+ const sortedValues = [ 'dependencies' , 'devDependencies' ] ;
57+
5558/**
5659 *
5760 * @param {Function[] } mixins
@@ -328,13 +331,15 @@ export async function writeFilesToDisk() {
328331export function optionsToCommand ( options , generatorName = '@open-wc' ) {
329332 let command = `npm init ${ generatorName } ;
330333 Object . keys ( options ) . forEach ( key => {
331- const value = options [ key ] ;
332- if ( typeof value === 'string' || typeof value === 'number' ) {
333- command += `--${ key } ${ value } ;
334- } else if ( typeof value === 'boolean' && value === true ) {
335- command += `--${ key } ;
336- } else if ( Array . isArray ( value ) ) {
337- command += `--${ key } ${ value . join ( ' ' ) } ;
334+ if ( key !== '_scaffoldFilesFor' ) {
335+ const value = options [ key ] ;
336+ if ( typeof value === 'string' || typeof value === 'number' ) {
337+ command += `--${ key } ${ value } ;
338+ } else if ( typeof value === 'boolean' && value === true ) {
339+ command += `--${ key } ;
340+ } else if ( Array . isArray ( value ) ) {
341+ command += `--${ key } ${ value . join ( ' ' ) } ;
342+ }
338343 }
339344 } ) ;
340345 return command ;
@@ -445,11 +450,20 @@ export function copyTemplateJsonInto(
445450 const temp = { } ;
446451 const indexOf = k => {
447452 const i = pkgJsonOrder . indexOf ( k ) ;
448- return i === - 1 ? Infinity : 0 ;
453+ return i === - 1 ? Number . MAX_SAFE_INTEGER : i ;
449454 } ;
450455 const entries = Object . entries ( finalObj ) . sort ( ( [ a ] , [ b ] ) => indexOf ( a ) - indexOf ( b ) ) ;
451456 for ( const [ k , v ] of entries ) {
452- temp [ k ] = v ;
457+ let finalV = v ;
458+ if ( sortedValues . includes ( k ) ) {
459+ const newV = { } ;
460+ const vEntries = Object . entries ( v ) . sort ( ) ;
461+ for ( const [ k2 , v2 ] of vEntries ) {
462+ newV [ k2 ] = v2 ;
463+ }
464+ finalV = newV ;
465+ }
466+ temp [ k ] = finalV ;
453467 }
454468 finalObj = temp ;
455469 }
0 commit comments