@infoxchange/make-it-so 2.19.1-internal-testing-fix-smtp-not-set-dc4effb.1 → 2.19.2

package/README.md

@@ -488,4 +488,5 @@ Commit messages must be formatted in the [Conventional Commits](https://www.conv
 
 If adding a new construct the easiest way to develop it maybe by building it in whatever app repo it is intended to be used in. When it appears to be working correctly it can be moved into make-it-so and the app can be updated to import that construct from make-it-so.
 
-To test change a change in make-it-so create a branch starting with the prefix "internal-testing-". When pushed the CI will release a new package with a pre-release version. It'll look a little something like `2.1.3-internal-testing-name-of-feature.3`. A serverless app using make-it-so can be modified to use this package version and then deployed to a dev environment to test that the make-it-so changes are functioning correctly. Once a change has been merged into main and there are no serverless apps using the pre-release package any more it's a good idea to [delete that version](https://docs.npmjs.com/unpublishing-packages-from-the-registry#unpublishing-a-single-version-of-a-package) to keep the [npm package version history clean](https://www.npmjs.com/package/@infoxchange/make-it-so?activeTab=versions).
+To test change a change in make-it-so run `npx git-publish`. This will build then pushed the built files into a
+new branch. That branch can then be used as a package.json dependency directly.

package/commitlint.config.ts

@@ -5,9 +5,7 @@ export default {
     (message) =>
       // Allow "wip" commits except when publishing a production release or on PR CI jobs
       process.env.GITHUB_EVENT_NAME !== "pull_request" &&
-      (process.env.GITHUB_WORKFLOW !== "Publish" ||
-        (process.env.GITHUB_REF_NAME?.startsWith("internal-testing-") ??
-          true)) &&
+      process.env.GITHUB_WORKFLOW !== "Publish" &&
       (message === "wip" || message.startsWith("wip:")),
   ],
   extends: ["@commitlint/config-conventional"],

package/dist/lib/tags/ConditionalTags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConditionalTags.d.ts","sourceRoot":"","sources":["../../../src/lib/tags/ConditionalTags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,qBAAa,eAAgB,YAAW,OAAO;IAE3C,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,CACf,IAAI,EAAE,UAAU,KACb,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,SAAS,GAAG,IAAI;IAG/D,KAAK,CAAC,IAAI,EAAE,UAAU;CAKvB"}
+{"version":3,"file":"ConditionalTags.d.ts","sourceRoot":"","sources":["../../../src/lib/tags/ConditionalTags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAO,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,qBAAa,eAAgB,YAAW,OAAO;IAE3C,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,CACf,IAAI,EAAE,UAAU,KACb,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,SAAS,GAAG,IAAI;IAG/D,KAAK,CAAC,IAAI,EAAE,UAAU;CAOvB"}

package/dist/lib/tags/ConditionalTags.js

@@ -1,4 +1,4 @@
-import { Tags } from "aws-cdk-lib";
+import { Aspects, Tag } from "aws-cdk-lib";
 export class ConditionalTags {
     getTags;
     constructor(getTags) {
@@ -6,7 +6,9 @@ export class ConditionalTags {
     }
     visit(node) {
         this.getTags(node)?.forEach(({ key, value }) => {
-            Tags.of(node).add(key, value);
+            // We need to use a priority greater than 500 avoid a conflict that occurs with some aspects created by SST.
+            // Since cdk's Tags aspect doesn't let us set a priority we have to use the slightly lower level Tag aspect here.
+            Aspects.of(node).add(new Tag(key, value), { priority: 600 });
         });
     }
 }

package/dist/lib/tags/setupTags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupTags.d.ts","sourceRoot":"","sources":["../../../src/lib/tags/setupTags.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAKxC,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,CAAC,EAAE,CACX,KAAK,EAAE,eAAe,KACnB,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5C,CAAC;AAEF,wBAAgB,SAAS,CACvB,KAAK,EAAE,UAAU,EACjB,EAAE,UAAU,EAAE,GAAE,gBAAqB,QAsCtC"}
+{"version":3,"file":"setupTags.d.ts","sourceRoot":"","sources":["../../../src/lib/tags/setupTags.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAKxC,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,CAAC,EAAE,CACX,KAAK,EAAE,eAAe,KACnB,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5C,CAAC;AAEF,wBAAgB,SAAS,CACvB,KAAK,EAAE,UAAU,EACjB,EAAE,UAAU,EAAE,GAAE,gBAAqB,QAiCtC"}

package/dist/lib/tags/setupTags.js

@@ -27,10 +27,6 @@ export function setupTags(scope, { modifyTags } = {}) {
                 currentTags: tags,
             })
             : tags;
-        if (!tags.length) {
-            // We return undefined so avoid applying the Tags aspect if there are no tags to apply.
-            return undefined;
-        }
         return tags;
     });
     Aspects.of(scope).add(conditionalTags);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infoxchange/make-it-so",
-  "version": "2.19.1-internal-testing-fix-smtp-not-set-dc4effb.1",
+  "version": "2.19.2",
   "description": "Makes deploying services to IX infra easy",
   "repository": "github:infoxchange/make-it-so",
   "publishConfig": {
@@ -13,7 +13,8 @@
     "lint": "eslint . --fix && prettier . --write && tsc --noEmit",
     "lint:check": "eslint . && prettier . --check && tsc --noEmit",
     "prepare": "husky",
-    "commit": "lint-staged && commit"
+    "commit": "lint-staged && commit",
+    "prepack": "npm run build"
   },
   "author": "Infoxchange Vic Dev Team <vicdevs@infoxchange.org>",
   "license": "MIT",

package/src/lib/tags/ConditionalTags.ts

@@ -1,4 +1,4 @@
-import { IAspect, Tags } from "aws-cdk-lib";
+import { Aspects, IAspect, Tag } from "aws-cdk-lib";
 import { IConstruct } from "constructs";
 
 export class ConditionalTags implements IAspect {
@@ -10,7 +10,9 @@ export class ConditionalTags implements IAspect {
 
   visit(node: IConstruct) {
     this.getTags(node)?.forEach(({ key, value }) => {
-      Tags.of(node).add(key, value);
+      // We need to use a priority greater than 500 avoid a conflict that occurs with some aspects created by SST.
+      // Since cdk's Tags aspect doesn't let us set a priority we have to use the slightly lower level Tag aspect here.
+      Aspects.of(node).add(new Tag(key, value), { priority: 600 });
     });
   }
 }

package/src/lib/tags/setupTags.ts

@@ -48,11 +48,6 @@ export function setupTags(
           currentTags: tags,
         })
       : tags;
-
-    if (!tags.length) {
-      // We return undefined so avoid applying the Tags aspect if there are no tags to apply.
-      return undefined;
-    }
     return tags;
   });