Merge branch 'main' into experimental-serverless-build

sern-handler · Jul 27, 2024 · b369fdc · b369fdc
2 parents 6db6cf5 + d581142
commit b369fdc
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/auto-deprecate.yml b/.github/workflows/auto-deprecate.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
         with:
           node-version: 17
           registry-url: 'https://registry.npmjs.org/'

diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
         with:
           node-version: 17
           registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
         with:
           node-version: 17
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
         with:
           node-version: 17
           registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -14,7 +14,7 @@ jobs:
           bump-patch-for-minor-pre-major: true
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         if: ${{ steps.release.outputs.release_created }}
-      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+      - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
         with:
           node-version: 17
           registry-url: 'https://registry.npmjs.org'

diff --git a/src/commands/publish.ts b/src/commands/publish.ts
@@ -16,8 +16,10 @@ export async function publish(commandDir: string | undefined, args: Partial<Publ
 
     commandDir && console.info('Publishing with override path: ', commandDir);
 
-    const dotenvLocation = new URL('../node_modules/dotenv/config.js', rootPath),
-        esmLoader = new URL('../node_modules/@esbuild-kit/esm-loader/dist/index.js', rootPath);
+    const isBunOrPnpm = rootPath.pathname.includes('.bun') || rootPath.pathname.includes('.pnpm');
+
+    const dotenvLocation = new URL(`${isBunOrPnpm ? '../../' : '../'}node_modules/dotenv/config.js`, rootPath),
+        esmLoader = new URL(`${isBunOrPnpm ? '../../' : '../'}node_modules/@esbuild-kit/esm-loader/dist/index.js`, rootPath);
 
     // We dynamically load the create-publish script in a child process so that we can pass the special
     // loader flag to require typescript files

diff --git a/src/create-publish.mts b/src/create-publish.mts
@@ -52,10 +52,6 @@ for await (const absPath of filePaths) {
         commandModule = commandModule.default;
     }
 
-    if (typeof config === 'function') {
-        config = config(absPath, commandModule);
-    }
-
     if ((PUBLISHABLE & commandModule.type) != 0) {
         // assign defaults
         const filename = basename(absPath);
@@ -65,7 +61,10 @@ for await (const absPath of filePaths) {
         commandModule.meta = {
             absPath
         }
-
+        commandModule.absPath = absPath;
+        if (typeof config === 'function') {
+            config = config(absPath, commandModule);
+        }
         modules.push({ commandModule, config });
     }
 }
@@ -129,9 +128,9 @@ const makePublishData = ({ commandModule, config }: Record<string, Record<string
             integration_types: (config?.integrationTypes ?? ['Guild']).map(
                 (s: string) => {
                     if(s === "Guild") {
-                        return 0
+                        return "0"
                     } else if (s == "User") {
-                        return 1
+                        return "1"
                     } else {
                         throw Error("IntegrationType is not one of Guild (0) or User (1)");
                     }
@@ -259,7 +258,6 @@ const remoteData = {
     global: globalCommandsResponse,
     ...Object.fromEntries(guildCommandMapResponse),
 };
-
 await writeFile(resolve(cacheDir, 'command-data-remote.json'), JSON.stringify(remoteData, null, 4), 'utf8');
 
 // TODO: add this in a verbose flag

diff --git a/src/rest.ts b/src/rest.ts
@@ -4,12 +4,12 @@ const baseURL = new URL('https://discord.com/api/v10/applications/');
 
 const excludedKeys = new Set(['command', 'absPath']);
 
-const publishablesIntoJson = (ps: PublishableModule[]) =>
-    JSON.stringify(
+const publishablesIntoJson = (ps: PublishableModule[]) => {
+    const s = JSON.stringify(
         ps.map((module) => module.data),
-        (key, value) => (excludedKeys.has(key) ? undefined : value),
-        4
-    );
+        (key, value) => (excludedKeys.has(key) ? undefined : value), 4);
+    return s;
+}
 
 export const create = async (token: string) => {
     const headers = {