netlify-cli 19.0.0-pre.93d6107 → 19.0.0-pre.94cb80a

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "19.0.0-pre.93d6107",
+  "version": "19.0.0-pre.94cb80a",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -31,8 +31,7 @@
     "url": "https://github.com/netlify/cli/issues"
   },
   "scripts": {
-    "prepublishOnly": "node ./scripts/prepare-for-publish.js",
-    "postinstall": "node ./scripts/postinstall.js"
+    "prepublishOnly": "node ./scripts/prepare-for-publish.js"
   },
   "dependencies": {
     "@bugsnag/js": "8.2.0",
@@ -137,6 +136,6 @@
     "uuid": "11.0.5",
     "wait-port": "1.1.0",
     "write-file-atomic": "5.0.1",
-    "ws": "8.18.0"
+    "ws": "8.18.1"
   }
 }

package/scripts/prepare-for-publish.js

@@ -5,8 +5,29 @@ import { fileURLToPath } from 'url'
 import execa from 'execa'
 import ora from 'ora'
 
-// These scripts from package.json need to be preserved on publish
-const preserveScripts = new Set([
+const insertUserPostinstall = (pkgJson) => {
+  pkgJson.scripts.postinstall = pkgJson.scripts['postinstall-pack']
+  delete pkgJson.scripts['postinstall-pack']
+}
+
+const installDeps = async () => {
+  let spinner = ora('Running `npm install --no-audit`').start()
+  await execa('npm', ['install', '--no-audit'])
+  spinner.succeed()
+
+  spinner = ora('Running `npm shrinkwrap`').start()
+  await execa('npm', ['shrinkwrap'])
+  spinner.succeed()
+}
+
+// NOTE: this must run before `cleanPackageJson`, otherwise the `build` script has been deleted
+const buildPackageForPublish = async () => {
+  const spinner = ora('Running `npm run build`').start()
+  await execa('npm', ['run', 'build'])
+  spinner.succeed()
+}
+
+const SCRIPTS_TO_KEEP_ON_PUBLISHED_PKG = new Set([
   'postinstall-pack',
   'postpack',
   'preinstall',
@@ -15,42 +36,35 @@ const preserveScripts = new Set([
   'prepublishOnly',
 ])
 
-let spinner = ora({
-  spinner: 'star',
-  text: 'Patching package.json (removing devDependencies, scripts, etc)',
-}).start()
+const cleanPackageJson = (pkgJson) => {
+  delete pkgJson.devDependencies
+  delete pkgJson.config
+
+  for (const scriptName in pkgJson.scripts) {
+    if (SCRIPTS_TO_KEEP_ON_PUBLISHED_PKG.has(scriptName)) continue
 
-const dir = dirname(fileURLToPath(import.meta.url))
-const packageJsonPath = join(dir, '../package.json')
+    delete pkgJson.scripts[scriptName]
+  }
+}
+
+const writeUpdatedPackageJson = async (pkgJson, packageJsonPath) => {
+  const spinner = ora('Patching package.json (removing devDependencies, scripts, etc').start()
+  await writeFile(packageJsonPath, JSON.stringify(pkgJson, null, 2))
+  spinner.succeed()
+}
 
-const pkgJson = JSON.parse(await readFile(packageJsonPath))
+const main = async () => {
+  const dir = dirname(fileURLToPath(import.meta.url))
+  const pkgJsonPath = join(dir, '../package.json')
+  const pkgJson = JSON.parse(await readFile(pkgJsonPath))
 
-delete pkgJson.devDependencies
-delete pkgJson.ava
-delete pkgJson.config
+  await installDeps()
 
-for (const scriptName in pkgJson.scripts) {
-  if (preserveScripts.has(scriptName)) continue
+  await buildPackageForPublish()
 
-  delete pkgJson.scripts[scriptName]
+  insertUserPostinstall(pkgJson)
+  cleanPackageJson(pkgJson)
+  await writeUpdatedPackageJson(pkgJson, pkgJsonPath)
 }
 
-pkgJson.scripts.postinstall = pkgJson.scripts['postinstall-pack']
-delete pkgJson.scripts['postinstall-pack']
-
-await writeFile(packageJsonPath, JSON.stringify(pkgJson, null, 2))
-spinner.succeed()
-
-spinner = ora({
-  spinner: 'star',
-  text: 'Running `npm install --no-audit`',
-}).start()
-await execa('npm', ['install', '--no-audit'])
-spinner.succeed()
-
-spinner = ora({
-  spinner: 'star',
-  text: 'Running `npm shrinkwrap`',
-}).start()
-await execa('npm', ['shrinkwrap'])
-spinner.succeed()
+await main()