netlify-cli 21.4.1 → 21.5.0-pre.255457f

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "21.4.1",
+  "version": "21.5.0-pre.255457f",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -152,72 +152,10 @@
     "write-file-atomic": "5.0.1",
     "ws": "8.18.2"
   },
-  "devDependencies": {
-    "@babel/preset-react": "7.26.3",
-    "@bugsnag/js": "8.2.0",
-    "@eslint/compat": "1.2.8",
-    "@eslint/js": "9.24.0",
-    "@netlify/functions": "3.0.4",
-    "@sindresorhus/slugify": "2.2.1",
-    "@tsconfig/node18": "^18.2.4",
-    "@tsconfig/recommended": "^1.0.8",
-    "@types/backoff": "^2.5.5",
-    "@types/content-type": "1.1.8",
-    "@types/debug": "4.1.12",
-    "@types/envinfo": "7.8.4",
-    "@types/eslint-config-prettier": "^6.11.3",
-    "@types/etag": "1.8.3",
-    "@types/folder-walker": "3.2.4",
-    "@types/gitconfiglocal": "2.0.3",
-    "@types/inquirer": "9.0.7",
-    "@types/inquirer-autocomplete-prompt": "3.0.3",
-    "@types/jsonwebtoken": "9.0.9",
-    "@types/lodash": "4.17.16",
-    "@types/lodash.shuffle": "^4.2.9",
-    "@types/multiparty": "4.2.1",
-    "@types/node": "18.19.86",
-    "@types/node-fetch": "2.6.12",
-    "@types/parallel-transform": "1.1.4",
-    "@types/parse-github-url": "1.0.3",
-    "@types/parse-gitignore": "1.0.2",
-    "@types/picomatch": "4.0.0",
-    "@types/prettyjson": "0.0.33",
-    "@types/semver": "7.7.0",
-    "@types/serialize-javascript": "^5.0.4",
-    "@types/source-map-support": "0.5.10",
-    "@types/update-notifier": "^6.0.8",
-    "@types/write-file-atomic": "4.0.3",
-    "@types/ws": "8.18.1",
-    "@vitest/coverage-v8": "3.1.1",
-    "@vitest/eslint-plugin": "1.1.42",
-    "c8": "10.1.3",
-    "cheerio": "1.0.0",
-    "dedent": "^1.5.3",
-    "eslint": "9.24.0",
-    "eslint-config-prettier": "10.1.2",
-    "eslint-plugin-n": "17.17.0",
-    "form-data": "4.0.2",
-    "lodash.shuffle": "^4.2.0",
-    "memfs": "^4.17.0",
-    "nock": "14.0.4",
-    "npm-run-all2": "^7.0.2",
-    "p-timeout": "6.1.4",
-    "picomatch": "^4.0.2",
-    "prettier": "2.6.2",
-    "serialize-javascript": "6.0.2",
-    "strip-ansi": "7.1.0",
-    "temp-dir": "3.0.0",
-    "tree-kill": "1.2.2",
-    "tsx": "^4.19.3",
-    "typescript": "5.8.3",
-    "typescript-eslint": "^8.26.0",
-    "verdaccio": "6.1.2",
-    "vitest": "3.1.1"
-  },
   "ava": {
     "files": [
       "tools/**/*.test.js",
       "tests/**/*.test.cjs"
     ]
   }
-}
+}

package/scripts/netlifyPackage.js

@@ -0,0 +1,68 @@
+// @ts-check
+import assert from 'node:assert'
+import { dirname, resolve } from 'node:path'
+import { readFile, stat, writeFile } from 'node:fs/promises'
+
+import execa from 'execa'
+
+/**
+ * @import {Package} from "normalize-package-data"
+ */
+
+const packageJSON = await getPackageJSON()
+
+async function getPackageJSON() {
+  const packageJSONPath = resolve('package.json')
+
+  /**
+   * @type {Package}
+   */
+  const contents = JSON.parse(await readFile(packageJSONPath, 'utf8'))
+
+  return {
+    contents,
+    path: packageJSONPath,
+  }
+}
+
+async function preparePackageJSON() {
+  const binPath = Object.values(packageJSON.contents.bin ?? {})[0]
+  if (!binPath) {
+    throw new Error('Did not find a non-empty binary entry in `package.json`, so the `npx` flow will not work.')
+  }
+
+  const newPackageJSON = {
+    ...packageJSON.contents,
+    main: './dist/index.js',
+    name: 'netlify',
+    scripts: {
+      ...packageJSON.contents.scripts,
+
+      // We don't need the pre-publish script because we expect the work in
+      // there to be done when publishing the `netlify-cli` package. We'll
+      // ensure this is the case by throwing if a shrinkwrap file isn't found.
+      prepublishOnly: undefined,
+    },
+    bin: {
+      npxnetlify: binPath,
+    },
+  }
+
+  try {
+    const shrinkwrap = await stat(resolve(packageJSON.path, '../npm-shrinkwrap.json'))
+
+    assert.ok(shrinkwrap.isFile())
+  } catch {
+    throw new Error('Failed to find npm-shrinkwrap.json file. Did you run the pre-publish script?')
+  }
+
+  console.log(`Writing updated package.json to ${packageJSON.path}...`)
+  await writeFile(packageJSON.path, `${JSON.stringify(newPackageJSON, null, 2)}\n`)
+
+  console.log('Regenerating shrinkwrap file with updated package name...')
+  await execa('npm', ['shrinkwrap'], {
+    cwd: dirname(packageJSON.path),
+  })
+}
+
+await preparePackageJSON()

package/scripts/postinstall.js

@@ -33,7 +33,7 @@ const postInstall = async () => {
     boxen(
       `Success! Netlify CLI has been installed!
 
-      You can now use Netlify CLI to develop, deploy, and manage your Netlify sites.
+      You can now use Netlify CLI to develop, deploy, and manage your Netlify projects.
 
       🚀 Now get building!`,
       {
@@ -51,9 +51,9 @@ const postInstall = async () => {
   console.log('Next steps:')
   console.log(`  ${chalk.cyanBright.bold('netlify login')}    Log in to your Netlify account`)
   console.log(
-    `  ${chalk.cyanBright.bold('netlify init')}     Connect or create a Netlify site from the current directory`,
+    `  ${chalk.cyanBright.bold('netlify init')}     Connect or create a Netlify project from the current directory`,
   )
-  console.log(`  ${chalk.cyanBright.bold('netlify deploy')}   Deploy the latest changes to your Netlify site`)
+  console.log(`  ${chalk.cyanBright.bold('netlify deploy')}   Deploy the latest changes to your Netlify project`)
   console.log(`  ${chalk.cyanBright.bold('netlify help')}     Find out what else you can do 👀`)
   console.log('')
   console.log(`For more help with the CLI, visit ${chalk.cyanBright.bold('https://developers.netlify.com/cli')}`)

package/scripts/prepublishOnly.js

@@ -14,22 +14,16 @@ const main = async () => {
   const packageJSONPath = path.join(process.cwd(), 'package.json')
   const rawPackageJSON = await fs.readFile(packageJSONPath, 'utf8')
 
-  try {
-    // Remove dev dependencies from the package.json...
-    const packageJSON = JSON.parse(rawPackageJSON)
-    Reflect.deleteProperty(packageJSON, 'devDependencies')
-    await fs.writeFile(packageJSONPath, JSON.stringify(packageJSON, null, 2))
+  // Remove dev dependencies from the package.json...
+  const packageJSON = JSON.parse(rawPackageJSON)
+  Reflect.deleteProperty(packageJSON, 'devDependencies')
+  await fs.writeFile(packageJSONPath, JSON.stringify(packageJSON, null, 2))
 
-    // Prune out dev dependencies (this updates the `package-lock.json` lockfile)
-    cp.spawnSync('npm', ['prune'], { stdio: 'inherit' })
+  // Prune out dev dependencies (this updates the `package-lock.json` lockfile)
+  cp.spawnSync('npm', ['prune'], { stdio: 'inherit' })
 
-    // Convert `package-lock.json` lockfile to `npm-shrinkwrap.json`
-    cp.spawnSync('npm', ['shrinkwrap'], { stdio: 'inherit' })
-  } finally {
-    // Restore the original `package.json`. (This makes no functional difference in a publishing
-    // environment, it's purely to minimize how destructive this script is.)
-    await fs.writeFile(packageJSONPath, rawPackageJSON)
-  }
+  // Convert `package-lock.json` lockfile to `npm-shrinkwrap.json`
+  cp.spawnSync('npm', ['shrinkwrap'], { stdio: 'inherit' })
 }
 
 await main()