From 29c85c552c11894a72b584d7f468e22e769fd5cb Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Thu, 25 May 2023 13:47:19 +0700 Subject: [PATCH 1/6] chore(web): minor esbuild version bump to get 'alias' option, adds tslib --- package-lock.json | 337 ++++++++++++++++++++++++++-------------------- package.json | 21 +-- 2 files changed, 202 insertions(+), 156 deletions(-) diff --git a/package-lock.json b/package-lock.json index aaa0fa58ea3..8eeac938a3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,15 +35,16 @@ "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.59.1", "chai": "^4.3.4", + "esbuild": "^0.15.16", "eslint": "^8.39.0", "eslint-config-standard-with-typescript": "^34.0.1", "eslint-plugin-import": "^2.27.5", "eslint-plugin-n": "^15.7.0", "eslint-plugin-promise": "^6.1.1", - "esbuild": "^0.15.15", "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", "ts-node": "^10.9.1", + "tslib": "^2.5.2", "typescript": "^4.9.5" } }, @@ -348,6 +349,14 @@ "typescript": "^4.9.5" } }, + "common/web/tslib": { + "name": "@keymanapp/tslib", + "license": "MIT", + "dependencies": { + "tslib": "^2.5.2", + "typescript": "^4.9.5" + } + }, "common/web/types": { "name": "@keymanapp/common-types", "license": "MIT", @@ -2176,6 +2185,38 @@ "node": ">=12" } }, + "node_modules/@esbuild/android-arm": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz", + "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz", + "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -2249,38 +2290,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@esbuild/android-arm": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.15.tgz", - "integrity": "sha512-JJjZjJi2eBL01QJuWjfCdZxcIgot+VoK6Fq7eKF9w4YHm9hwl7nhBR1o2Wnt/WcANk5l9SkpvrldW1PLuXxcbw==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.15.tgz", - "integrity": "sha512-lhz6UNPMDXUhtXSulw8XlFAtSYO26WmHQnCi2Lg2p+/TMiJKNLtZCYUxV4wG6rZMzXmr8InGpNwk+DLT2Hm0PA==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", @@ -2450,6 +2459,10 @@ "resolved": "common/tools/sourcemap-path-remapper", "link": true }, + "node_modules/@keymanapp/tslib": { + "resolved": "common/web/tslib", + "link": true + }, "node_modules/@keymanapp/web-sentry-manager": { "resolved": "common/web/sentry-manager", "link": true @@ -2697,6 +2710,11 @@ "node": ">=6" } }, + "node_modules/@sentry/browser/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@sentry/cli": { "version": "2.2.0", "dev": true, @@ -2731,6 +2749,11 @@ "node": ">=6" } }, + "node_modules/@sentry/core/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@sentry/hub": { "version": "5.30.0", "license": "BSD-3-Clause", @@ -2743,6 +2766,11 @@ "node": ">=6" } }, + "node_modules/@sentry/hub/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@sentry/minimal": { "version": "5.30.0", "license": "BSD-3-Clause", @@ -2755,6 +2783,11 @@ "node": ">=6" } }, + "node_modules/@sentry/minimal/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@sentry/node": { "version": "6.19.6", "license": "BSD-3-Clause", @@ -2828,6 +2861,11 @@ "node": ">=6" } }, + "node_modules/@sentry/node/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@sentry/types": { "version": "5.30.0", "license": "BSD-3-Clause", @@ -2846,6 +2884,11 @@ "node": ">=6" } }, + "node_modules/@sentry/utils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@sindresorhus/is": { "version": "4.6.0", "license": "MIT", @@ -4840,9 +4883,9 @@ "license": "MIT" }, "node_modules/esbuild": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.15.tgz", - "integrity": "sha512-TEw/lwK4Zzld9x3FedV6jy8onOUHqcEX3ADFk4k+gzPUwrxn8nWV62tH0udo8jOtjFodlEfc4ypsqX3e+WWO6w==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz", + "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==", "dev": true, "hasInstallScript": true, "bin": { @@ -4852,34 +4895,34 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.15.15", - "@esbuild/linux-loong64": "0.15.15", - "esbuild-android-64": "0.15.15", - "esbuild-android-arm64": "0.15.15", - "esbuild-darwin-64": "0.15.15", - "esbuild-darwin-arm64": "0.15.15", - "esbuild-freebsd-64": "0.15.15", - "esbuild-freebsd-arm64": "0.15.15", - "esbuild-linux-32": "0.15.15", - "esbuild-linux-64": "0.15.15", - "esbuild-linux-arm": "0.15.15", - "esbuild-linux-arm64": "0.15.15", - "esbuild-linux-mips64le": "0.15.15", - "esbuild-linux-ppc64le": "0.15.15", - "esbuild-linux-riscv64": "0.15.15", - "esbuild-linux-s390x": "0.15.15", - "esbuild-netbsd-64": "0.15.15", - "esbuild-openbsd-64": "0.15.15", - "esbuild-sunos-64": "0.15.15", - "esbuild-windows-32": "0.15.15", - "esbuild-windows-64": "0.15.15", - "esbuild-windows-arm64": "0.15.15" + "@esbuild/android-arm": "0.15.18", + "@esbuild/linux-loong64": "0.15.18", + "esbuild-android-64": "0.15.18", + "esbuild-android-arm64": "0.15.18", + "esbuild-darwin-64": "0.15.18", + "esbuild-darwin-arm64": "0.15.18", + "esbuild-freebsd-64": "0.15.18", + "esbuild-freebsd-arm64": "0.15.18", + "esbuild-linux-32": "0.15.18", + "esbuild-linux-64": "0.15.18", + "esbuild-linux-arm": "0.15.18", + "esbuild-linux-arm64": "0.15.18", + "esbuild-linux-mips64le": "0.15.18", + "esbuild-linux-ppc64le": "0.15.18", + "esbuild-linux-riscv64": "0.15.18", + "esbuild-linux-s390x": "0.15.18", + "esbuild-netbsd-64": "0.15.18", + "esbuild-openbsd-64": "0.15.18", + "esbuild-sunos-64": "0.15.18", + "esbuild-windows-32": "0.15.18", + "esbuild-windows-64": "0.15.18", + "esbuild-windows-arm64": "0.15.18" } }, "node_modules/esbuild-android-64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.15.tgz", - "integrity": "sha512-F+WjjQxO+JQOva3tJWNdVjouFMLK6R6i5gjDvgUthLYJnIZJsp1HlF523k73hELY20WPyEO8xcz7aaYBVkeg5Q==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz", + "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==", "cpu": [ "x64" ], @@ -4893,9 +4936,9 @@ } }, "node_modules/esbuild-android-arm64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.15.tgz", - "integrity": "sha512-attlyhD6Y22jNyQ0fIIQ7mnPvDWKw7k6FKnsXlBvQE6s3z6s6cuEHcSgoirquQc7TmZgVCK5fD/2uxmRN+ZpcQ==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz", + "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==", "cpu": [ "arm64" ], @@ -4909,9 +4952,9 @@ } }, "node_modules/esbuild-darwin-64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.15.tgz", - "integrity": "sha512-ohZtF8W1SHJ4JWldsPVdk8st0r9ExbAOSrBOh5L+Mq47i696GVwv1ab/KlmbUoikSTNoXEhDzVpxUR/WIO19FQ==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz", + "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==", "cpu": [ "x64" ], @@ -4925,9 +4968,9 @@ } }, "node_modules/esbuild-darwin-arm64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.15.tgz", - "integrity": "sha512-P8jOZ5zshCNIuGn+9KehKs/cq5uIniC+BeCykvdVhx/rBXSxmtj3CUIKZz4sDCuESMbitK54drf/2QX9QHG5Ag==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz", + "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==", "cpu": [ "arm64" ], @@ -4941,9 +4984,9 @@ } }, "node_modules/esbuild-freebsd-64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.15.tgz", - "integrity": "sha512-KkTg+AmDXz1IvA9S1gt8dE24C8Thx0X5oM0KGF322DuP+P3evwTL9YyusHAWNsh4qLsR80nvBr/EIYs29VSwuA==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz", + "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==", "cpu": [ "x64" ], @@ -4957,9 +5000,9 @@ } }, "node_modules/esbuild-freebsd-arm64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.15.tgz", - "integrity": "sha512-FUcML0DRsuyqCMfAC+HoeAqvWxMeq0qXvclZZ/lt2kLU6XBnDA5uKTLUd379WYEyVD4KKFctqWd9tTuk8C/96g==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz", + "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==", "cpu": [ "arm64" ], @@ -4973,9 +5016,9 @@ } }, "node_modules/esbuild-linux-32": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.15.tgz", - "integrity": "sha512-q28Qn5pZgHNqug02aTkzw5sW9OklSo96b5nm17Mq0pDXrdTBcQ+M6Q9A1B+dalFeynunwh/pvfrNucjzwDXj+Q==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz", + "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==", "cpu": [ "ia32" ], @@ -4989,9 +5032,9 @@ } }, "node_modules/esbuild-linux-64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.15.tgz", - "integrity": "sha512-217KPmWMirkf8liO+fj2qrPwbIbhNTGNVtvqI1TnOWJgcMjUWvd677Gq3fTzXEjilkx2yWypVnTswM2KbXgoAg==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz", + "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==", "cpu": [ "x64" ], @@ -5005,9 +5048,9 @@ } }, "node_modules/esbuild-linux-arm": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.15.tgz", - "integrity": "sha512-RYVW9o2yN8yM7SB1yaWr378CwrjvGCyGybX3SdzPHpikUHkME2AP55Ma20uNwkNyY2eSYFX9D55kDrfQmQBR4w==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz", + "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==", "cpu": [ "arm" ], @@ -5021,9 +5064,9 @@ } }, "node_modules/esbuild-linux-arm64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.15.tgz", - "integrity": "sha512-/ltmNFs0FivZkYsTzAsXIfLQX38lFnwJTWCJts0IbCqWZQe+jjj0vYBNbI0kmXLb3y5NljiM5USVAO1NVkdh2g==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz", + "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==", "cpu": [ "arm64" ], @@ -5037,9 +5080,9 @@ } }, "node_modules/esbuild-linux-mips64le": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.15.tgz", - "integrity": "sha512-PksEPb321/28GFFxtvL33yVPfnMZihxkEv5zME2zapXGp7fA1X2jYeiTUK+9tJ/EGgcNWuwvtawPxJG7Mmn86A==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz", + "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==", "cpu": [ "mips64el" ], @@ -5053,9 +5096,9 @@ } }, "node_modules/esbuild-linux-ppc64le": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.15.tgz", - "integrity": "sha512-ek8gJBEIhcpGI327eAZigBOHl58QqrJrYYIZBWQCnH3UnXoeWMrMZLeeZL8BI2XMBhP+sQ6ERctD5X+ajL/AIA==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz", + "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==", "cpu": [ "ppc64" ], @@ -5069,9 +5112,9 @@ } }, "node_modules/esbuild-linux-riscv64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.15.tgz", - "integrity": "sha512-H5ilTZb33/GnUBrZMNJtBk7/OXzDHDXjIzoLXHSutwwsLxSNaLxzAaMoDGDd/keZoS+GDBqNVxdCkpuiRW4OSw==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz", + "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==", "cpu": [ "riscv64" ], @@ -5085,9 +5128,9 @@ } }, "node_modules/esbuild-linux-s390x": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.15.tgz", - "integrity": "sha512-jKaLUg78mua3rrtrkpv4Or2dNTJU7bgHN4bEjT4OX4GR7nLBSA9dfJezQouTxMmIW7opwEC5/iR9mpC18utnxQ==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz", + "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==", "cpu": [ "s390x" ], @@ -5101,9 +5144,9 @@ } }, "node_modules/esbuild-netbsd-64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.15.tgz", - "integrity": "sha512-aOvmF/UkjFuW6F36HbIlImJTTx45KUCHJndtKo+KdP8Dhq3mgLRKW9+6Ircpm8bX/RcS3zZMMmaBLkvGY06Gvw==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz", + "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==", "cpu": [ "x64" ], @@ -5117,9 +5160,9 @@ } }, "node_modules/esbuild-openbsd-64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.15.tgz", - "integrity": "sha512-HFFX+WYedx1w2yJ1VyR1Dfo8zyYGQZf1cA69bLdrHzu9svj6KH6ZLK0k3A1/LFPhcEY9idSOhsB2UyU0tHPxgQ==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz", + "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==", "cpu": [ "x64" ], @@ -5133,9 +5176,9 @@ } }, "node_modules/esbuild-sunos-64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.15.tgz", - "integrity": "sha512-jOPBudffG4HN8yJXcK9rib/ZTFoTA5pvIKbRrt3IKAGMq1EpBi4xoVoSRrq/0d4OgZLaQbmkHp8RO9eZIn5atA==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz", + "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==", "cpu": [ "x64" ], @@ -5149,9 +5192,9 @@ } }, "node_modules/esbuild-windows-32": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.15.tgz", - "integrity": "sha512-MDkJ3QkjnCetKF0fKxCyYNBnOq6dmidcwstBVeMtXSgGYTy8XSwBeIE4+HuKiSsG6I/mXEb++px3IGSmTN0XiA==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz", + "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==", "cpu": [ "ia32" ], @@ -5165,9 +5208,9 @@ } }, "node_modules/esbuild-windows-64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.15.tgz", - "integrity": "sha512-xaAUIB2qllE888SsMU3j9nrqyLbkqqkpQyWVkfwSil6BBPgcPk3zOFitTTncEKCLTQy3XV9RuH7PDj3aJDljWA==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz", + "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==", "cpu": [ "x64" ], @@ -5181,9 +5224,9 @@ } }, "node_modules/esbuild-windows-arm64": { - "version": "0.15.15", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.15.tgz", - "integrity": "sha512-ttuoCYCIJAFx4UUKKWYnFdrVpoXa3+3WWkXVI6s09U+YjhnyM5h96ewTq/WgQj9LFSIlABQvadHSOQyAVjW5xQ==", + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz", + "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==", "cpu": [ "arm64" ], @@ -6473,11 +6516,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/google-closure-compiler-java": { - "version": "20200224.0.0", - "dev": true, - "license": "Apache-2.0" - }, "node_modules/gopd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", @@ -6806,20 +6844,6 @@ "version": "2.0.4", "license": "ISC" }, - "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/inline-source-map": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz", @@ -6838,6 +6862,20 @@ "node": ">=0.10.0" } }, + "node_modules/internal-slot": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/interpret": { "version": "1.4.0", "dev": true, @@ -7639,18 +7677,18 @@ "version": "4.4.2", "license": "MIT" }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, "node_modules/lodash.memoize": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==", "dev": true }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "node_modules/lodash.set": { "version": "4.3.2", "license": "MIT" @@ -10191,8 +10229,9 @@ } }, "node_modules/tslib": { - "version": "1.14.1", - "license": "0BSD" + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz", + "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -10209,6 +10248,12 @@ "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" } }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/tunnel": { "version": "0.0.6", "license": "MIT", @@ -10993,7 +11038,6 @@ "@keymanapp/web-sentry-manager": "*", "@sentry/cli": "2.2.0", "chai": "^4.3.4", - "google-closure-compiler-java": "^20200224.0.0", "karma": "^6.4.1", "karma-browserstack-launcher": "^1.6.0", "karma-chai": "^0.1.0", @@ -11011,6 +11055,7 @@ "mocha": "^10.0.0", "modernizr": "^3.11.7", "ts-node": "^10.9.1", + "tslib": "^2.5.2", "typescript": "^4.9.5" } } diff --git a/package.json b/package.json index 11fa521e186..787fe68e5a2 100644 --- a/package.json +++ b/package.json @@ -2,18 +2,19 @@ "name": "root", "private": true, "devDependencies": { - "chai": "^4.3.4", - "esbuild": "^0.15.15", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "ts-node": "^10.9.1", - "typescript": "^4.9.5", "@typescript-eslint/eslint-plugin": "^5.59.1", + "chai": "^4.3.4", + "esbuild": "^0.15.16", "eslint": "^8.39.0", "eslint-config-standard-with-typescript": "^34.0.1", "eslint-plugin-import": "^2.27.5", "eslint-plugin-n": "^15.7.0", - "eslint-plugin-promise": "^6.1.1" + "eslint-plugin-promise": "^6.1.1", + "mocha": "^10.0.0", + "mocha-teamcity-reporter": "^4.0.0", + "ts-node": "^10.9.1", + "tslib": "^2.5.2", + "typescript": "^4.9.5" }, "scripts": {}, "workspaces": [ @@ -37,10 +38,10 @@ "web" ], "dependencies": { + "@keymanapp/common-types": "file:common/web/types", + "@keymanapp/developer-test-helpers": "file:developer/src/common/web/test-helpers", "@keymanapp/hextobin": "file:common/tools/hextobin", "@keymanapp/keyman-version": "file:common/web/keyman-version", - "@keymanapp/common-types": "file:common/web/types", - "@keymanapp/ldml-keyboard-constants": "file:core/include/ldml", - "@keymanapp/developer-test-helpers": "file:developer/src/common/web/test-helpers" + "@keymanapp/ldml-keyboard-constants": "file:core/include/ldml" } } From 06434953a8b1541e88a99e5d3fc8824779f1eaff Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Thu, 25 May 2023 14:13:57 +0700 Subject: [PATCH 2/6] chore(web): KMW use of importHelpers --- common/predictive-text/build-bundler.js | 3 ++ common/predictive-text/src/node/tsconfig.json | 1 + common/predictive-text/src/tsconfig.json | 1 + common/predictive-text/src/web/tsconfig.json | 1 + common/predictive-text/tsconfig.all.json | 1 + common/web/input-processor/build-bundler.js | 6 ++++ common/web/input-processor/tsconfig.json | 1 + .../web/keyboard-processor/build-bundler.js | 15 +++++++++ .../src/keyboards/loaders/tsconfig.dom.json | 1 + .../keyboard-processor/tsconfig.common.json | 1 + common/web/keyboard-processor/tsconfig.json | 1 + common/web/tslib/README.md | 15 +++++++++ common/web/tslib/build.sh | 31 +++++++++++++++++++ common/web/tslib/package.json | 25 +++++++++++++++ common/web/tslib/src/index.ts | 3 ++ common/web/tslib/tsconfig.json | 21 +++++++++++++ common/web/utils/build-bundler.js | 6 ++++ common/web/utils/tsconfig.json | 1 + package-lock.json | 4 +-- web/package.json | 3 +- web/src/app/browser/build-bundler.js | 28 ++++++++--------- web/src/app/browser/tsconfig.json | 1 + web/src/app/webview/build-bundler.js | 6 ++++ web/src/app/webview/tsconfig.json | 1 + web/src/engine/attachment/build-bundler.js | 3 ++ .../attachment/src/pageContextAttachment.ts | 2 +- web/src/engine/attachment/tsconfig.json | 1 + web/src/engine/device-detect/build-bundler.js | 3 ++ web/src/engine/device-detect/tsconfig.json | 1 + web/src/engine/dom-utils/tsconfig.json | 1 + .../engine/element-wrappers/build-bundler.js | 3 ++ web/src/engine/element-wrappers/tsconfig.json | 1 + web/src/engine/events/build-bundler.js | 3 ++ web/src/engine/events/tsconfig.json | 1 + web/src/engine/main/build-bundler.js | 3 ++ web/src/engine/main/tsconfig.json | 1 + web/src/engine/osk/build-bundler.js | 3 ++ web/src/engine/osk/tsconfig.json | 1 + web/src/engine/package-cache/build-bundler.js | 9 ++++++ .../src/keyboardRequisitioner.ts | 2 +- web/src/engine/package-cache/tsconfig.json | 1 + web/src/engine/paths/build-bundler.js | 3 ++ web/src/engine/paths/tsconfig.json | 1 + 43 files changed, 200 insertions(+), 20 deletions(-) create mode 100644 common/web/tslib/README.md create mode 100755 common/web/tslib/build.sh create mode 100644 common/web/tslib/package.json create mode 100644 common/web/tslib/src/index.ts create mode 100644 common/web/tslib/tsconfig.json diff --git a/common/predictive-text/build-bundler.js b/common/predictive-text/build-bundler.js index 2b2bff8713a..a666e008fd6 100644 --- a/common/predictive-text/build-bundler.js +++ b/common/predictive-text/build-bundler.js @@ -9,6 +9,9 @@ import esbuild from 'esbuild'; import { spawn } from 'child_process'; await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", diff --git a/common/predictive-text/src/node/tsconfig.json b/common/predictive-text/src/node/tsconfig.json index 48d64d22b6a..dacf350335e 100644 --- a/common/predictive-text/src/node/tsconfig.json +++ b/common/predictive-text/src/node/tsconfig.json @@ -5,6 +5,7 @@ "declaration": true, "module": "es6", "moduleResolution": "Node16", + "importHelpers": true, "inlineSources": true, "sourceMap": true, "sourceRoot": "keyman", diff --git a/common/predictive-text/src/tsconfig.json b/common/predictive-text/src/tsconfig.json index 40fb9f45cd2..f6fe671043f 100644 --- a/common/predictive-text/src/tsconfig.json +++ b/common/predictive-text/src/tsconfig.json @@ -6,6 +6,7 @@ "declaration": true, "module": "es6", "moduleResolution": "Node16", + "importHelpers": true, "inlineSources": true, "sourceMap": true, "sourceRoot": "keyman", diff --git a/common/predictive-text/src/web/tsconfig.json b/common/predictive-text/src/web/tsconfig.json index 9e1f43978e5..bcb94fca106 100644 --- a/common/predictive-text/src/web/tsconfig.json +++ b/common/predictive-text/src/web/tsconfig.json @@ -5,6 +5,7 @@ "declaration": true, "module": "es6", "moduleResolution": "Node16", + "importHelpers": true, "inlineSources": true, "sourceMap": true, "sourceRoot": "keyman", diff --git a/common/predictive-text/tsconfig.all.json b/common/predictive-text/tsconfig.all.json index 33fe749e21e..5cb3fdf96bf 100644 --- a/common/predictive-text/tsconfig.all.json +++ b/common/predictive-text/tsconfig.all.json @@ -10,6 +10,7 @@ "declaration": true, "module": "es6", "moduleResolution": "Node16", + "importHelpers": true, "inlineSources": true, "sourceMap": true, "sourceRoot": "keyman", diff --git a/common/web/input-processor/build-bundler.js b/common/web/input-processor/build-bundler.js index 34614fa6808..f16b207454a 100644 --- a/common/web/input-processor/build-bundler.js +++ b/common/web/input-processor/build-bundler.js @@ -11,6 +11,9 @@ import { spawn } from 'child_process'; // Bundled ES module version esbuild.buildSync({ entryPoints: ['build/obj/index.js'], + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, external: ['fs', 'vm'], @@ -29,6 +32,9 @@ esbuild.buildSync({ // Bundled CommonJS (classic Node) module version esbuild.buildSync({ entryPoints: ['build/obj/index.js'], + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, external: ['fs', 'vm'], diff --git a/common/web/input-processor/tsconfig.json b/common/web/input-processor/tsconfig.json index 1a03881a16e..6e04340f4d1 100644 --- a/common/web/input-processor/tsconfig.json +++ b/common/web/input-processor/tsconfig.json @@ -6,6 +6,7 @@ "module": "es6", "moduleResolution": "Node16", "declaration": true, + "importHelpers": true, "inlineSources": true, "sourceMap": true, "sourceRoot": "keyman/", diff --git a/common/web/keyboard-processor/build-bundler.js b/common/web/keyboard-processor/build-bundler.js index 5c3ecb05a97..87625dd19ce 100644 --- a/common/web/keyboard-processor/build-bundler.js +++ b/common/web/keyboard-processor/build-bundler.js @@ -10,6 +10,9 @@ import { spawn } from 'child_process'; /** @type {esbuild.BuildOptions} */ const commonConfig = { + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", @@ -23,6 +26,9 @@ const commonConfig = { // Bundled ES module version esbuild.buildSync({ + alias: { + 'tslib': '@keymanapp/tslib' + }, entryPoints: ['build/obj/index.js'], outfile: "build/lib/index.mjs", format: "esm", @@ -31,6 +37,9 @@ esbuild.buildSync({ // Bundled CommonJS (classic Node) module version esbuild.buildSync({ + alias: { + 'tslib': '@keymanapp/tslib' + }, entryPoints: ['build/obj/index.js'], outfile: 'build/lib/index.cjs', bundle: true, @@ -42,6 +51,9 @@ esbuild.buildSync({ esbuild.buildSync({ + alias: { + 'tslib': '@keymanapp/tslib' + }, entryPoints: ['build/obj/keyboards/loaders/dom-keyboard-loader.js'], outfile: 'build/lib/dom-keyboard-loader.mjs', format: "esm", @@ -50,6 +62,9 @@ esbuild.buildSync({ // The node-based keyboard loader needs an extra parameter due to Node-built-in imports: esbuild.buildSync({ + alias: { + 'tslib': '@keymanapp/tslib' + }, entryPoints: ['build/obj/keyboards/loaders/node-keyboard-loader.js'], outfile: 'build/lib/node-keyboard-loader.mjs', format: "esm", diff --git a/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.dom.json b/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.dom.json index 5120d36a6c1..e5ab52729e7 100644 --- a/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.dom.json +++ b/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.dom.json @@ -6,6 +6,7 @@ "module": "es6", "moduleResolution": "Node16", "declaration": true, + "importHelpers": true, "inlineSources": true, "sourceMap": true, "sourceRoot": "keyman/", diff --git a/common/web/keyboard-processor/tsconfig.common.json b/common/web/keyboard-processor/tsconfig.common.json index 9ed8c35d543..30fcd19eda8 100644 --- a/common/web/keyboard-processor/tsconfig.common.json +++ b/common/web/keyboard-processor/tsconfig.common.json @@ -6,6 +6,7 @@ "module": "es6", "moduleResolution": "Node16", "declaration": true, + "importHelpers": true, "inlineSources": true, "sourceMap": true, "sourceRoot": "keyman/", diff --git a/common/web/keyboard-processor/tsconfig.json b/common/web/keyboard-processor/tsconfig.json index df6ac8969bd..95071c36a70 100644 --- a/common/web/keyboard-processor/tsconfig.json +++ b/common/web/keyboard-processor/tsconfig.json @@ -6,6 +6,7 @@ "module": "es6", "moduleResolution": "Node16", "declaration": true, + "importHelpers": true, "inlineSources": true, "sourceMap": true, "sourceRoot": "keyman/", diff --git a/common/web/tslib/README.md b/common/web/tslib/README.md new file mode 100644 index 00000000000..4c87474f627 --- /dev/null +++ b/common/web/tslib/README.md @@ -0,0 +1,15 @@ +The default import setup for the `tslib` package is unfortunately incompatible with `esbuild` when in ES5 mode. But... +with a little elbow grease, we can fix that with _this_ package by importing its ES5-compatible file and exporting it +as _this_ package's default export for use in anything looking to `"importHelpers"`. + +To utilize this with `esbuild` while enabling the `"importHelpers"` compilation option in your tsconfig.json, you'll want +to set the following in your `esbuild` config: + +```javascript + alias: { + 'tslib': '@keymanapp/tslib' + }, +``` + +Note that esbuild 0.15.16 is the minimum required version to utilize the 'alias' feature necessary to replace `tslib` for +`tsc`-generated `import { /* */ } from 'tslib'` statements that result from enabling `"importHelpers"` in a tsconfig. \ No newline at end of file diff --git a/common/web/tslib/build.sh b/common/web/tslib/build.sh new file mode 100755 index 00000000000..d674ce9fb0a --- /dev/null +++ b/common/web/tslib/build.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +# +# Compiles common TS-based utility functions for use among Keyman's codebase + +set -eu + +## START STANDARD BUILD SCRIPT INCLUDE +# adjust relative paths as necessary +THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" +. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh" +## END STANDARD BUILD SCRIPT INCLUDE + +. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" + +cd "$THIS_SCRIPT_PATH" + +################################ Main script ################################ + +builder_describe \ + "A ES5 + esbuild compatibility wrapper for the 'tslib' package." \ + clean configure build + +builder_describe_outputs \ + configure "/node_modules" \ + build "/common/web/tslib/build/index.js" + +builder_parse "$@" + +builder_run_action configure verify_npm_setup +builder_run_action clean rm -rf build/ +builder_run_action build tsc --build "$THIS_SCRIPT_PATH/tsconfig.json" \ No newline at end of file diff --git a/common/web/tslib/package.json b/common/web/tslib/package.json new file mode 100644 index 00000000000..7de002c0171 --- /dev/null +++ b/common/web/tslib/package.json @@ -0,0 +1,25 @@ +{ + "name": "@keymanapp/tslib", + "description": "An ES5 + esbuild-compatible wrapper for the 'tslib' library", + "main": "./build/index.js", + "scripts": { + "build": "gosh ./build.sh", + "clean": "tsc -b --clean", + "tsc": "tsc" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/keymanapp/keyman.git" + }, + "author": "SIL International", + "license": "MIT", + "bugs": { + "url": "https://github.com/keymanapp/keyman/issues" + }, + "homepage": "https://github.com/keymanapp/keyman#readme", + "dependencies": { + "tslib": "^2.5.2", + "typescript": "^4.9.5" + }, + "type": "module" +} diff --git a/common/web/tslib/src/index.ts b/common/web/tslib/src/index.ts new file mode 100644 index 00000000000..2f173ad83fa --- /dev/null +++ b/common/web/tslib/src/index.ts @@ -0,0 +1,3 @@ +export * from '../../../../node_modules/tslib/tslib.js'; + +export * as tslib from '../../../../node_modules/tslib/tslib.js'; \ No newline at end of file diff --git a/common/web/tslib/tsconfig.json b/common/web/tslib/tsconfig.json new file mode 100644 index 00000000000..459f336baa9 --- /dev/null +++ b/common/web/tslib/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../../tsconfig-base.json", + "compilerOptions": { + "allowJs": true, + "module": "es6", + "moduleResolution": "Node", + "inlineSources": true, + "sourceMap": true, + "declaration": true, + "target": "es5", + "tsBuildInfoFile": "./build/tsconfig.tsbuildinfo", + "types": ["node"], + "lib": ["es6"], + "baseUrl": "./src", + "outDir": "./build/", + "rootDir": "./src" + }, + "include": [ + "./src/index.ts" + ] +} diff --git a/common/web/utils/build-bundler.js b/common/web/utils/build-bundler.js index 72df8e0ae1e..cda215474f8 100644 --- a/common/web/utils/build-bundler.js +++ b/common/web/utils/build-bundler.js @@ -8,6 +8,9 @@ import { spawn } from 'child_process'; // Bundles to a compact ESModule esbuild.buildSync({ entryPoints: ['build/obj/index.js'], + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, //minify: true, // No need to minify a module. @@ -24,6 +27,9 @@ esbuild.buildSync({ // Bundles to a compact CommonJS (classic Node) module esbuild.buildSync({ entryPoints: ['build/obj/index.js'], + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, //minify: true, // No need to minify a module. diff --git a/common/web/utils/tsconfig.json b/common/web/utils/tsconfig.json index 838a704dfb3..e19eadb2d3e 100644 --- a/common/web/utils/tsconfig.json +++ b/common/web/utils/tsconfig.json @@ -4,6 +4,7 @@ "allowJs": true, "module": "es6", "moduleResolution": "Node16", + "importHelpers": true, "inlineSources": true, "sourceMap": true, "declaration": true, diff --git a/package-lock.json b/package-lock.json index 8eeac938a3a..749aeee4116 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11031,7 +11031,8 @@ "@keymanapp/recorder-core": "*", "@keymanapp/web-utils": "*", "@types/node": "^11.9.4", - "eventemitter3": "^4.0.0" + "eventemitter3": "^4.0.0", + "tslib": "^2.5.2" }, "devDependencies": { "@keymanapp/resources-gosh": "*", @@ -11055,7 +11056,6 @@ "mocha": "^10.0.0", "modernizr": "^3.11.7", "ts-node": "^10.9.1", - "tslib": "^2.5.2", "typescript": "^4.9.5" } } diff --git a/web/package.json b/web/package.json index 9c06e3d5b03..8e145576e07 100644 --- a/web/package.json +++ b/web/package.json @@ -108,7 +108,8 @@ "@keymanapp/recorder-core": "*", "@keymanapp/web-utils": "*", "@types/node": "^11.9.4", - "eventemitter3": "^4.0.0" + "eventemitter3": "^4.0.0", + "tslib": "^2.5.2" }, "type": "module" } diff --git a/web/src/app/browser/build-bundler.js b/web/src/app/browser/build-bundler.js index ba49bccc5ab..38ff1d875d2 100644 --- a/web/src/app/browser/build-bundler.js +++ b/web/src/app/browser/build-bundler.js @@ -50,7 +50,10 @@ let es5ClassAnnotationAsPurePlugin = { } } -await esbuild.build({ +const commonConfig = { + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "iife", @@ -60,14 +63,16 @@ await esbuild.build({ }, outfile: '../../../build/app/browser/debug/keymanweb.js', plugins: [ es5ClassAnnotationAsPurePlugin ], + pure: ['__asyncDelegator'], target: "es5", treeShaking: true, tsconfig: './tsconfig.json' -}); +}; + +await esbuild.build(commonConfig); let result = await esbuild.build({ - bundle: true, - sourcemap: true, + ...commonConfig, minifyWhitespace: true, minifySyntax: true, minifyIdentifiers: true, @@ -77,10 +82,6 @@ let result = await esbuild.build({ 'index': '../../../build/app/browser/obj/release-main.js', }, outfile: '../../../build/app/browser/release/keymanweb.js', - plugins: [ es5ClassAnnotationAsPurePlugin ], - target: "es5", - treeShaking: true, - tsconfig: './tsconfig.json', // Enables source-file output size profiling! metafile: true }); @@ -96,17 +97,14 @@ if(EMIT_FILESIZE_PROFILE) { } await esbuild.build({ - bundle: true, - sourcemap: true, - minify: false, + ...commonConfig, + alias: { + 'tslib': '@keymanapp/tslib' + }, format: "esm", - nodePaths: ['../../../../node_modules'], entryPoints: { 'index': '../../../build/app/browser/obj/test-index.js', }, outfile: '../../../build/app/browser/lib/index.mjs', - plugins: [ es5ClassAnnotationAsPurePlugin ], - target: "es5", - treeShaking: true, tsconfig: './tsconfig.json' }); \ No newline at end of file diff --git a/web/src/app/browser/tsconfig.json b/web/src/app/browser/tsconfig.json index 2d4a1a481ca..4d2cce1a12f 100644 --- a/web/src/app/browser/tsconfig.json +++ b/web/src/app/browser/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": false, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/app/webview/build-bundler.js b/web/src/app/webview/build-bundler.js index 0f166cd5d85..be77ad2f91c 100644 --- a/web/src/app/webview/build-bundler.js +++ b/web/src/app/webview/build-bundler.js @@ -31,6 +31,9 @@ let es5ClassAnnotationAsPurePlugin = { } await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "iife", @@ -46,6 +49,9 @@ await esbuild.build({ }); await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, minifyWhitespace: true, diff --git a/web/src/app/webview/tsconfig.json b/web/src/app/webview/tsconfig.json index 2a35140eb7d..8dbfa3c46c6 100644 --- a/web/src/app/webview/tsconfig.json +++ b/web/src/app/webview/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": false, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/engine/attachment/build-bundler.js b/web/src/engine/attachment/build-bundler.js index ecce53bb0d1..ab199c8f508 100644 --- a/web/src/engine/attachment/build-bundler.js +++ b/web/src/engine/attachment/build-bundler.js @@ -9,6 +9,9 @@ import esbuild from 'esbuild'; import { spawn } from 'child_process'; await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", diff --git a/web/src/engine/attachment/src/pageContextAttachment.ts b/web/src/engine/attachment/src/pageContextAttachment.ts index ce115a9ddc4..7fc8b33c80e 100644 --- a/web/src/engine/attachment/src/pageContextAttachment.ts +++ b/web/src/engine/attachment/src/pageContextAttachment.ts @@ -103,7 +103,7 @@ export class PageContextAttachment extends EventEmitter { (flattenedInputList, pageInputList) => flattenedInputList.concat(pageInputList), [] ); - return [...this._inputList, ...embeddedInputs]; + return [].concat(this._inputList).concat(embeddedInputs); } // Useful for `moveToNext` operations: order matters. diff --git a/web/src/engine/attachment/tsconfig.json b/web/src/engine/attachment/tsconfig.json index fc3f2cba9ef..3bb8e7b846b 100644 --- a/web/src/engine/attachment/tsconfig.json +++ b/web/src/engine/attachment/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": true, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/engine/device-detect/build-bundler.js b/web/src/engine/device-detect/build-bundler.js index 272419cc579..d0326e975b9 100644 --- a/web/src/engine/device-detect/build-bundler.js +++ b/web/src/engine/device-detect/build-bundler.js @@ -9,6 +9,9 @@ import esbuild from 'esbuild'; import { spawn } from 'child_process'; await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", diff --git a/web/src/engine/device-detect/tsconfig.json b/web/src/engine/device-detect/tsconfig.json index 7c4ab9a9529..de87fd1cdc5 100644 --- a/web/src/engine/device-detect/tsconfig.json +++ b/web/src/engine/device-detect/tsconfig.json @@ -4,6 +4,7 @@ "compilerOptions": { "allowJs": false, "declaration": true, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/engine/dom-utils/tsconfig.json b/web/src/engine/dom-utils/tsconfig.json index e73aa1f76fd..fb4942d7ca8 100644 --- a/web/src/engine/dom-utils/tsconfig.json +++ b/web/src/engine/dom-utils/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": true, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/engine/element-wrappers/build-bundler.js b/web/src/engine/element-wrappers/build-bundler.js index 899fe228b24..6263557c993 100644 --- a/web/src/engine/element-wrappers/build-bundler.js +++ b/web/src/engine/element-wrappers/build-bundler.js @@ -9,6 +9,9 @@ import esbuild from 'esbuild'; import { spawn } from 'child_process'; await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", diff --git a/web/src/engine/element-wrappers/tsconfig.json b/web/src/engine/element-wrappers/tsconfig.json index 3dea240aede..d7712d72c36 100644 --- a/web/src/engine/element-wrappers/tsconfig.json +++ b/web/src/engine/element-wrappers/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": true, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/engine/events/build-bundler.js b/web/src/engine/events/build-bundler.js index 6c6f45c869b..d2b56e237f0 100644 --- a/web/src/engine/events/build-bundler.js +++ b/web/src/engine/events/build-bundler.js @@ -9,6 +9,9 @@ import esbuild from 'esbuild'; import { spawn } from 'child_process'; await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", diff --git a/web/src/engine/events/tsconfig.json b/web/src/engine/events/tsconfig.json index 83a32380089..b7afb880321 100644 --- a/web/src/engine/events/tsconfig.json +++ b/web/src/engine/events/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": true, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/engine/main/build-bundler.js b/web/src/engine/main/build-bundler.js index 8731bb66a33..b96243c75a6 100644 --- a/web/src/engine/main/build-bundler.js +++ b/web/src/engine/main/build-bundler.js @@ -9,6 +9,9 @@ import esbuild from 'esbuild'; import { spawn } from 'child_process'; await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", diff --git a/web/src/engine/main/tsconfig.json b/web/src/engine/main/tsconfig.json index 29446647d71..9eb7f53c35d 100644 --- a/web/src/engine/main/tsconfig.json +++ b/web/src/engine/main/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": true, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/engine/osk/build-bundler.js b/web/src/engine/osk/build-bundler.js index ae92eb04cf9..b1858b3f95c 100644 --- a/web/src/engine/osk/build-bundler.js +++ b/web/src/engine/osk/build-bundler.js @@ -1,6 +1,9 @@ import esbuild from 'esbuild'; await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", diff --git a/web/src/engine/osk/tsconfig.json b/web/src/engine/osk/tsconfig.json index fe6a12bdce7..0edc3b5c346 100644 --- a/web/src/engine/osk/tsconfig.json +++ b/web/src/engine/osk/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": true, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/engine/package-cache/build-bundler.js b/web/src/engine/package-cache/build-bundler.js index 1069209c9f9..f2340a1b01b 100644 --- a/web/src/engine/package-cache/build-bundler.js +++ b/web/src/engine/package-cache/build-bundler.js @@ -1,6 +1,9 @@ import esbuild from 'esbuild'; await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", @@ -15,6 +18,9 @@ await esbuild.build({ }); await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", @@ -29,6 +35,9 @@ await esbuild.build({ }); await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", diff --git a/web/src/engine/package-cache/src/keyboardRequisitioner.ts b/web/src/engine/package-cache/src/keyboardRequisitioner.ts index 043b3a0362e..6a3f060510d 100644 --- a/web/src/engine/package-cache/src/keyboardRequisitioner.ts +++ b/web/src/engine/package-cache/src/keyboardRequisitioner.ts @@ -214,7 +214,7 @@ export default class KeyboardRequisitioner { } } - return [...errorStubs, ...completeStubs]; + return [].concat(errorStubs).concat(completeStubs); }); } diff --git a/web/src/engine/package-cache/tsconfig.json b/web/src/engine/package-cache/tsconfig.json index 84dc705d643..8d36452a685 100644 --- a/web/src/engine/package-cache/tsconfig.json +++ b/web/src/engine/package-cache/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": true, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", diff --git a/web/src/engine/paths/build-bundler.js b/web/src/engine/paths/build-bundler.js index dfb7bd9a362..3ab7b2c85e6 100644 --- a/web/src/engine/paths/build-bundler.js +++ b/web/src/engine/paths/build-bundler.js @@ -9,6 +9,9 @@ import esbuild from 'esbuild'; import { spawn } from 'child_process'; await esbuild.build({ + alias: { + 'tslib': '@keymanapp/tslib' + }, bundle: true, sourcemap: true, format: "esm", diff --git a/web/src/engine/paths/tsconfig.json b/web/src/engine/paths/tsconfig.json index 272527be3ef..7c84cc975c2 100644 --- a/web/src/engine/paths/tsconfig.json +++ b/web/src/engine/paths/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "allowJs": false, + "importHelpers": true, "inlineSources": true, "allowSyntheticDefaultImports": true, "module": "es6", From 754da7aa99ce871daa63d7c69881f4b2cfb51645 Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Wed, 31 May 2023 16:27:01 +0700 Subject: [PATCH 3/6] chore(web): cleanup, array-spread -> concat conversion --- package-lock.json | 1 + web/package.json | 1 + web/src/app/browser/build-bundler.js | 3 --- web/src/app/browser/src/keymanEngine.ts | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 749aeee4116..b0ccb18f595 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11029,6 +11029,7 @@ "@keymanapp/lexical-model-layer": "*", "@keymanapp/models-types": "*", "@keymanapp/recorder-core": "*", + "@keymanapp/tslib": "*", "@keymanapp/web-utils": "*", "@types/node": "^11.9.4", "eventemitter3": "^4.0.0", diff --git a/web/package.json b/web/package.json index 8e145576e07..21b17525a67 100644 --- a/web/package.json +++ b/web/package.json @@ -106,6 +106,7 @@ "@keymanapp/lexical-model-layer": "*", "@keymanapp/models-types": "*", "@keymanapp/recorder-core": "*", + "@keymanapp/tslib": "*", "@keymanapp/web-utils": "*", "@types/node": "^11.9.4", "eventemitter3": "^4.0.0", diff --git a/web/src/app/browser/build-bundler.js b/web/src/app/browser/build-bundler.js index 38ff1d875d2..a510fac277b 100644 --- a/web/src/app/browser/build-bundler.js +++ b/web/src/app/browser/build-bundler.js @@ -98,9 +98,6 @@ if(EMIT_FILESIZE_PROFILE) { await esbuild.build({ ...commonConfig, - alias: { - 'tslib': '@keymanapp/tslib' - }, format: "esm", entryPoints: { 'index': '../../../build/app/browser/obj/test-index.js', diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts index dd994f6a75c..4f43ef3e445 100644 --- a/web/src/app/browser/src/keymanEngine.ts +++ b/web/src/app/browser/src/keymanEngine.ts @@ -295,9 +295,9 @@ export default class KeymanEngine extends KeymanEngineBase Date: Thu, 1 Jun 2023 09:25:21 +0700 Subject: [PATCH 4/6] chore(web): build dependency links --- common/predictive-text/build.sh | 1 + common/web/keyboard-processor/build.sh | 1 + common/web/utils/build.sh | 1 + web/src/engine/package-cache/build.sh | 1 + web/src/engine/paths/build.sh | 1 + 5 files changed, 5 insertions(+) diff --git a/common/predictive-text/build.sh b/common/predictive-text/build.sh index 56680781f82..4fe5a744cb5 100755 --- a/common/predictive-text/build.sh +++ b/common/predictive-text/build.sh @@ -26,6 +26,7 @@ cd "$(dirname "$THIS_SCRIPT")" builder_describe "Builds the lm-layer module" \ "@/common/web/keyman-version" \ + "@/common/web/tslib" \ "@/common/web/lm-worker" \ "clean" \ "configure" \ diff --git a/common/web/keyboard-processor/build.sh b/common/web/keyboard-processor/build.sh index fc7bf1f1a60..01939b9e624 100755 --- a/common/web/keyboard-processor/build.sh +++ b/common/web/keyboard-processor/build.sh @@ -21,6 +21,7 @@ builder_describe \ "Compiles the web-oriented utility function module." \ "@/common/web/recorder test" \ "@/common/web/keyman-version" \ + "@/common/web/tslib" \ "@/common/web/utils" \ configure \ clean \ diff --git a/common/web/utils/build.sh b/common/web/utils/build.sh index bd55e007d63..d4ff9ef8f31 100755 --- a/common/web/utils/build.sh +++ b/common/web/utils/build.sh @@ -19,6 +19,7 @@ cd "$THIS_SCRIPT_PATH" builder_describe \ "Compiles the web-oriented utility function module." \ "@/common/web/keyman-version" \ + "@/common/web/tslib" \ clean configure build test \ "--ci For use with action ${BUILDER_TERM_START}test${BUILDER_TERM_END} - emits CI-friendly test reports" diff --git a/web/src/engine/package-cache/build.sh b/web/src/engine/package-cache/build.sh index 2f54efd2f81..0048fc4bc37 100755 --- a/web/src/engine/package-cache/build.sh +++ b/web/src/engine/package-cache/build.sh @@ -16,6 +16,7 @@ cd "$THIS_SCRIPT_PATH" # ################################ Main script ################################ builder_describe "Builds Keyman Engine modules for keyboard cloud-querying & caching + model caching." \ + "@/common/web/tslib" \ "@/common/web/input-processor build" \ "@/web/src/engine/paths" \ "clean" \ diff --git a/web/src/engine/paths/build.sh b/web/src/engine/paths/build.sh index 9904958767f..58064a0333f 100755 --- a/web/src/engine/paths/build.sh +++ b/web/src/engine/paths/build.sh @@ -16,6 +16,7 @@ cd "$THIS_SCRIPT_PATH" # ################################ Main script ################################ builder_describe "Builds configuration subclasses used by the Keyman Engine for Web (KMW)." \ + "@/common/web/tslib" \ "@/web/src/engine/osk build" \ "clean" \ "configure" \ From 77fc750186e844b3979af8533facd165a63a504d Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Thu, 8 Jun 2023 13:06:07 +0700 Subject: [PATCH 5/6] chore(web): cleanup per PR review --- common/web/tslib/build.sh | 4 ---- common/web/tslib/package.json | 10 ---------- web/src/app/browser/build-bundler.js | 1 - 3 files changed, 15 deletions(-) diff --git a/common/web/tslib/build.sh b/common/web/tslib/build.sh index d674ce9fb0a..92435e57040 100755 --- a/common/web/tslib/build.sh +++ b/common/web/tslib/build.sh @@ -1,8 +1,4 @@ #!/usr/bin/env bash -# -# Compiles common TS-based utility functions for use among Keyman's codebase - -set -eu ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary diff --git a/common/web/tslib/package.json b/common/web/tslib/package.json index 7de002c0171..164a5257ec4 100644 --- a/common/web/tslib/package.json +++ b/common/web/tslib/package.json @@ -7,16 +7,6 @@ "clean": "tsc -b --clean", "tsc": "tsc" }, - "repository": { - "type": "git", - "url": "git+https://github.com/keymanapp/keyman.git" - }, - "author": "SIL International", - "license": "MIT", - "bugs": { - "url": "https://github.com/keymanapp/keyman/issues" - }, - "homepage": "https://github.com/keymanapp/keyman#readme", "dependencies": { "tslib": "^2.5.2", "typescript": "^4.9.5" diff --git a/web/src/app/browser/build-bundler.js b/web/src/app/browser/build-bundler.js index a510fac277b..93b1b01c06e 100644 --- a/web/src/app/browser/build-bundler.js +++ b/web/src/app/browser/build-bundler.js @@ -63,7 +63,6 @@ const commonConfig = { }, outfile: '../../../build/app/browser/debug/keymanweb.js', plugins: [ es5ClassAnnotationAsPurePlugin ], - pure: ['__asyncDelegator'], target: "es5", treeShaking: true, tsconfig: './tsconfig.json' From 9aea971ac53366fa617bcb1cd6f5fee4490b39ed Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Fri, 9 Jun 2023 08:11:20 +0700 Subject: [PATCH 6/6] chore(common/web): cleanup per PR review --- common/web/tslib/build.sh | 2 +- common/web/tslib/package.json | 9 ++++++--- package-lock.json | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/common/web/tslib/build.sh b/common/web/tslib/build.sh index 92435e57040..411e32d8bbb 100755 --- a/common/web/tslib/build.sh +++ b/common/web/tslib/build.sh @@ -24,4 +24,4 @@ builder_parse "$@" builder_run_action configure verify_npm_setup builder_run_action clean rm -rf build/ -builder_run_action build tsc --build "$THIS_SCRIPT_PATH/tsconfig.json" \ No newline at end of file +builder_run_action build tsc --build \ No newline at end of file diff --git a/common/web/tslib/package.json b/common/web/tslib/package.json index 164a5257ec4..ac0c0d79cb2 100644 --- a/common/web/tslib/package.json +++ b/common/web/tslib/package.json @@ -3,13 +3,16 @@ "description": "An ES5 + esbuild-compatible wrapper for the 'tslib' library", "main": "./build/index.js", "scripts": { - "build": "gosh ./build.sh", - "clean": "tsc -b --clean", - "tsc": "tsc" + "build": "gosh ./build.sh build", + "clean": "gosh ./build.sh clean" }, "dependencies": { "tslib": "^2.5.2", "typescript": "^4.9.5" }, + "devDependencies": { + "@keymanapp/resources-gosh": "*", + "esbuild": "^0.15.16" + }, "type": "module" } diff --git a/package-lock.json b/package-lock.json index b0ccb18f595..960e9a30479 100644 --- a/package-lock.json +++ b/package-lock.json @@ -351,10 +351,13 @@ }, "common/web/tslib": { "name": "@keymanapp/tslib", - "license": "MIT", "dependencies": { "tslib": "^2.5.2", "typescript": "^4.9.5" + }, + "devDependencies": { + "@keymanapp/resources-gosh": "*", + "esbuild": "^0.15.16" } }, "common/web/types": {