@infoxchange/make-it-so 2.9.0-internal-testing-set-http-proxy-env-var-2.2 → 2.9.0-internal-testing-set-http-proxy-env-var-2.4

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 (6) hide show
  1. package/dist/cdk-constructs/IxNextjsSite.d.ts.map +1 -1
  2. package/dist/cdk-constructs/IxNextjsSite.js +3 -0
  3. package/dist/lib/site/support.js +1 -1
  4. package/package.json +1 -1
  5. package/src/cdk-constructs/IxNextjsSite.ts +7 -0
  6. package/src/lib/site/support.ts +1 -1
package/dist/cdk-constructs/IxNextjsSite.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IxNextjsSite.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxNextjsSite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EACL,KAAK,uBAAuB,EAe7B,MAAM,wBAAwB,CAAC;AAEhC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAClE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,KAAK,cAAc,GAAG,uBAAuB,CAAC;AAE9C,qBAAa,YAAa,SAAQ,UAAU;gBAExC,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,WAAW,EACf,KAAK,GAAE,cAAmB;IAkB5B,IAAW,aAAa,IAAI,MAAM,EAAE,CAEnC;IAED,IAAW,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAE9C;IAED,IAAW,WAAW,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,IAAW,kBAAkB,IAAI,MAAM,EAAE,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;CACF"}
1
+ {"version":3,"file":"IxNextjsSite.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxNextjsSite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EACL,KAAK,uBAAuB,EAe7B,MAAM,wBAAwB,CAAC;AAEhC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAClE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,KAAK,cAAc,GAAG,uBAAuB,CAAC;AAE9C,qBAAa,YAAa,SAAQ,UAAU;gBAExC,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,WAAW,EACf,KAAK,GAAE,cAAmB;IAyB5B,IAAW,aAAa,IAAI,MAAM,EAAE,CAEnC;IAED,IAAW,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAE9C;IAED,IAAW,WAAW,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,IAAW,kBAAkB,IAAI,MAAM,EAAE,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;CACF"}
package/dist/cdk-constructs/IxNextjsSite.js CHANGED
@@ -4,13 +4,16 @@ import { getAliasDomain, getAlternativeDomains, getCustomDomains, getPrimaryCust
4
4
  export class IxNextjsSite extends NextjsSite {
5
5
  constructor(scope, id, props = {}) {
6
6
  if (ixDeployConfig.isIxDeploy) {
7
+ console.log("props before", props);
7
8
  props = setupVpcDetails(scope, id, props);
9
+ console.log("props after", props);
8
10
  props = setupCustomDomain(scope, id, props);
9
11
  props = setupCertificate(scope, id, props);
10
12
  props = setupDomainAliasRedirect(scope, id, props);
11
13
  }
12
14
  props = setupDefaultEnvVars(scope, id, props);
13
15
  props = applyConditionalEnvironmentVariables(scope, id, props);
16
+ console.log("parentCompatibleSsrProps(props)", parentCompatibleSsrProps(props));
14
17
  super(scope, id, parentCompatibleSsrProps(props));
15
18
  if (ixDeployConfig.isIxDeploy) {
16
19
  setupDnsRecords(this, scope, id, props);
package/dist/lib/site/support.js CHANGED
@@ -96,7 +96,7 @@ export function setupVpcDetails(scope, id, props) {
96
96
  if (!updatedProps.cdk?.revalidation ||
97
97
  !("vpc" in updatedProps.cdk.revalidation)) {
98
98
  console.log("adding vpc for revalidation server");
99
- updatedProps.cdk = props.cdk ?? {};
99
+ updatedProps.cdk = updatedProps.cdk ?? {};
100
100
  updatedProps.cdk.revalidation = {
101
101
  ...updatedProps.cdk.revalidation,
102
102
  vpc: vpcDetails.vpc,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@infoxchange/make-it-so",
3
- "version": "2.9.0-internal-testing-set-http-proxy-env-var-2.2",
3
+ "version": "2.9.0-internal-testing-set-http-proxy-env-var-2.4",
4
4
  "description": "Makes deploying services to IX infra easy",
5
5
  "repository": "github:infoxchange/make-it-so",
6
6
  "type": "module",
package/src/cdk-constructs/IxNextjsSite.ts CHANGED
@@ -29,7 +29,9 @@ export class IxNextjsSite extends NextjsSite {
29
29
  props: ConstructProps = {},
30
30
  ) {
31
31
  if (ixDeployConfig.isIxDeploy) {
32
+ console.log("props before", props);
32
33
  props = setupVpcDetails(scope, id, props);
34
+ console.log("props after", props);
33
35
  props = setupCustomDomain(scope, id, props);
34
36
  props = setupCertificate(scope, id, props);
35
37
  props = setupDomainAliasRedirect(scope, id, props);
@@ -37,6 +39,11 @@ export class IxNextjsSite extends NextjsSite {
37
39
  props = setupDefaultEnvVars(scope, id, props);
38
40
  props = applyConditionalEnvironmentVariables(scope, id, props);
39
41
 
42
+ console.log(
43
+ "parentCompatibleSsrProps(props)",
44
+ parentCompatibleSsrProps(props),
45
+ );
46
+
40
47
  super(scope, id, parentCompatibleSsrProps(props));
41
48
 
42
49
  if (ixDeployConfig.isIxDeploy) {
package/src/lib/site/support.ts CHANGED
@@ -173,7 +173,7 @@ export function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(
173
173
  !("vpc" in updatedProps.cdk.revalidation)
174
174
  ) {
175
175
  console.log("adding vpc for revalidation server");
176
- updatedProps.cdk = props.cdk ?? {};
176
+ updatedProps.cdk = updatedProps.cdk ?? {};
177
177
  updatedProps.cdk.revalidation = {
178
178
  ...updatedProps.cdk.revalidation,
179
179
  vpc: vpcDetails.vpc,