Fix the web plugin's prepublishOnly script.

WebstoneHQ · Aug 8, 2023 · a37c021 · a37c021
1 parent 0b3dac8
commit a37c021
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/.changeset/three-penguins-admire.md b/.changeset/three-penguins-admire.md
@@ -0,0 +1,6 @@
+---
+"webstone-plugin-request-logger-web": minor
+"create-webstone-app": minor
+---
+
+Make sure the plugin's web's prepublishOnly script runs pnpm package.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,8 +31,8 @@ jobs:
         id: changesets
         uses: changesets/action@v1
         with:
-          # This expects you to have a script called release which does a build for your packages and calls changeset publish
-          publish: pnpm release
+          version: pnpm changeset:version
+          publish: pnpm changeset:publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/package.json b/package.json
@@ -27,13 +27,14 @@
   "scripts": {
     "build": "pnpm --recursive --parallel build",
     "changeset": "changeset && pnpm install",
+    "changeset:version": "changeset version && pnpm install --lockfile-only",
+    "changeset:publish": "changeset publish",
     "clean": "pnpm --recursive --parallel clean",
     "clean:nodemodules": "find . -type d -name \"node_modules\" -exec rm -fr {} +",
     "dev": "pnpm --recursive --parallel --filter !./packages/plugin-*/web --filter !./packages/plugin-*/packages/web dev",
     "lint": "eslint . --fix --ignore-path .gitignore --max-warnings 0",
     "preinstall": "npx only-allow pnpm",
     "prepare": "husky install",
-    "release": "changeset publish",
     "test": "pnpm test:unit",
     "test:e2e": "pnpm playwright test",
     "test:e2e:open": "pnpm playwright test --headed",

diff --git a/packages/create-webstone-app/src/tasks/3-configure-app/plugin.ts b/packages/create-webstone-app/src/tasks/3-configure-app/plugin.ts
@@ -32,12 +32,14 @@ const installWebDevDependencies = async (ctx: Ctx) => {
 };
 
 const configureWebPrepublishOnlyScript = async (ctx: Ctx) => {
+  const prepublishOnlyCommands = [
+    `pnpm remove webstone-plugin-${getAppName(ctx.appDir)}-cli @webstone/cli`,
+    "pnpm package",
+  ];
   const packageJson = fs.readJSONSync(
     path.join(ctx.appDir, "packages", "web", "package.json"),
   );
-  packageJson.scripts.prepublishOnly = `pnpm remove webstone-plugin-${getAppName(
-    ctx.appDir,
-  )}-cli @webstone/cli`;
+  packageJson.scripts.prepublishOnly = prepublishOnlyCommands.join(" && ");
   fs.writeJSONSync(
     path.join(ctx.appDir, "packages", "web", "package.json"),
     packageJson,

diff --git a/packages/plugin-request-logger/packages/web/package.json b/packages/plugin-request-logger/packages/web/package.json
@@ -6,7 +6,7 @@
 		"build": "vite build && npm run package",
 		"preview": "vite preview",
 		"package": "svelte-kit sync && svelte-package && publint",
-		"prepublishOnly": "pnpm remove webstone-plugin-request-logger-cli @webstone/cli",
+		"prepublishOnly": "pnpm remove webstone-plugin-request-logger-cli @webstone/cli && pnpm package",
 		"test": "playwright test",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",