@forge/manifest 12.0.0 → 12.1.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @forge/manifest
 
+## 12.1.0-next.1
+
+### Patch Changes
+
+- fa9b5aa: Update manifest definitions
+
+## 12.1.0-next.0
+
+### Minor Changes
+
+- 19807bf: Changed schema for container resources
+
 ## 12.0.0
 
 ### Major Changes

package/out/index.d.ts

@@ -8,6 +8,6 @@ export * from './text';
 export * from './types';
 export * from './utils';
 export * from './validators';
-export { Modules, ManifestSchema, App, Resources, Permissions, Remotes, Fetch, Providers, Backend, Client, Frames, Navigation, Images, Media, Services, Scripts1, Styles1, Scopes, Content1, Fonts, Translations, ForgeSupportedLocaleCode, External } from './schema/manifest';
+export { Modules, ManifestSchema, App, Resources, Permissions, Remotes, Fetch, Providers, Backend, Client, Frames, Navigation, Images, Media, Services, Containers, Scripts1, Styles1, Scopes, Content1, Fonts, Translations, ForgeSupportedLocaleCode, External } from './schema/manifest';
 export declare const validate: (basic?: boolean, manifest?: string | undefined) => Promise<ManifestValidationResult<ManifestSchema | BasicManifestSchema>>;
 //# sourceMappingURL=index.d.ts.map

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAmB,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,OAAO,EACL,OAAO,EACP,cAAc,EACd,GAAG,EACH,SAAS,EACT,WAAW,EACX,OAAO,EACP,KAAK,EACL,SAAS,EACT,OAAO,EACP,MAAM,EACN,MAAM,EACN,UAAU,EACV,MAAM,EACN,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,MAAM,EACN,QAAQ,EACR,KAAK,EACL,YAAY,EACZ,wBAAwB,EACxB,QAAQ,EACT,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,QAAQ,+BAET,MAAM,GAAG,SAAS,KAC3B,QAAQ,yBAAyB,cAAc,GAAG,mBAAmB,CAAC,CAInD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAmB,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,OAAO,EACL,OAAO,EACP,cAAc,EACd,GAAG,EACH,SAAS,EACT,WAAW,EACX,OAAO,EACP,KAAK,EACL,SAAS,EACT,OAAO,EACP,MAAM,EACN,MAAM,EACN,UAAU,EACV,MAAM,EACN,KAAK,EACL,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAO,EACP,MAAM,EACN,QAAQ,EACR,KAAK,EACL,YAAY,EACZ,wBAAwB,EACxB,QAAQ,EACT,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,QAAQ,+BAET,MAAM,GAAG,SAAS,KAC3B,QAAQ,yBAAyB,cAAc,GAAG,mBAAmB,CAAC,CAInD,CAAC"}

package/out/schema/manifest-schema.json

@@ -29944,17 +29944,29 @@
                 }
             }
         },
+        "ContainerCpuResourceSchema": {
+            "type": "string",
+            "pattern": "^([0-9]+m|[0-9]+(\\.[0-9]+)?)$"
+        },
+        "ContainerMemoryResourceSchema": {
+            "type": "string",
+            "pattern": "^[0-9]+[GM]i$"
+        },
         "ContainerResourcesSchema": {
             "type": "object",
             "additionalProperties": false,
+            "required": [
+                "cpu",
+                "memory"
+            ],
             "properties": {
                 "cpu": {
-                    "type": "number",
-                    "description": "The amount of CPU to be allocated to the container"
+                    "$ref": "#/definitions/ContainerCpuResourceSchema",
+                    "description": "The reserved amount of CPU for the container"
                 },
                 "memory": {
-                    "type": "number",
-                    "description": "The amount of memory to be allocated to the container"
+                    "$ref": "#/definitions/ContainerMemoryResourceSchema",
+                    "description": "The reserved amount of memory for the container"
                 }
             }
         },
@@ -30035,7 +30047,8 @@
                 "required": [
                     "key",
                     "tag",
-                    "health"
+                    "health",
+                    "resources"
                 ],
                 "additionalProperties": false,
                 "properties": {

package/out/schema/manifest.d.ts

@@ -802,7 +802,7 @@ export type Containers = {
   key: string;
   tag: string;
   health: Health;
-  resources?: Resources1;
+  resources: Resources1;
   tunnel?: ContainerTunnelConfig;
 }[];
 export type Services = {
@@ -74030,13 +74030,13 @@ export interface Health {
 }
 export interface Resources1 {
   /**
-   * The amount of CPU to be allocated to the container
+   * The reserved amount of CPU for the container
    */
-  cpu?: number;
+  cpu: string;
   /**
-   * The amount of memory to be allocated to the container
+   * The reserved amount of memory for the container
    */
-  memory?: number;
+  memory: string;
 }
 export interface ContainerTunnelConfig {
   docker: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/manifest",
-  "version": "12.0.0",
+  "version": "12.1.0-next.1",
   "description": "Definitions and validations of the Forge manifest",
   "main": "out/index.js",
   "scripts": {