@squiz/dxp-cli-next 5.18.0-develop.1 → 5.18.0

package/lib/cmp/deploy.js

@@ -50,9 +50,6 @@ const deployCommand = new commander_1.Command()
     .argument('<source>', 'folder containing a manifest.json file')
     .addOption(new commander_1.Option('-cu, --component-service-url <string>', 'Override the component service url from login').env('COMPONENT_SERVICE_URL'))
     .addOption(new commander_1.Option('-t, --tenant <string>', 'Tenant ID to deploy to. If not provided will use configured tenant from login'))
-    .addOption(new commander_1.Option('--type <type>', 'Type of component to deploy')
-    .choices(['edge', 'sandbox'])
-    .default('sandbox'))
     .action((source, options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     if (process.env.COMPONENT_SERVICE_URL !== undefined) {
@@ -67,19 +64,19 @@ const deployCommand = new commander_1.Command()
         console.warn(cli_color_1.default.yellow('WARN: Component service URL no longer requires /v1/ suffix'));
     }
     try {
+        const def = yield definitions_1.ComponentDefinition.load(source);
+        if (!def) {
+            throw new Error('Invalid definition');
+        }
         const componentServiceUrl = ((_b = options.componentServiceUrl) === null || _b === void 0 ? void 0 : _b.replace(/v1\/?$/, '')) ||
             (yield buildComponentServiceUrl(options.tenant));
-        if (options.type === 'sandbox') {
+        if (def.type === 'server') {
             return yield (0, component_cli_lib_1.uploadComponentFolder)(apiService.client, componentServiceUrl, source);
         }
-        if (options.type === 'edge') {
+        if (def.type === 'edge') {
             if (process.env.FEATURE_EDGE_COMPONENTS !== 'true') {
                 throw new Error('Component type "edge" is still in development. Run with environment variable "FEATURE_EDGE_COMPONENTS=true" to enable');
             }
-            const def = yield definitions_1.ComponentDefinition.load(source);
-            if (!def) {
-                throw new Error('Invalid definition');
-            }
             const dxpCacheDirPath = path.resolve(source, '.dxp');
             yield fs.mkdir(dxpCacheDirPath, { recursive: true });
             const outputDir = yield fs.mkdtemp(path.resolve(dxpCacheDirPath, 'cmp-'));

package/lib/cmp/utils/definitions.d.ts

@@ -9,5 +9,6 @@ export declare class ComponentDefinition {
         entry: string;
     };
     get manifestPath(): string;
+    get type(): "edge" | "server";
     copyManifest(copyDir: string): Promise<void>;
 }

package/lib/cmp/utils/definitions.js

@@ -62,6 +62,9 @@ class ComponentDefinition {
     get manifestPath() {
         return path.resolve(this.baseDir, 'manifest.json');
     }
+    get type() {
+        return this.definition.type;
+    }
     copyManifest(copyDir) {
         return __awaiter(this, void 0, void 0, function* () {
             yield fs.copyFile(this.manifestPath, path.resolve(copyDir, 'manifest.json'));
@@ -85,5 +88,5 @@ const BasicDefinition = zod_1.z.object({
         entry: zod_1.z.string(),
     }))
         .refine(fns => new Set(fns.map(f => f.name)).size === fns.length),
-    type: zod_1.z.enum(['edge', 'sandbox']).optional().default('sandbox'),
+    type: zod_1.z.enum(['edge', 'server']).optional().default('server'),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.18.0-develop.1",
+  "version": "5.18.0",
   "repository": {
     "url": "https://gitlab.squiz.net/dxp/dxp-cli-next"
   },