From 867608dd4f2c2342fd24246b8dc3b90b798f9497 Mon Sep 17 00:00:00 2001 From: Luke Shay Date: Fri, 1 Dec 2023 12:34:51 -0600 Subject: [PATCH] new versions --- packages/lshay-constructs/CHANGELOG.md | 6 ++++++ .../docs/classes/CrossRegionCertificate.md | 14 ++++++------- packages/lshay-constructs/docs/modules.md | 6 +++--- packages/lshay-constructs/package.json | 21 +++++-------------- .../constructs/cross-region-certificate.ts | 14 +++---------- packages/lshay-constructs/tsconfig.build.json | 8 +++++++ packages/lshay-constructs/tsconfig.json | 6 +++--- packages/lshay-tsconfig/CHANGELOG.md | 6 ++++++ packages/lshay-tsconfig/base.json | 1 - .../{dom.json => bundler-dom.json} | 0 packages/lshay-tsconfig/package.json | 7 +++++-- packages/lshay-tsconfig/tsc-dom.json | 7 +++++++ 12 files changed, 53 insertions(+), 43 deletions(-) create mode 100644 packages/lshay-constructs/tsconfig.build.json rename packages/lshay-tsconfig/{dom.json => bundler-dom.json} (100%) create mode 100644 packages/lshay-tsconfig/tsc-dom.json diff --git a/packages/lshay-constructs/CHANGELOG.md b/packages/lshay-constructs/CHANGELOG.md index 5dfee28..151e637 100644 --- a/packages/lshay-constructs/CHANGELOG.md +++ b/packages/lshay-constructs/CHANGELOG.md @@ -1,5 +1,11 @@ # @lshay/constructs +## 0.0.4 + +### Patch Changes + +- Actually fixed the resolution of support + ## 0.0.3 ### Patch Changes diff --git a/packages/lshay-constructs/docs/classes/CrossRegionCertificate.md b/packages/lshay-constructs/docs/classes/CrossRegionCertificate.md index 700db15..9f7c450 100644 --- a/packages/lshay-constructs/docs/classes/CrossRegionCertificate.md +++ b/packages/lshay-constructs/docs/classes/CrossRegionCertificate.md @@ -55,7 +55,7 @@ Construct.constructor #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:133 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:140](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L140) ## Properties @@ -65,7 +65,7 @@ packages/lshay-constructs/src/constructs/cross-region-certificate.ts:133 #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:128 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:128](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L128) --- @@ -75,7 +75,7 @@ packages/lshay-constructs/src/constructs/cross-region-certificate.ts:128 #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:131 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:130](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L130) --- @@ -85,7 +85,7 @@ packages/lshay-constructs/src/constructs/cross-region-certificate.ts:131 #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:126 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:132](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L132) --- @@ -95,7 +95,7 @@ packages/lshay-constructs/src/constructs/cross-region-certificate.ts:126 #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:127 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:134](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L134) --- @@ -121,7 +121,7 @@ node_modules/constructs/lib/construct.d.ts:265 #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:129 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:136](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L136) --- @@ -131,7 +131,7 @@ packages/lshay-constructs/src/constructs/cross-region-certificate.ts:129 #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:130 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:138](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L138) ## Methods diff --git a/packages/lshay-constructs/docs/modules.md b/packages/lshay-constructs/docs/modules.md index 0ffd82a..59070bf 100644 --- a/packages/lshay-constructs/docs/modules.md +++ b/packages/lshay-constructs/docs/modules.md @@ -24,7 +24,7 @@ Status of the certificate. #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:90 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:91](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L91) --- @@ -45,7 +45,7 @@ Properties for creating a [CrossRegionCertificate](classes/CrossRegionCertificat #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:103 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:104](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L104) --- @@ -57,4 +57,4 @@ The validation method for the certificate. #### Defined in -packages/lshay-constructs/src/constructs/cross-region-certificate.ts:85 +[packages/lshay-constructs/src/constructs/cross-region-certificate.ts:86](https://github.com/LukeShay/npm/blob/5159033/packages/lshay-constructs/src/constructs/cross-region-certificate.ts#L86) diff --git a/packages/lshay-constructs/package.json b/packages/lshay-constructs/package.json index 298b223..fb9a699 100644 --- a/packages/lshay-constructs/package.json +++ b/packages/lshay-constructs/package.json @@ -1,6 +1,6 @@ { "name": "@lshay/constructs", - "version": "0.0.3", + "version": "0.0.4", "repository": { "type": "git", "url": "ssh://git@github.com/lukeshay/npm.git", @@ -8,20 +8,9 @@ }, "license": "MIT", "author": "Luke Shay ", - "type": "commonjs", - "main": "./dist/index.cjs", - "module": "./dist/index.mjs", - "types": "./dist/index.d.cts", - "exports": { - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - }, - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - } - }, + "type": "module", + "types": "./dist/index.d.ts", + "exports": "./dist/index.js", "files": [ "dist", "support", @@ -30,7 +19,7 @@ ], "scripts": { "gen": "typedoc && prettier --write docs", - "build": "pkgroll", + "build": "yarn gen && rimraf dist && tsc --project tsconfig.build.json", "clean": "exit 0", "test": "exit 0", "lint": "eslint .", diff --git a/packages/lshay-constructs/src/constructs/cross-region-certificate.ts b/packages/lshay-constructs/src/constructs/cross-region-certificate.ts index 0afe14a..e7487df 100644 --- a/packages/lshay-constructs/src/constructs/cross-region-certificate.ts +++ b/packages/lshay-constructs/src/constructs/cross-region-certificate.ts @@ -8,7 +8,7 @@ import { Code, Function, Runtime } from "aws-cdk-lib/aws-lambda" import { CustomResource, Duration, Stack } from "aws-cdk-lib/core" import { Provider } from "aws-cdk-lib/custom-resources" import { Construct } from "constructs" -import * as path from "node:path" +import * as url from "node:url" /** @internal */ class CrossRegionCertificateProvider extends Construct { @@ -18,16 +18,8 @@ class CrossRegionCertificateProvider extends Construct { super(scope, id) const code = Code.fromAsset( - path.resolve( - path.dirname( - // eslint-disable-next-line unicorn/prefer-module - require.resolve( - // eslint-disable-next-line n/no-missing-require - "@lshay/constructs", - ), - ), - "support", - "cross-region-certificate-provider", + url.fileURLToPath( + new url.URL("../../support/cross-region-certificate", import.meta.url), ), ) diff --git a/packages/lshay-constructs/tsconfig.build.json b/packages/lshay-constructs/tsconfig.build.json new file mode 100644 index 0000000..3ac1057 --- /dev/null +++ b/packages/lshay-constructs/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "compilerOptions": { + "outDir": "dist", + "rootDir": "src" + }, + "extends": "./tsconfig.json", + "include": ["src"] +} diff --git a/packages/lshay-constructs/tsconfig.json b/packages/lshay-constructs/tsconfig.json index bd575fb..213601b 100644 --- a/packages/lshay-constructs/tsconfig.json +++ b/packages/lshay-constructs/tsconfig.json @@ -1,9 +1,9 @@ { "compilerOptions": { - "noUncheckedIndexedAccess": true + "outDir": "dist" }, - "extends": "@tsconfig/node18/tsconfig.json", - "include": ["eslint.config.js", "src", "support"], + "extends": "@lshay/tsconfig/tsc.json", + "include": ["eslint.config.js", "src"], "typedocOptions": { "entryPoints": ["src/index.ts"], "out": "docs", diff --git a/packages/lshay-tsconfig/CHANGELOG.md b/packages/lshay-tsconfig/CHANGELOG.md index 05f1f62..5eb9cd2 100644 --- a/packages/lshay-tsconfig/CHANGELOG.md +++ b/packages/lshay-tsconfig/CHANGELOG.md @@ -1,5 +1,11 @@ # @lshay/tsconfig +## 0.0.2 + +### Patch Changes + +- Updated to only require extending from one tsconfig' + ## 0.0.1 ### Patch Changes diff --git a/packages/lshay-tsconfig/base.json b/packages/lshay-tsconfig/base.json index 833ddf1..ef7e6dd 100644 --- a/packages/lshay-tsconfig/base.json +++ b/packages/lshay-tsconfig/base.json @@ -9,7 +9,6 @@ "isolatedModules": true, "moduleDetection": "force", "noUncheckedIndexedAccess": true, - "outDir": "dist", "resolveJsonModule": true, "skipLibCheck": true, "sourceMap": true, diff --git a/packages/lshay-tsconfig/dom.json b/packages/lshay-tsconfig/bundler-dom.json similarity index 100% rename from packages/lshay-tsconfig/dom.json rename to packages/lshay-tsconfig/bundler-dom.json diff --git a/packages/lshay-tsconfig/package.json b/packages/lshay-tsconfig/package.json index 58f4022..671d544 100644 --- a/packages/lshay-tsconfig/package.json +++ b/packages/lshay-tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@lshay/tsconfig", - "version": "0.0.1", + "version": "0.0.2", "repository": { "type": "git", "url": "ssh://git@github.com/lukeshay/npm.git", @@ -11,7 +11,10 @@ "type": "commonjs", "main": "./index.js", "files": [ - "./*.json", + "./bundler-dom.json", + "./bundler.json", + "./tsc-dom.json", + "./tsc.json", "README.md", "CHANGELOG.md" ], diff --git a/packages/lshay-tsconfig/tsc-dom.json b/packages/lshay-tsconfig/tsc-dom.json new file mode 100644 index 0000000..20d941b --- /dev/null +++ b/packages/lshay-tsconfig/tsc-dom.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "compilerOptions": { + "lib": ["es2022", "dom", "dom.iterable"] + }, + "extends": "./tsc.json" +}