deps!: init-package-json@8.0.0

wraithgar · wraithgar · commit d463a6f071da · 2024-12-06T07:49:28.000-08:00
BREAKING CHANGE: `npm init` now has a `type` prompt, and sorts the entries the created packages differently
diff --git a/node_modules/init-package-json/lib/default-input.js b/node_modules/init-package-json/lib/default-input.js
@@ -199,16 +199,17 @@ if (!package.scripts) {
 
 if (!package.repository) {
   exports.repository = async () => {
-    const gconf = await fs.readFile('.git/config', 'utf8').catch(() => '')
+    const gitConfigPath = path.resolve(dirname, '.git', 'config')
+    const gconf = await fs.readFile(gitConfigPath, 'utf8').catch(() => '')
     const lines = gconf.split(/\r?\n/)
 
     let url
     const i = lines.indexOf('[remote "origin"]')
 
     if (i !== -1) {
-      url = gconf[i + 1]
+      url = lines[i + 1]
       if (!url.match(/^\s*url =/)) {
-        url = gconf[i + 2]
+        url = lines[i + 2]
       }
       if (!url.match(/^\s*url =/)) {
         url = null
@@ -260,3 +261,8 @@ exports.license = yes ? license : prompt('license', license, (data) => {
   const errors = (its.errors || []).concat(its.warnings || [])
   return invalid(`Sorry, ${errors.join(' and ')}.`)
 })
+
+const type = package.type || getConfig('type') || 'commonjs'
+exports.type = yes ? type : prompt('type', type, (data) => {
+  return data
+})
diff --git a/node_modules/init-package-json/lib/init-package-json.js b/node_modules/init-package-json/lib/init-package-json.js
@@ -139,7 +139,7 @@ async function init (dir,
     return
   }
 
-  await pkg.save()
+  await pkg.save({ sort: true })
   return pkg.content
 }
 
diff --git a/node_modules/init-package-json/package.json b/node_modules/init-package-json/package.json
@@ -1,6 +1,6 @@
 {
   "name": "init-package-json",
-  "version": "7.0.1",
+  "version": "8.0.0",
   "main": "lib/init-package-json.js",
   "scripts": {
     "test": "tap",
@@ -20,7 +20,7 @@
   "license": "ISC",
   "description": "A node module to get your node module started",
   "dependencies": {
-    "@npmcli/package-json": "^6.0.0",
+    "@npmcli/package-json": "^6.1.0",
     "npm-package-arg": "^12.0.0",
     "promzard": "^2.0.0",
     "read": "^4.0.0",
@@ -29,13 +29,13 @@
     "validate-npm-package-name": "^6.0.0"
   },
   "devDependencies": {
-    "@npmcli/config": "^8.2.0",
+    "@npmcli/config": "^9.0.0",
     "@npmcli/eslint-config": "^5.0.0",
-    "@npmcli/template-oss": "4.23.3",
+    "@npmcli/template-oss": "4.23.4",
     "tap": "^16.0.1"
   },
   "engines": {
-    "node": "^18.17.0 || >=20.5.0"
+    "node": "^20.17.0 || >=22.9.0"
   },
   "tap": {
     "test-ignore": "fixtures/",
@@ -61,7 +61,7 @@
   ],
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.23.3",
+    "version": "4.23.4",
     "publish": true
   }
 }
diff --git a/package-lock.json b/package-lock.json
@@ -106,7 +106,7 @@
         "graceful-fs": "^4.2.11",
         "hosted-git-info": "^8.0.2",
         "ini": "^5.0.0",
-        "init-package-json": "^7.0.1",
+        "init-package-json": "^8.0.0",
         "is-cidr": "^5.1.0",
         "json-parse-even-better-errors": "^4.0.0",
         "libnpmaccess": "^10.0.0-pre.0",
@@ -9195,13 +9195,13 @@
       }
     },
     "node_modules/init-package-json": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-7.0.1.tgz",
-      "integrity": "sha512-8KZtk/53ReI2T2f6z2hl5ql6xKLjDexNw7DUqTdR8f+Mo8WZmBjjkH6DrTfBjmW0j3Tqx+j3t8creN0O890+0A==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-8.0.0.tgz",
+      "integrity": "sha512-zKgxfaGt6Zzi8VBSInOK0CYDigA9gzDCWPnSzGIoUlTU/5w7qIyi+6MyJYX96mMlxDGrIR85FhQszVyodYfB9g==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/package-json": "^6.0.0",
+        "@npmcli/package-json": "^6.1.0",
         "npm-package-arg": "^12.0.0",
         "promzard": "^2.0.0",
         "read": "^4.0.0",
@@ -9210,7 +9210,7 @@
         "validate-npm-package-name": "^6.0.0"
       },
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/internal-slot": {
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
     "graceful-fs": "^4.2.11",
     "hosted-git-info": "^8.0.2",
     "ini": "^5.0.0",
-    "init-package-json": "^7.0.1",
+    "init-package-json": "^8.0.0",
     "is-cidr": "^5.1.0",
     "json-parse-even-better-errors": "^4.0.0",
     "libnpmaccess": "^10.0.0-pre.0",
diff --git a/smoke-tests/tap-snapshots/test/index.js.test.cjs b/smoke-tests/tap-snapshots/test/index.js.test.cjs
@@ -116,6 +116,7 @@ Wrote to {NPM}/{TESTDIR}/project/package.json:
   "keywords": [],
   "author": "",
   "license": "ISC",
+  "type": "commonjs",
   "description": ""
 }
 `
@@ -171,6 +172,7 @@ Object {
   "scripts": Object {
     "test": "echo /"Error: no test specified/" && exit 1",
   },
+  "type": "commonjs",
   "version": "1.0.0",
 }
 `
@@ -223,6 +225,7 @@ Object {
   "scripts": Object {
     "test": "echo /"Error: no test specified/" && exit 1",
   },
+  "type": "commonjs",
   "version": "1.0.0",
 }
 `
@@ -253,6 +256,7 @@ Object {
     "hello": "echo Hello",
     "test": "echo /"Error: no test specified/" && exit 1",
   },
+  "type": "commonjs",
   "version": "1.0.0",
 }
 `
@@ -277,6 +281,7 @@ Object {
       "LC_ALL=sk",
     ],
   },
+  "type": "commonjs",
   "version": "1.0.0",
 }
 `
@@ -305,6 +310,7 @@ exports[`test/index.js TAP basic npm pkg > should print package.json contents 1`
   "keywords": [],
   "author": "",
   "license": "ISC",
+  "type": "commonjs",
   "description": "",
   "dependencies": {
     "abbrev": "^1.0.4"
@@ -335,6 +341,7 @@ Object {
     "hello": "echo Hello",
     "test": "echo /"Error: no test specified/" && exit 1",
   },
+  "type": "commonjs",
   "version": "1.0.0",
 }
 `
@@ -392,6 +399,7 @@ Object {
     "hello": "echo Hello",
     "test": "echo /"Error: no test specified/" && exit 1",
   },
+  "type": "commonjs",
   "version": "1.0.0",
 }
 `
@@ -452,6 +460,7 @@ Object {
     "hello": "echo Hello",
     "test": "echo /"Error: no test specified/" && exit 1",
   },
+  "type": "commonjs",
   "version": "1.0.0",
 }
 `

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ async function init (dir,`
`139`	`139`	`return`
`140`	`140`	`}`
`141`	`141`
`142`		`- await pkg.save()`
	`142`	`+ await pkg.save({ sort: true })`
`143`	`143`	`return pkg.content`
`144`	`144`	`}`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ Wrote to {NPM}/{TESTDIR}/project/package.json:`
`116`	`116`	`"keywords": [],`
`117`	`117`	`"author": "",`
`118`	`118`	`"license": "ISC",`
	`119`	`+ "type": "commonjs",`
`119`	`120`	`"description": ""`
`120`	`121`	`}`
`121`	`122`	`
`@@ -171,6 +172,7 @@ Object {`
`171`	`172`	`"scripts": Object {`
`172`	`173`	`"test": "echo /"Error: no test specified/" && exit 1",`
`173`	`174`	`},`
	`175`	`+ "type": "commonjs",`
`174`	`176`	`"version": "1.0.0",`
`175`	`177`	`}`
`176`	`178`	`
`@@ -223,6 +225,7 @@ Object {`
`223`	`225`	`"scripts": Object {`
`224`	`226`	`"test": "echo /"Error: no test specified/" && exit 1",`
`225`	`227`	`},`
	`228`	`+ "type": "commonjs",`
`226`	`229`	`"version": "1.0.0",`
`227`	`230`	`}`
`228`	`231`	`
`@@ -253,6 +256,7 @@ Object {`
`253`	`256`	`"hello": "echo Hello",`
`254`	`257`	`"test": "echo /"Error: no test specified/" && exit 1",`
`255`	`258`	`},`
	`259`	`+ "type": "commonjs",`
`256`	`260`	`"version": "1.0.0",`
`257`	`261`	`}`
`258`	`262`	`
`@@ -277,6 +281,7 @@ Object {`
`277`	`281`	`"LC_ALL=sk",`
`278`	`282`	`],`
`279`	`283`	`},`
	`284`	`+ "type": "commonjs",`
`280`	`285`	`"version": "1.0.0",`
`281`	`286`	`}`
`282`	`287`	`
@@ -305,6 +310,7 @@ exports[`test/index.js TAP basic npm pkg > should print package.json contents 1`
`305`	`310`	`"keywords": [],`
`306`	`311`	`"author": "",`
`307`	`312`	`"license": "ISC",`
	`313`	`+ "type": "commonjs",`
`308`	`314`	`"description": "",`
`309`	`315`	`"dependencies": {`
`310`	`316`	`"abbrev": "^1.0.4"`
`@@ -335,6 +341,7 @@ Object {`
`335`	`341`	`"hello": "echo Hello",`
`336`	`342`	`"test": "echo /"Error: no test specified/" && exit 1",`
`337`	`343`	`},`
	`344`	`+ "type": "commonjs",`
`338`	`345`	`"version": "1.0.0",`
`339`	`346`	`}`
`340`	`347`	`
`@@ -392,6 +399,7 @@ Object {`
`392`	`399`	`"hello": "echo Hello",`
`393`	`400`	`"test": "echo /"Error: no test specified/" && exit 1",`
`394`	`401`	`},`
	`402`	`+ "type": "commonjs",`
`395`	`403`	`"version": "1.0.0",`
`396`	`404`	`}`
`397`	`405`	`
`@@ -452,6 +460,7 @@ Object {`
`452`	`460`	`"hello": "echo Hello",`
`453`	`461`	`"test": "echo /"Error: no test specified/" && exit 1",`
`454`	`462`	`},`
	`463`	`+ "type": "commonjs",`
`455`	`464`	`"version": "1.0.0",`
`456`	`465`	`}`
`457`	`466`	`