@devvit/cli 0.11.1 → 0.11.2-next-2024-10-21-6031c79bc.0

package/dist/commands/bundle/actor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actor.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/actor.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAKvE,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,cAAc;;IACrD,OAAgB,WAAW,SAAsC;IAEjE,OAAgB,QAAQ,WAAsC;IAE9D,OAAgB,IAAI;;MAOlB;IAEF,OAAgB,MAAM,UAAQ;IAExB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA8C3B"}
+{"version":3,"file":"actor.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/actor.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAKvE,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,cAAc;;IACrD,OAAgB,WAAW,SAAsC;IAEjE,OAAgB,QAAQ,WAAsC;IAE9D,OAAgB,IAAI;;MAOlB;IAEF,OAAgB,MAAM,UAAQ;IAExB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0D3B"}

package/dist/commands/bundle/actor.js

@@ -3,11 +3,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _BundleActor_instances, _BundleActor_getOwnerUsername;
+var _BundleActor_instances, _BundleActor_makeBundles, _BundleActor_getOwnerUsername;
 import { mkdir, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { Bundle } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
-import { ActorSpec } from '@devvit/protos/types/devvit/runtime/bundle.js';
+import { ActorSpec, TargetRuntime } from '@devvit/protos/types/devvit/runtime/bundle.js';
 import { Args } from '@oclif/core';
 import { getAccessToken } from '../../util/auth.js';
 import { Bundler } from '../../util/Bundler.js';
@@ -25,20 +25,29 @@ class BundleActor extends ProjectCommand {
         const { args } = await this.parse(BundleActor);
         const username = await __classPrivateFieldGet(this, _BundleActor_instances, "m", _BundleActor_getOwnerUsername).call(this);
         const config = await readDevvitConfig(this.projectRoot, this.configFile);
-        const actorName = args.name;
-        const actorBundler = new Bundler();
-        const bundle = await actorBundler.bundle(this.projectRoot, ActorSpec.fromPartial({
-            name: actorName,
+        const actorSpec = ActorSpec.fromPartial({
+            name: args.name,
             owner: username,
             version: config.version,
-        }));
-        await readAndInjectBundleProducts(this.projectRoot, bundle, false);
-        await mkdir(path.join(this.projectRoot, distDirFilename), { recursive: true });
-        await writeFile(path.join(this.projectRoot, distDirFilename, `${actorName}.bundle.json`), JSON.stringify(Bundle.toJSON(bundle)));
-        this.log(`Successfully bundled actor: ${actorName}`);
+        });
+        await __classPrivateFieldGet(this, _BundleActor_instances, "m", _BundleActor_makeBundles).call(this, actorSpec);
+        this.log(`Successfully bundled actor: ${actorSpec.name}`);
     }
 }
-_BundleActor_instances = new WeakSet(), _BundleActor_getOwnerUsername = async function _BundleActor_getOwnerUsername() {
+_BundleActor_instances = new WeakSet(), _BundleActor_makeBundles = async function _BundleActor_makeBundles(actorSpec) {
+    const actorBundler = new Bundler();
+    const bundles = await actorBundler.bundle(this.projectRoot, actorSpec);
+    await Promise.all(bundles.map(async (bundle) => {
+        const target = bundle.buildInfo?.targetRuntime ?? TargetRuntime.UNIVERSAL;
+        let type = '';
+        if (target === TargetRuntime.CLIENT) {
+            type = '.client';
+        }
+        await readAndInjectBundleProducts(this.projectRoot, bundle, false);
+        await mkdir(path.join(this.projectRoot, distDirFilename), { recursive: true });
+        await writeFile(path.join(this.projectRoot, distDirFilename, `${actorSpec.name}.bundle${type}.json`), JSON.stringify(Bundle.toJSON(bundle)));
+    }));
+}, _BundleActor_getOwnerUsername = async function _BundleActor_getOwnerUsername() {
     let username = '';
     try {
         const token = await getAccessToken();

package/dist/commands/login.d.ts

@@ -1,5 +1,6 @@
 import { DevvitCommand } from '../util/commands/DevvitCommand.js';
 export default class Login extends DevvitCommand {
+    #private;
     static description: string;
     static flags: {
         'copy-paste': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;

package/dist/commands/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,aAAa;IAC9C,OAAgB,WAAW,SAAqC;IAEhE,OAAgB,KAAK;;MAOnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAe3B"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,aAAa;;IAC9C,OAAgB,WAAW,SAAqC;IAEhE,OAAgB,KAAK;;MAOnB;IAaI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgB3B"}

package/dist/commands/login.js

@@ -1,16 +1,38 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _Login_event;
 import { Flags } from '@oclif/core';
 import { getAccessTokenAndLoginIfNeeded, getOAuthSvc } from '../util/auth.js';
 import { DevvitCommand } from '../util/commands/DevvitCommand.js';
+import { sendEvent } from '../util/metrics.js';
 class Login extends DevvitCommand {
+    constructor() {
+        super(...arguments);
+        _Login_event.set(this, {
+            source: 'devplatform_cli',
+            action: 'ran',
+            noun: 'login',
+            devplatform: {
+                cli_raw_command_line: 'devvit ' + process.argv.slice(2).join(' '),
+                cli_is_valid_command: true,
+                cli_command: 'login',
+            },
+        });
+    }
     async run() {
         const { flags: { 'copy-paste': copyPaste }, } = await this.parse(Login);
         // Clearing a local token before attempting to login (in case the token has expired, for example)
         await getOAuthSvc().Logout({});
         const token = await getAccessTokenAndLoginIfNeeded(copyPaste);
         const username = await this.getUserDisplayName(token);
+        await sendEvent(__classPrivateFieldGet(this, _Login_event, "f"));
         this.log(`Logged in as ${username}\n\n\`devvit new\` to create a new project\n\`devvit --help\` for more commands\n`);
     }
 }
+_Login_event = new WeakMap();
 Login.description = 'Log in to Devvit via reddit.com';
 Login.flags = {
     'copy-paste': Flags.boolean({

package/dist/commands/playtest.d.ts

@@ -13,5 +13,5 @@ export default class Playtest extends Upload {
     checkVersionBuildStatus(appVersionInfo: AppVersionInfo): Promise<boolean>;
     run(): Promise<void>;
 }
-export declare function modifyBundleVersion(bundle: Bundle, version: string): void;
+export declare function modifyBundleVersions(bundles: Bundle[], version: string): void;
 //# sourceMappingURL=playtest.d.ts.map

package/dist/commands/playtest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playtest.d.ts","sourceRoot":"","sources":["../../src/commands/playtest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,6BAA6B,CAAC;AAWxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kEAAkE,CAAC;AAc/F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAOtE,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAgB3C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,MAAM;;IAC1C,OAAgB,WAAW,SACgK;IAE3L,OAAgB,QAAQ,WAItB;IAEF,WAAoB,KAAK,IAAI,SAAS,CAoBrC;IAED,OAAgB,IAAI;;MAMlB;IAmCI,uBAAuB,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBhE,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkTpC;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAKzE"}
+{"version":3,"file":"playtest.d.ts","sourceRoot":"","sources":["../../src/commands/playtest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,6BAA6B,CAAC;AAWxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kEAAkE,CAAC;AAc/F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAOtE,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAgB3C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,MAAM;;IAC1C,OAAgB,WAAW,SACgK;IAE3L,OAAgB,QAAQ,WAItB;IAEF,WAAoB,KAAK,IAAI,SAAS,CAoBrC;IAED,OAAgB,IAAI;;MAMlB;IAmCI,uBAAuB,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBhE,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsTpC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAO7E"}

package/dist/commands/playtest.js

@@ -9,7 +9,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _Playtest_instances, _a, _Playtest_installationsClient, _Playtest_appLogSub, _Playtest_bundler, _Playtest_existingInstallInfo, _Playtest_appInfo, _Playtest_version, _Playtest_lastBundle, _Playtest_lastQueuedBundle, _Playtest_isOnWatchExecuting, _Playtest_server, _Playtest_flags, _Playtest_watchAssets, _Playtest_getExistingInstallInfo, _Playtest_newAppLogSub, _Playtest_onWatch, _Playtest_onWatchError, _Playtest_onExit;
+var _Playtest_instances, _a, _Playtest_installationsClient, _Playtest_appLogSub, _Playtest_bundler, _Playtest_existingInstallInfo, _Playtest_appInfo, _Playtest_version, _Playtest_lastBundles, _Playtest_lastQueuedBundles, _Playtest_isOnWatchExecuting, _Playtest_server, _Playtest_flags, _Playtest_watchAssets, _Playtest_getExistingInstallInfo, _Playtest_newAppLogSub, _Playtest_onWatch, _Playtest_onWatchError, _Playtest_onExit;
 import { BuildStatus, GetAllWithInstallLocationRequest, InstallationCreationRequest, InstallationType, InstallationUpgradeRequest, UUID, VersionVisibility, } from '@devvit/protos/community.js';
 import { Severity } from '@devvit/protos/types/devvit/plugin/logger/logger.js';
 import { RemoteLogType } from '@devvit/protos/types/devvit/remote_logger/remote_logger.js';
@@ -47,13 +47,13 @@ class Playtest extends Upload {
         _Playtest_existingInstallInfo.set(this, void 0);
         _Playtest_appInfo.set(this, void 0);
         _Playtest_version.set(this, void 0);
-        _Playtest_lastBundle.set(this, void 0);
-        _Playtest_lastQueuedBundle.set(this, void 0);
+        _Playtest_lastBundles.set(this, void 0);
+        _Playtest_lastQueuedBundles.set(this, void 0);
         _Playtest_isOnWatchExecuting.set(this, false);
         _Playtest_server.set(this, void 0);
         _Playtest_flags.set(this, void 0);
         _Playtest_watchAssets.set(this, void 0);
-        _Playtest_onWatch.set(this, async (bundle, subreddit) => {
+        _Playtest_onWatch.set(this, async (result, subreddit) => {
             /* We have to do this here because none of the rxjs functions fit this use case perfectly. What
              * we need is something that serializes this whole pipeline, but also discards all but the most
              * recent value once we resume processing. We would love to use one of these, but...
@@ -67,13 +67,16 @@ class Playtest extends Upload {
              */
             if (__classPrivateFieldGet(this, _Playtest_isOnWatchExecuting, "f")) {
                 // if we're already executing, queue this watch to be executed after we're done
-                __classPrivateFieldSet(this, _Playtest_lastQueuedBundle, bundle, "f");
+                __classPrivateFieldSet(this, _Playtest_lastQueuedBundles, result.bundles, "f");
                 return;
             }
-            if (!bundle) {
+            if (!result.bundles) {
+                return;
+            }
+            __classPrivateFieldSet(this, _Playtest_lastBundles, result.bundles, "f");
+            if (!__classPrivateFieldGet(this, _Playtest_lastBundles, "f")) {
                 return;
             }
-            __classPrivateFieldSet(this, _Playtest_lastBundle, bundle, "f");
             if (!__classPrivateFieldGet(this, _Playtest_appInfo, "f")?.app) {
                 this.error(`Something went wrong: App is not found`);
             }
@@ -88,11 +91,11 @@ class Playtest extends Upload {
                 version: __classPrivateFieldGet(this, _Playtest_version, "f").toString(),
             });
             // 3. update bundle version:
-            modifyBundleVersion(bundle, __classPrivateFieldGet(this, _Playtest_version, "f").toString());
+            modifyBundleVersions(__classPrivateFieldGet(this, _Playtest_lastBundles, "f"), __classPrivateFieldGet(this, _Playtest_version, "f").toString());
             // 4. create new playtest version:
             let appVersionInfo;
             try {
-                appVersionInfo = await this.createVersion(__classPrivateFieldGet(this, _Playtest_appInfo, "f").app, __classPrivateFieldGet(this, _Playtest_version, "f"), [bundle], VersionVisibility.PRIVATE);
+                appVersionInfo = await this.createVersion(__classPrivateFieldGet(this, _Playtest_appInfo, "f").app, __classPrivateFieldGet(this, _Playtest_version, "f"), __classPrivateFieldGet(this, _Playtest_lastBundles, "f"), VersionVisibility.PRIVATE);
             }
             catch (err) {
                 if (err instanceof Error) {
@@ -123,10 +126,10 @@ class Playtest extends Upload {
             ux.action.stop(`✅\nSuccess! Please visit your test subreddit and refresh to see your latest changes:\n✨ ${playtestUrl}\n`);
             __classPrivateFieldSet(this, _Playtest_isOnWatchExecuting, false, "f");
             // If there's a queued watch, execute it now.
-            if (__classPrivateFieldGet(this, _Playtest_lastQueuedBundle, "f")) {
-                const newerBundle = __classPrivateFieldGet(this, _Playtest_lastQueuedBundle, "f");
-                __classPrivateFieldSet(this, _Playtest_lastQueuedBundle, undefined, "f");
-                await __classPrivateFieldGet(this, _Playtest_onWatch, "f").call(this, newerBundle, subreddit); // subreddit won't change between calls!
+            if (__classPrivateFieldGet(this, _Playtest_lastQueuedBundles, "f")) {
+                const newerBundles = __classPrivateFieldGet(this, _Playtest_lastQueuedBundles, "f");
+                __classPrivateFieldSet(this, _Playtest_lastQueuedBundles, undefined, "f");
+                await __classPrivateFieldGet(this, _Playtest_onWatch, "f").call(this, { bundles: newerBundles }, subreddit); // subreddit won't change between calls!
             }
         });
         _Playtest_onWatchError.set(this, (err) => {
@@ -231,8 +234,8 @@ class Playtest extends Upload {
         const assetPaths = [assetDir, webviewAssetDir, productsJSON];
         __classPrivateFieldSet(this, _Playtest_watchAssets, chokidar.watch(assetPaths, { ignoreInitial: true }), "f");
         __classPrivateFieldGet(this, _Playtest_watchAssets, "f").on('all', () => {
-            // asset changes don't result in a code change, so just re-send the last bundle
-            void __classPrivateFieldGet(this, _Playtest_onWatch, "f").call(this, __classPrivateFieldGet(this, _Playtest_lastBundle, "f"), subreddit);
+            // asset changes don't result in a code change, so just re-send the last bundles
+            void __classPrivateFieldGet(this, _Playtest_onWatch, "f").call(this, { bundles: __classPrivateFieldGet(this, _Playtest_lastBundles, "f") }, subreddit);
         });
         // before starting playtest session, make sure app has been installed to the test subreddit:
         const appWithVersion = `${appName}@${__classPrivateFieldGet(this, _Playtest_version, "f")}`;
@@ -264,7 +267,7 @@ class Playtest extends Upload {
         // bundles through an asynchronous observable and only open a subscription
         // for errors. We just dispose the source (bundler) to unsubscribe.
         watchSrc
-            .pipe(map((bundle) => __classPrivateFieldGet(this, _Playtest_onWatch, "f").call(this, bundle, subreddit)))
+            .pipe(map((result) => __classPrivateFieldGet(this, _Playtest_onWatch, "f").call(this, result, subreddit)))
             .subscribe({ error: __classPrivateFieldGet(this, _Playtest_onWatchError, "f") });
         // We don't know when the user is done. If connected to a terminal, end when
         // stdin is closed. Otherwise, close immediately to avoid the chance that
@@ -275,7 +278,7 @@ class Playtest extends Upload {
         }
     }
 }
-_a = Playtest, _Playtest_installationsClient = new WeakMap(), _Playtest_appLogSub = new WeakMap(), _Playtest_bundler = new WeakMap(), _Playtest_existingInstallInfo = new WeakMap(), _Playtest_appInfo = new WeakMap(), _Playtest_version = new WeakMap(), _Playtest_lastBundle = new WeakMap(), _Playtest_lastQueuedBundle = new WeakMap(), _Playtest_isOnWatchExecuting = new WeakMap(), _Playtest_server = new WeakMap(), _Playtest_flags = new WeakMap(), _Playtest_watchAssets = new WeakMap(), _Playtest_onWatch = new WeakMap(), _Playtest_onWatchError = new WeakMap(), _Playtest_instances = new WeakSet(), _Playtest_getExistingInstallInfo = async function _Playtest_getExistingInstallInfo(subreddit) {
+_a = Playtest, _Playtest_installationsClient = new WeakMap(), _Playtest_appLogSub = new WeakMap(), _Playtest_bundler = new WeakMap(), _Playtest_existingInstallInfo = new WeakMap(), _Playtest_appInfo = new WeakMap(), _Playtest_version = new WeakMap(), _Playtest_lastBundles = new WeakMap(), _Playtest_lastQueuedBundles = new WeakMap(), _Playtest_isOnWatchExecuting = new WeakMap(), _Playtest_server = new WeakMap(), _Playtest_flags = new WeakMap(), _Playtest_watchAssets = new WeakMap(), _Playtest_onWatch = new WeakMap(), _Playtest_onWatchError = new WeakMap(), _Playtest_instances = new WeakSet(), _Playtest_getExistingInstallInfo = async function _Playtest_getExistingInstallInfo(subreddit) {
     const existingInstalls = await __classPrivateFieldGet(this, _Playtest_installationsClient, "f").GetAllWithInstallLocation(GetAllWithInstallLocationRequest.fromPartial({
         type: InstallationType.SUBREDDIT,
         location: subreddit,
@@ -336,11 +339,13 @@ Playtest.args = {
     }),
 };
 export default Playtest;
-export function modifyBundleVersion(bundle, version) {
+export function modifyBundleVersions(bundles, version) {
     var _b;
-    bundle.dependencies ?? (bundle.dependencies = DependencySpec.fromPartial({}));
-    (_b = bundle.dependencies).actor ?? (_b.actor = ActorSpec.fromPartial({}));
-    bundle.dependencies.actor.version = version.toString();
+    for (const bundle of bundles) {
+        bundle.dependencies ?? (bundle.dependencies = DependencySpec.fromPartial({}));
+        (_b = bundle.dependencies).actor ?? (_b.actor = ActorSpec.fromPartial({}));
+        bundle.dependencies.actor.version = version.toString();
+    }
 }
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));

package/dist/commands/upload.d.ts

@@ -1,5 +1,4 @@
-import type { AppInfo, AppVersionInfo } from '@devvit/protos/community.js';
-import { FullAppInfo, VersionVisibility } from '@devvit/protos/community.js';
+import { type AppInfo, AppVersionInfo, FullAppInfo, VersionVisibility } from '@devvit/protos/community.js';
 import type { Bundle } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
 import { DevvitVersion, VersionBumpType } from '@devvit/shared-types/Version.js';
 import type { CommandError } from '@oclif/core/lib/interfaces/index.js';

package/dist/commands/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EAIf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAGL,WAAW,EAGX,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kEAAkE,CAAC;AAmB/F,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AActE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAa5D,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,cAAc;;IAChD,OAAgB,WAAW,SAA+M;IAE1O,OAAgB,KAAK,EAAE,SAAS,CAgD9B;IAEF,QAAQ,CAAC,SAAS,kDAAqB;IACvC,QAAQ,CAAC,gBAAgB,yDAA4B;IAe/C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA4JpB,YAAY,CAChB,aAAa,EAAE,YAAY,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,WAAW,CAAC;IA2FjB,cAAc,CAClB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,eAAe,GAAG,SAAS,EACjC,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC;IAuBnB,aAAa,CACjB,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,aAAa,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,iBAAiB,GAC5B,OAAO,CAAC,cAAc,CAAC;IAoOX,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CA4M1D"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,OAAO,EACZ,cAAc,EAEd,WAAW,EAKX,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kEAAkE,CAAC;AAmB/F,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AActE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAa5D,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,cAAc;;IAChD,OAAgB,WAAW,SAA+M;IAE1O,OAAgB,KAAK,EAAE,SAAS,CAgD9B;IAEF,QAAQ,CAAC,SAAS,kDAAqB;IACvC,QAAQ,CAAC,gBAAgB,yDAA4B;IAe/C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA4JpB,YAAY,CAChB,aAAa,EAAE,YAAY,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,WAAW,CAAC;IA2FjB,cAAc,CAClB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,eAAe,GAAG,SAAS,EACjC,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC;IAuBnB,aAAa,CACjB,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,aAAa,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,iBAAiB,GAC5B,OAAO,CAAC,cAAc,CAAC;IAmOX,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CA4M1D"}

package/dist/commands/upload.js

@@ -14,7 +14,7 @@ import { exec } from 'node:child_process';
 import fs from 'node:fs';
 import fsp from 'node:fs/promises';
 import path from 'node:path';
-import { AppCapability, AppCreationRequest, FullAppInfo, InstallationType, UploadNewMediaRequest, VersionVisibility, } from '@devvit/protos/community.js';
+import { AppCapability, AppCreationRequest, AppVersionInfo, Categories, FullAppInfo, InstallationType, MediaSignature, UploadNewMediaRequest, UploadNewMediaResponse, VersionVisibility, } from '@devvit/protos/community.js';
 import { ALLOWED_ASSET_EXTENSIONS, ASSET_DIRNAME, MAX_ASSET_FOLDER_SIZE_BYTES, MAX_ASSET_GIF_SIZE, MAX_ASSET_NON_GIF_SIZE, prettyPrintSize, WEBVIEW_ASSET_DIRNAME, } from '@devvit/shared-types/Assets.js';
 import { ACTOR_SRC_PRIMARY_NAME, ASSET_HASHING_ALGO, ASSET_UPLOAD_BATCH_SIZE, MAX_ALLOWED_SUBSCRIBER_COUNT, } from '@devvit/shared-types/constants.js';
 import { APP_SLUG_BASE_MAX_LENGTH, makeSlug, sluggable } from '@devvit/shared-types/slug.js';
@@ -345,14 +345,13 @@ _Upload_event = new WeakMap(), _Upload_eventSent = new WeakMap(), _Upload_verbos
     ])).isNSFW;
 }, _Upload_bundleActors = async function _Upload_bundleActors(username, version, typecheck = true) {
     const bundler = new Bundler(typecheck);
+    const actorSpec = {
+        name: ACTOR_SRC_PRIMARY_NAME,
+        owner: username,
+        version: version,
+    };
     try {
-        return [
-            await bundler.bundle(this.projectRoot, {
-                name: ACTOR_SRC_PRIMARY_NAME,
-                owner: username,
-                version: version,
-            }),
-        ];
+        return await bundler.bundle(this.projectRoot, actorSpec);
     }
     catch (err) {
         this.error(StringUtil.caughtToString(err));

package/dist/util/Bundler.d.ts

@@ -2,11 +2,14 @@ import type { ProjectRootDir } from '@devvit/build-pack/lib/BuildPack.js';
 import { type Bundle } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
 import type { ActorSpec } from '@devvit/protos/types/devvit/runtime/bundle.js';
 import type { Observable } from 'rxjs';
+export type BundlerResult = {
+    bundles: Bundle[] | undefined;
+};
 export declare class Bundler {
     #private;
     constructor(typecheckEnabled?: boolean);
-    bundle(root: ProjectRootDir, actorSpec: ActorSpec): Promise<Bundle>;
+    bundle(root: ProjectRootDir, actorSpec: ActorSpec): Promise<Bundle[]>;
     dispose(): Promise<void>;
-    watch(root: ProjectRootDir, actorSpec: ActorSpec): Observable<Bundle | undefined>;
+    watch(root: ProjectRootDir, actorSpec: ActorSpec): Observable<BundlerResult>;
 }
 //# sourceMappingURL=Bundler.d.ts.map

package/dist/util/Bundler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Bundler.d.ts","sourceRoot":"","sources":["../../src/util/Bundler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EACL,KAAK,MAAM,EAEZ,MAAM,kEAAkE,CAAC;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAKvC,qBAAa,OAAO;;gBAGN,gBAAgB,GAAE,OAAc;IAUtC,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBnE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,KAAK,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;CAWlF"}
+{"version":3,"file":"Bundler.d.ts","sourceRoot":"","sources":["../../src/util/Bundler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EACL,KAAK,MAAM,EAEZ,MAAM,kEAAkE,CAAC;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAKvC,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,qBAAa,OAAO;;gBAGN,gBAAgB,GAAE,OAAc;IAUtC,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAqBrE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,KAAK,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC,aAAa,CAAC;CAW7E"}

package/dist/util/Bundler.js

@@ -33,10 +33,10 @@ export class Bundler {
         if (compiledRes.errors.length > 0) {
             throw new Error(formatLogs(compiledRes.errors));
         }
-        if (compiledRes.bundle == null) {
+        if (compiledRes.bundles.length === 0) {
             throw new Error('Missing bundle');
         }
-        return compiledRes.bundle;
+        return compiledRes.bundles;
     }
     async dispose() {
         await __classPrivateFieldGet(this, _Bundler_buildPack, "f").dispose();
@@ -49,7 +49,7 @@ export class Bundler {
                 console.warn(formatLogs(rsp.warnings));
             if (rsp.errors.length > 0)
                 console.error(formatLogs(rsp.errors));
-            return rsp.bundle;
+            return { bundles: rsp.bundles };
         }));
     }
 }

package/dist/util/Bundler.test.js

@@ -19,9 +19,10 @@ test('watch touched source', async () => {
     });
     const [init, first] = await lastValueFrom(observable.pipe(take(2), toArray()));
     // An empty message is sent initially.
-    expect(init).toBeUndefined();
+    expect(init).not.toBeUndefined();
+    expect(init.bundles).toHaveLength(0);
     expect(first).toBeDefined();
-    expect(first.code.length).toBeGreaterThan(0);
+    expect(first.bundles[0].code.length).toBeGreaterThan(0);
     // Observe a second bundle.
     const second = lastValueFrom(observable.pipe(take(1)));
     // Touch.

package/dist/util/Playtest.test.js

@@ -1,7 +1,7 @@
 import { Bundle } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
-import { modifyBundleVersion } from '../commands/playtest.js';
+import { modifyBundleVersions } from '../commands/playtest.js';
 test('bundle has a version and is modified', () => {
     const bundle = Bundle.fromPartial({});
-    modifyBundleVersion(bundle, '1.2.3.4');
+    modifyBundleVersions([bundle], '1.2.3.4');
     expect(bundle?.dependencies?.actor?.version).toBe('1.2.3.4');
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devvit/cli",
-  "version": "0.11.1",
+  "version": "0.11.2-next-2024-10-21-6031c79bc.0",
   "description": "Reddit's Dev Platform CLI Tool",
   "license": "BSD-3-Clause",
   "author": "@reddit/dev-platform",
@@ -42,11 +42,11 @@
   },
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@devvit/build-pack": "0.11.1",
+    "@devvit/build-pack": "0.11.2-next-2024-10-21-6031c79bc.0",
     "@devvit/play": "0.0.43",
-    "@devvit/protos": "0.11.1",
-    "@devvit/public-api": "0.11.1",
-    "@devvit/shared-types": "0.11.1",
+    "@devvit/protos": "0.11.2-next-2024-10-21-6031c79bc.0",
+    "@devvit/public-api": "0.11.2-next-2024-10-21-6031c79bc.0",
+    "@devvit/shared-types": "0.11.2-next-2024-10-21-6031c79bc.0",
     "@improbable-eng/grpc-web": "0.15.0",
     "@improbable-eng/grpc-web-node-http-transport": "0.15.0",
     "@oclif/core": "2.9.4",
@@ -78,8 +78,8 @@
     "ws": "8.18.0"
   },
   "devDependencies": {
-    "@devvit/repo-tools": "0.11.1",
-    "@devvit/tsconfig": "0.11.1",
+    "@devvit/repo-tools": "0.11.2-next-2024-10-21-6031c79bc.0",
+    "@devvit/tsconfig": "0.11.2-next-2024-10-21-6031c79bc.0",
     "@types/file-type": "10.9.1",
     "@types/inquirer": "9.0.3",
     "@types/js-yaml": "4.0.5",
@@ -120,5 +120,5 @@
       ]
     }
   },
-  "gitHead": "b7e0214655df6dcdd70c7944b9a14b0d752577ae"
+  "gitHead": "64bf8365618211a456e19a130f1352a6ff7692dc"
 }