@infoxchange/make-it-so 2.7.0 → 2.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/cdk-constructs/IxBucket.d.ts.map +1 -1
  2. package/dist/cdk-constructs/IxBucket.js +3 -1
  3. package/dist/cdk-constructs/IxNextjsSite.js +1 -1
  4. package/dist/cdk-constructs/IxStaticSite.js +1 -1
  5. package/dist/lib/site/support.d.ts +1 -1
  6. package/dist/lib/site/support.d.ts.map +1 -1
  7. package/dist/lib/site/support.js +2 -2
  8. package/package.json +2 -1
  9. package/src/cdk-constructs/IxBucket.ts +10 -5
  10. package/src/cdk-constructs/IxNextjsSite.ts +1 -1
  11. package/src/cdk-constructs/IxStaticSite.ts +1 -1
  12. package/src/lib/site/support.ts +3 -2
package/dist/cdk-constructs/IxBucket.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IxBucket.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxBucket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAIxC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9D,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3D,KAAK,cAAc,GAAG,OAAO,CAAC,qBAAqB,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAElF,qBAAa,QAAS,SAAQ,MAAM;gBAEhC,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,WAAW,EACf,KAAK,GAAE,cAAmB;CAiB5B"}
1
+ {"version":3,"file":"IxBucket.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxBucket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAIxC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9D,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3D,KAAK,cAAc,GAAG,OAAO,CAC3B,qBAAqB,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,EACvC,SAAS,CACV,CAAC;AAEF,qBAAa,QAAS,SAAQ,MAAM;gBAEhC,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,WAAW,EACf,KAAK,GAAE,cAAmB;CAmB7B"}
package/dist/cdk-constructs/IxBucket.js CHANGED
@@ -10,7 +10,9 @@ export class IxBucket extends Bucket {
10
10
  ...props.cdk,
11
11
  bucket: {
12
12
  enforceSSL: true,
13
- ...(ixDeployConfig.isIxDeploy ? { encryption: BucketEncryption.S3_MANAGED } : {}),
13
+ ...(ixDeployConfig.isIxDeploy
14
+ ? { encryption: BucketEncryption.S3_MANAGED }
15
+ : {}),
14
16
  ...props.cdk?.bucket,
15
17
  },
16
18
  },
package/dist/cdk-constructs/IxNextjsSite.js CHANGED
@@ -30,6 +30,6 @@ export class IxNextjsSite extends NextjsSite {
30
30
  return getPrimaryDomain(this, this.props);
31
31
  }
32
32
  get primaryOrigin() {
33
- return getPrimaryOrigin(this.props);
33
+ return getPrimaryOrigin(this, this.props);
34
34
  }
35
35
  }
package/dist/cdk-constructs/IxStaticSite.js CHANGED
@@ -32,6 +32,6 @@ export class IxStaticSite extends StaticSite {
32
32
  return getPrimaryDomain(this, this.propsExtended);
33
33
  }
34
34
  get primaryOrigin() {
35
- return getPrimaryOrigin(this.propsExtended);
35
+ return getPrimaryOrigin(this, this.propsExtended);
36
36
  }
37
37
  }
package/dist/lib/site/support.d.ts CHANGED
@@ -18,7 +18,7 @@ export declare function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(s
18
18
  export declare function setupDnsRecords<Instance extends NextjsSite | StaticSite, Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(instance: Instance, scope: Construct, id: string, props: Readonly<Props>): void;
19
19
  export declare function getCustomDomains<Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(props: Readonly<Props>): string[];
20
20
  export declare function getPrimaryDomain<Instance extends NextjsSite | StaticSite, Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(instance: Instance, props: Readonly<Props>): string | null;
21
- export declare function getPrimaryOrigin<Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(props: Readonly<Props>): string | null;
21
+ export declare function getPrimaryOrigin<Instance extends NextjsSite | StaticSite, Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(instance: Instance, props: Readonly<Props>): string | null;
22
22
  export declare function getPrimaryCustomDomain<Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(props: Readonly<Props>): string | null;
23
23
  export declare function getAliasDomain<Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(props: Readonly<Props>): string | null;
24
24
  export declare function getAlternativeDomains<Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(props: Readonly<Props>): string[];
package/dist/lib/site/support.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../../src/lib/site/support.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../../src/lib/site/support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EACL,UAAU,EACV,eAAe,EACf,UAAU,EACV,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAQxB,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAE9E,MAAM,MAAM,qBAAqB,GAAG,uBAAuB,GAAG;IAC5D,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;CACpC,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,GAAG;IAC5E,YAAY,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAC;CAC/C,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,GAAG;IAC5E,YAAY,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAC;CAC/C,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAiB7D;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAyB7D;AAED,wBAAgB,wBAAwB,CACtC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CA2B7D;AAED,wBAAgB,eAAe,CAAC,KAAK,SAAS,uBAAuB,EACnE,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GACrB,KAAK,CAqBP;AAED,wBAAgB,eAAe,CAC7B,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAE/D,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GACrB,IAAI,CAmBN;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,EAAE,CAWlC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAM3D;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAG3D;AAED,wBAAgB,sBAAsB,CACpC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAOvC;AAED,wBAAgB,cAAc,CAC5B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAKvC;AAED,wBAAgB,qBAAqB,CACnC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,EAAE,CAKlC"}
package/dist/lib/site/support.js CHANGED
@@ -119,8 +119,8 @@ export function getPrimaryDomain(instance, props) {
119
119
  instance.cdk?.distribution?.distributionDomainName ??
120
120
  null);
121
121
  }
122
- export function getPrimaryOrigin(props) {
123
- const primaryDomain = getPrimaryCustomDomain(props);
122
+ export function getPrimaryOrigin(instance, props) {
123
+ const primaryDomain = getPrimaryDomain(instance, props);
124
124
  return primaryDomain ? `https://${primaryDomain}` : null;
125
125
  }
126
126
  export function getPrimaryCustomDomain(props) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@infoxchange/make-it-so",
3
- "version": "2.7.0",
3
+ "version": "2.7.1",
4
4
  "description": "Makes deploying services to IX infra easy",
5
5
  "repository": "github:infoxchange/make-it-so",
6
6
  "type": "module",
@@ -8,6 +8,7 @@
8
8
  "build": "tsc",
9
9
  "test": "vitest",
10
10
  "lint": "eslint . --fix && prettier . --write",
11
+ "lint:check": "eslint . && prettier . --check",
11
12
  "prepare": "husky",
12
13
  "commit": "lint-staged && commit"
13
14
  },
package/src/cdk-constructs/IxBucket.ts CHANGED
@@ -4,7 +4,10 @@ import ixDeployConfig from "../deployConfig.js";
4
4
 
5
5
  type ConstructScope = ConstructorParameters<typeof Bucket>[0];
6
6
  type ConstructId = ConstructorParameters<typeof Bucket>[1];
7
- type ConstructProps = Exclude<ConstructorParameters<typeof Bucket>[2], undefined>;
7
+ type ConstructProps = Exclude<
8
+ ConstructorParameters<typeof Bucket>[2],
9
+ undefined
10
+ >;
8
11
 
9
12
  export class IxBucket extends Bucket {
10
13
  constructor(
@@ -19,12 +22,14 @@ export class IxBucket extends Bucket {
19
22
  ...props.cdk,
20
23
  bucket: {
21
24
  enforceSSL: true,
22
- ...(ixDeployConfig.isIxDeploy ? { encryption: BucketEncryption.S3_MANAGED } : {}),
25
+ ...(ixDeployConfig.isIxDeploy
26
+ ? { encryption: BucketEncryption.S3_MANAGED }
27
+ : {}),
23
28
  ...props.cdk?.bucket,
24
29
  },
25
-
26
30
  },
27
- }
31
+ };
28
32
 
29
33
  super(scope, id, bucketProps);
30
- }}
34
+ }
35
+ }
package/src/cdk-constructs/IxNextjsSite.ts CHANGED
@@ -60,6 +60,6 @@ export class IxNextjsSite extends NextjsSite {
60
60
  }
61
61
 
62
62
  public get primaryOrigin(): string | null {
63
- return getPrimaryOrigin(this.props);
63
+ return getPrimaryOrigin(this, this.props);
64
64
  }
65
65
  }
package/src/cdk-constructs/IxStaticSite.ts CHANGED
@@ -62,6 +62,6 @@ export class IxStaticSite extends StaticSite {
62
62
  }
63
63
 
64
64
  public get primaryOrigin(): string | null {
65
- return getPrimaryOrigin(this.propsExtended);
65
+ return getPrimaryOrigin(this, this.propsExtended);
66
66
  }
67
67
  }
package/src/lib/site/support.ts CHANGED
@@ -189,9 +189,10 @@ export function getPrimaryDomain<
189
189
  }
190
190
 
191
191
  export function getPrimaryOrigin<
192
+ Instance extends NextjsSite | StaticSite,
192
193
  Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps,
193
- >(props: Readonly<Props>): string | null {
194
- const primaryDomain = getPrimaryCustomDomain(props);
194
+ >(instance: Instance, props: Readonly<Props>): string | null {
195
+ const primaryDomain = getPrimaryDomain(instance, props);
195
196
  return primaryDomain ? `https://${primaryDomain}` : null;
196
197
  }
197
198