fix: issue with manifest and build plugins

nmerget · nmerget · commit c642735ebbc1 · 2024-11-29T10:12:21.000+01:00
diff --git a/.github/scripts/release/index.js b/.github/scripts/release/index.js
@@ -18,7 +18,7 @@ const release = async ({ github, context, workspace, zipName, srcDir }) => {
     github,
     context,
     release_id,
-    assetName: zipName,
+    assetName: `${zipName}.zip`,
     assetPath,
   });
 };
diff --git a/.github/scripts/release/zip-folder.js b/.github/scripts/release/zip-folder.js
@@ -2,9 +2,15 @@
 
 import AdmZip from "adm-zip";
 
+import { existsSync } from "node:fs";
+
 const zipFolder = async (destPath, assetPath) => {
   const zip = new AdmZip();
-  zip.addLocalFolder(`${destPath}/dist`);
+  const indexHtmlPath = `${destPath}/index.html`;
+  if (existsSync(indexHtmlPath)) {
+    zip.addLocalFile(`${destPath}/index.html`);
+  }
+  zip.addLocalFile(`${destPath}/index.js`);
   zip.addLocalFile(`${destPath}/manifest.json`);
   return zip.writeZipPromise(assetPath);
 };
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,8 +33,6 @@ jobs:
       - name: ⏫ Upload Release Assets
         id: upload-release-asset
         uses: actions/github-script@v7
-        env:
-          ICON_RELEASE_ID: ${{ vars.ICON_RELEASE_ID }}
         with:
           result-encoding: json
           script: |
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 node_modules
 dist
 .idea
+/packages/**/index.html
+/packages/**/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
     "cross-spawn": "~7.0.5"
   },
   "devDependencies": {
+    "@types/node": "^22.10.1",
     "npm-run-all": "4.1.5",
     "adm-zip": "^0.5.16"
   }
diff --git a/packages/auto-sync/manifest.json b/packages/auto-sync/manifest.json
@@ -2,8 +2,8 @@
   "name": "auto-sync",
   "id": "1443742630333209915",
   "api": "1.0.0",
-  "main": "dist/index.js",
-  "ui": "dist/index.html",
+  "main": "index.js",
+  "ui": "index.html",
   "capabilities": [],
   "enableProposedApi": false,
   "documentAccess": "dynamic-page",
diff --git a/packages/auto-sync/ui/vite.config.ts b/packages/auto-sync/ui/vite.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
     assetsInlineLimit: 100000000,
     chunkSizeWarningLimit: 100000000,
     cssCodeSplit: false,
-    outDir: "../dist",
+    outDir: "../",
     rollupOptions: {
       output: {},
     },
diff --git a/packages/auto-sync/widget/package.json b/packages/auto-sync/widget/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Your Figma Plugin",
   "scripts": {
-    "build": "esbuild src/index.tsx --bundle --outfile=../dist/index.js --target=es6",
+    "build": "esbuild src/index.tsx --bundle --outfile=../index.js --target=es6",
     "lint": "eslint --ext .ts,.tsx --ignore-pattern node_modules .",
     "lint:fix": "eslint --ext .ts,.tsx --ignore-pattern node_modules --fix .",
     "dev": "npm run build -- --watch"
diff --git a/packages/codegen/manifest.json b/packages/codegen/manifest.json
@@ -39,7 +39,7 @@
     }
   ],
   "editorType": ["dev"],
-  "main": "dist/index.js",
+  "main": "index.js",
   "networkAccess": { "allowedDomains": ["none"] },
   "documentAccess": "dynamic-page"
 }
diff --git a/packages/codegen/plugin/package.json b/packages/codegen/plugin/package.json
@@ -5,7 +5,7 @@
   "main": "code.js",
   "type": "module",
   "scripts": {
-    "build": "esbuild src/index.ts --bundle --outfile=../dist/index.js  --target=ES6",
+    "build": "esbuild src/index.ts --bundle --outfile=../index.js  --target=ES6",
     "lint": "eslint --ext .ts,.tsx --ignore-pattern node_modules .",
     "lint:fix": "eslint --ext .ts,.tsx --ignore-pattern node_modules --fix .",
     "dev": "npm run build -- --watch"
diff --git a/packages/design-migration/manifest.json b/packages/design-migration/manifest.json
@@ -3,8 +3,8 @@
   "id": "1441699628075302748",
   "api": "1.0.0",
   "editorType": ["figma"],
-  "ui": "dist/design-migration/index.html",
-  "main": "dist/design-migration/index.js",
+  "ui": "index.html",
+  "main": "index.js",
   "networkAccess": { "allowedDomains": ["none"] },
   "documentAccess": "dynamic-page"
 }
diff --git a/packages/design-migration/plugin/package.json b/packages/design-migration/plugin/package.json
@@ -4,7 +4,7 @@
   "main": "design-migration.js",
   "type": "module",
   "scripts": {
-    "build": "esbuild src/index.ts --bundle --outfile=../dist/design-migration/index.js  --target=ES6",
+    "build": "esbuild src/index.ts --bundle --outfile=../index.js  --target=ES6",
     "lint": "eslint --ext .ts,.tsx --ignore-pattern node_modules .",
     "lint:fix": "eslint --ext .ts,.tsx --ignore-pattern node_modules --fix .",
     "dev": "npm run build -- --watch"
diff --git a/packages/design-migration/ui/vite.config.ts b/packages/design-migration/ui/vite.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
     assetsInlineLimit: 100000000,
     chunkSizeWarningLimit: 100000000,
     cssCodeSplit: false,
-    outDir: "../dist/design-migration",
+    outDir: "../",
     rollupOptions: {
       output: {},
     },
diff --git a/packages/handover/manifest.json b/packages/handover/manifest.json
@@ -2,8 +2,8 @@
   "name": "handover",
   "id": "1443742630222209915",
   "api": "1.0.0",
-  "main": "dist/index.js",
-  "ui": "dist/index.html",
+  "main": "index.js",
+  "ui": "index.html",
   "capabilities": [],
   "enableProposedApi": false,
   "documentAccess": "dynamic-page",
diff --git a/packages/handover/ui/vite.config.ts b/packages/handover/ui/vite.config.ts
@@ -1,18 +1,18 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
-import {viteSingleFile} from "vite-plugin-singlefile";
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+import { viteSingleFile } from "vite-plugin-singlefile";
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [react(),viteSingleFile()],
+  plugins: [react(), viteSingleFile()],
   build: {
     target: "esnext",
     assetsInlineLimit: 100000000,
     chunkSizeWarningLimit: 100000000,
     cssCodeSplit: false,
-    outDir: "../dist",
+    outDir: "../",
     rollupOptions: {
       output: {},
     },
   },
-})
+});
diff --git a/packages/handover/widget/package.json b/packages/handover/widget/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Your Figma Plugin",
   "scripts": {
-    "build": "esbuild src/index.tsx --bundle --outfile=../dist/index.js --target=es6",
+    "build": "esbuild src/index.tsx --bundle --outfile=../index.js --target=es6",
     "lint": "eslint --ext .ts,.tsx --ignore-pattern node_modules .",
     "lint:fix": "eslint --ext .ts,.tsx --ignore-pattern node_modules --fix .",
     "dev": "npm run build -- --watch"
diff --git a/packages/inspect/manifest.json b/packages/inspect/manifest.json
@@ -4,8 +4,8 @@
   "api": "1.0.0",
   "capabilities": ["inspect"],
   "editorType": ["dev"],
-  "ui": "dist/inspect/index.html",
-  "main": "dist/inspect/index.js",
+  "ui": "index.html",
+  "main": "index.js",
   "networkAccess": { "allowedDomains": ["none"] },
   "documentAccess": "dynamic-page"
 }
diff --git a/packages/inspect/plugin/package.json b/packages/inspect/plugin/package.json
@@ -4,7 +4,7 @@
   "main": "inspect.js",
   "type": "module",
   "scripts": {
-    "build": "esbuild src/index.ts --bundle --outfile=../dist/inspect/index.js  --target=ES6",
+    "build": "esbuild src/index.ts --bundle --outfile=../index.js  --target=ES6",
     "lint": "eslint --ext .ts,.tsx --ignore-pattern node_modules .",
     "lint:fix": "eslint --ext .ts,.tsx --ignore-pattern node_modules --fix .",
     "dev": "npm run build -- --watch"
diff --git a/packages/inspect/ui/vite.config.ts b/packages/inspect/ui/vite.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
     assetsInlineLimit: 100000000,
     chunkSizeWarningLimit: 100000000,
     cssCodeSplit: false,
-    outDir: "../dist/inspect",
+    outDir: "..",
     rollupOptions: {
       output: {},
     },

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`"cross-spawn": "~7.0.5"`
`29`	`29`	`},`
`30`	`30`	`"devDependencies": {`
	`31`	`+ "@types/node": "^22.10.1",`
`31`	`32`	`"npm-run-all": "4.1.5",`
`32`	`33`	`"adm-zip": "^0.5.16"`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`}`
`40`	`40`	`],`
`41`	`41`	`"editorType": ["dev"],`
`42`		`- "main": "dist/index.js",`
	`42`	`+ "main": "index.js",`
`43`	`43`	`"networkAccess": { "allowedDomains": ["none"] },`
`44`	`44`	`"documentAccess": "dynamic-page"`
`45`	`45`	`}`