@@ -59,17 +59,19 @@ namespace Harness {
5959 exec ( "git" , [ "--work-tree" , submoduleDir , "clone" , config . cloneUrl , path . join ( submoduleDir , ".git" ) ] , { cwd } ) ;
6060 }
6161 else {
62- exec ( "git" , [ "--git-dir" , path . join ( submoduleDir , ".git" ) , "--work-tree" , submoduleDir , "reset" , "HEAD" , "--hard" ] , { cwd : submoduleDir } ) ;
63- exec ( "git" , [ "--git-dir" , path . join ( submoduleDir , ".git" ) , "--work-tree" , submoduleDir , "clean" , "-f" ] , { cwd : submoduleDir } ) ;
64- exec ( "git" , [ "--git-dir" , path . join ( submoduleDir , ".git" ) , "--work-tree" , submoduleDir , "pull" , "-f" ] , { cwd : submoduleDir } ) ;
62+ exec ( "git" , [ "--git-dir" , path . join ( submoduleDir , ".git" ) , "--work-tree" , submoduleDir , "checkout" , ":^package-lock.json" ] , { cwd : submoduleDir } ) ;
63+ exec ( "git" , [ "--git-dir" , path . join ( submoduleDir , ".git" ) , "--work-tree" , submoduleDir , "clean" , "--force" , ":^package-lock.json" ] , { cwd : submoduleDir } ) ;
64+ if ( ! process . env . SOURCE_ISSUE ) {
65+ exec ( "git" , [ "--git-dir" , path . join ( submoduleDir , ".git" ) , "--work-tree" , submoduleDir , "pull" ] , { cwd : submoduleDir } ) ;
66+ }
6567 }
6668
6769 types = config . types ;
6870
6971 cwd = config . path ? path . join ( cwd , config . path ) : submoduleDir ;
7072 }
7173 if ( fs . existsSync ( path . join ( cwd , "package.json" ) ) ) {
72- if ( fs . existsSync ( path . join ( cwd , "package-lock.json" ) ) ) {
74+ if ( ! process . env . SOURCE_ISSUE && fs . existsSync ( path . join ( cwd , "package-lock.json" ) ) ) {
7375 fs . unlinkSync ( path . join ( cwd , "package-lock.json" ) ) ;
7476 }
7577 if ( fs . existsSync ( path . join ( cwd , "node_modules" ) ) ) {
0 commit comments