diff --git a/package.json b/package.json index 2cc4286251c1..703695edd727 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@actions/core": "^1.4.0", "@actions/exec": "^1.1.0", "@actions/github": "^5.0.0", - "@alcalzone/esm2cjs": "^1.0.0", + "@alcalzone/esm2cjs": "^1.1.0", "@alcalzone/jsonl-db": "^1.3.0", "@alcalzone/release-script": "^2.2.0", "@babel/core": "^7.14.6", diff --git a/packages/config/package.json b/packages/config/package.json index 0bdaaa21e920..65f81adb9755 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -49,6 +49,7 @@ "ts": "node -r esbuild-register" }, "dependencies": { + "@alcalzone/esm2cjs": "^1.1.0", "@zwave-js/core": "7.10.1", "@zwave-js/shared": "7.10.1", "alcalzone-shared": "^4.0.0", diff --git a/packages/core/package.json b/packages/core/package.json index 185f73a7dd93..88cbce9e9510 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -45,6 +45,7 @@ "watch": "yarn run build --watch --pretty" }, "dependencies": { + "@alcalzone/esm2cjs": "^1.1.0", "@alcalzone/jsonl-db": "^1.3.0", "@zwave-js/shared": "7.10.1", "@zwave-js/winston-daily-rotate-file": "^4.5.6-0", diff --git a/packages/maintenance/package.json b/packages/maintenance/package.json index 636342d0f58b..dc64a5095549 100644 --- a/packages/maintenance/package.json +++ b/packages/maintenance/package.json @@ -43,6 +43,7 @@ "watch": "yarn run build --watch --pretty" }, "devDependencies": { + "@alcalzone/esm2cjs": "^1.1.0", "@types/clipboardy": "^2", "@types/fs-extra": "^9.0.11", "@types/jest": "^26.0.23", diff --git a/packages/maintenance/src/generateTypedDocs.ts b/packages/maintenance/src/generateTypedDocs.ts index 7a4732788aad..264f9490b8c6 100644 --- a/packages/maintenance/src/generateTypedDocs.ts +++ b/packages/maintenance/src/generateTypedDocs.ts @@ -206,7 +206,6 @@ export function findImportRanges(docFile: string): ImportRange[] { const matches = [...docFile.matchAll(importRegex)]; return matches.map((match) => ({ index: match.index!, - // eslint-disable-next-line @typescript-eslint/restrict-plus-operands end: match.index! + match[0].length, module: match.groups!.module, symbol: match.groups!.symbol, diff --git a/packages/serial/package.json b/packages/serial/package.json index e5a96d57f78b..9209f533f91a 100644 --- a/packages/serial/package.json +++ b/packages/serial/package.json @@ -53,6 +53,7 @@ "winston": "^3.3.3" }, "devDependencies": { + "@alcalzone/esm2cjs": "^1.1.0", "@serialport/binding-mock": "^9.0.7", "@types/jest": "^26.0.23", "@types/node": "^15.12.5", diff --git a/packages/shared/package.json b/packages/shared/package.json index da7b121aa316..f7b762a6a773 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -49,6 +49,7 @@ "watch": "yarn run build --watch --pretty" }, "devDependencies": { + "@alcalzone/esm2cjs": "^1.1.0", "@types/fs-extra": "^9.0.11", "@types/jest": "^26.0.23", "@types/node": "^15.12.5", diff --git a/packages/testing/package.json b/packages/testing/package.json index 2ab089b1470f..d99acd3273aa 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -43,6 +43,7 @@ "watch": "yarn run build --watch --pretty" }, "devDependencies": { + "@alcalzone/esm2cjs": "^1.1.0", "@types/jest": "^26.0.23", "@types/node": "^15.12.5", "@types/triple-beam": "^1.3.2", diff --git a/packages/zwave-js/package.json b/packages/zwave-js/package.json index 26b384d0eaae..6d49c2877354 100644 --- a/packages/zwave-js/package.json +++ b/packages/zwave-js/package.json @@ -87,6 +87,7 @@ "xstate": "^4.20.2" }, "devDependencies": { + "@alcalzone/esm2cjs": "^1.1.0", "@types/fs-extra": "^9.0.11", "@types/jest": "^26.0.23", "@types/node": "^15.12.5", diff --git a/yarn.lock b/yarn.lock index a7ae75143752..154337a2ace8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -49,7 +49,7 @@ __metadata: languageName: node linkType: hard -"@alcalzone/esm2cjs@npm:^1.0.0": +"@alcalzone/esm2cjs@npm:^1.1.0": version: 1.1.0 resolution: "@alcalzone/esm2cjs@npm:1.1.0" dependencies: @@ -3457,13 +3457,6 @@ __metadata: languageName: node linkType: hard -"@types/mockdate@npm:^2.0.0": - version: 2.0.0 - resolution: "@types/mockdate@npm:2.0.0" - checksum: f85c687fb017e7de1ebcbc3f043116b46d03a283f644c1fb5243a7009df01584095ab4e8e30fdd77e1f933c175b3c004167c0c74671107d1913aeed7919d0957 - languageName: node - linkType: hard - "@types/node@npm:*": version: 16.0.0 resolution: "@types/node@npm:16.0.0" @@ -3499,7 +3492,7 @@ __metadata: languageName: node linkType: hard -"@types/prettier@npm:^2, @types/prettier@npm:^2.0.0, @types/prettier@npm:^2.2.3": +"@types/prettier@npm:^2, @types/prettier@npm:^2.0.0": version: 2.3.1 resolution: "@types/prettier@npm:2.3.1" checksum: 545891e0ecbb60345263e4f142d406b3d4ff97bb24605f247844af55f6523e974d3c7b0b7a83f59467e078e193c879b9491ec24c652c536f1905a4966b3e5784 @@ -3538,7 +3531,7 @@ __metadata: languageName: node linkType: hard -"@types/source-map-support@npm:^0, @types/source-map-support@npm:^0.5.3": +"@types/source-map-support@npm:^0": version: 0.5.3 resolution: "@types/source-map-support@npm:0.5.3" dependencies: @@ -3568,7 +3561,7 @@ __metadata: languageName: node linkType: hard -"@types/xml2json@npm:^0.11.3, @types/xml2json@npm:^0.11.4": +"@types/xml2json@npm:^0.11.4": version: 0.11.4 resolution: "@types/xml2json@npm:0.11.4" dependencies: @@ -3602,7 +3595,7 @@ __metadata: languageName: node linkType: hard -"@types/yargs@npm:^16.0.1, @types/yargs@npm:^16.0.4": +"@types/yargs@npm:^16.0.4": version: 16.0.4 resolution: "@types/yargs@npm:16.0.4" dependencies: @@ -3735,6 +3728,7 @@ __metadata: version: 0.0.0-use.local resolution: "@zwave-js/config@workspace:packages/config" dependencies: + "@alcalzone/esm2cjs": ^1.1.0 "@types/fs-extra": ^9.0.11 "@types/jest": ^26.0.23 "@types/js-levenshtein": ^1.1.0 @@ -3771,6 +3765,7 @@ __metadata: version: 0.0.0-use.local resolution: "@zwave-js/core@workspace:packages/core" dependencies: + "@alcalzone/esm2cjs": ^1.1.0 "@alcalzone/jsonl-db": ^1.3.0 "@types/jest": ^26.0.23 "@types/node": ^15.12.5 @@ -3804,6 +3799,7 @@ __metadata: version: 0.0.0-use.local resolution: "@zwave-js/maintenance@workspace:packages/maintenance" dependencies: + "@alcalzone/esm2cjs": ^1.1.0 "@types/clipboardy": ^2 "@types/fs-extra": ^9.0.11 "@types/jest": ^26.0.23 @@ -3833,7 +3829,7 @@ __metadata: "@actions/core": ^1.4.0 "@actions/exec": ^1.1.0 "@actions/github": ^5.0.0 - "@alcalzone/esm2cjs": ^1.0.0 + "@alcalzone/esm2cjs": ^1.1.0 "@alcalzone/jsonl-db": ^1.3.0 "@alcalzone/release-script": ^2.2.0 "@babel/core": ^7.14.6 @@ -3848,28 +3844,12 @@ __metadata: "@fimbul/mithotyn": ^0.24.0 "@fimbul/wotan": ^0.24.0 "@tsconfig/node12": ^1.0.8 - "@types/fs-extra": ^9.0.11 "@types/jest": ^26.0.23 - "@types/js-levenshtein": ^1.1.0 - "@types/json-logic-js": ^1.2.1 - "@types/mockdate": ^2.0.0 "@types/node": ^15.12.5 - "@types/pegjs": ^0.10.2 - "@types/prettier": ^2.2.3 - "@types/semver": ^7.3.6 - "@types/serialport": ^8.0.1 - "@types/source-map-support": ^0.5.3 - "@types/triple-beam": ^1.3.2 - "@types/xml2json": ^0.11.3 - "@types/yargs": ^16.0.1 "@typescript-eslint/eslint-plugin": ^4.28.1 "@typescript-eslint/parser": ^4.28.1 "@zwave-js/config": 7.10.1 "@zwave-js/core": 7.10.1 - ansi-colors: ^4.1.1 - axios: ^0.21.1 - clipboardy: ^2.3.0 - comment-json: ^4.1.0 commitizen: ^4.2.4 coveralls: ^3.1.1 cz-conventional-changelog: ^3.3.0 @@ -3882,21 +3862,11 @@ __metadata: jest: ^26.6.3 jest-extended: ^0.11.5 lerna: ^4.0.0 - minimatch: ^3.0.4 - mockdate: ^3.0.5 - pegjs: ^0.10.0 prettier: ^2.3.2 prettier-plugin-organize-imports: ^2.2.0 reflect-metadata: ^0.1.13 - semver: ^7.3.2 - supports-color: ^8.1.1 - tiny-glob: ^0.2.9 - ts-morph: ^11.0.0 ts-node: ^10.0.0 - ts-pegjs: ^0.3.1 typescript: ^4.3.5 - xml2json: ^0.12.0 - yargs: ^16.0.3 zwave-js: 7.10.1 languageName: unknown linkType: soft @@ -3905,6 +3875,7 @@ __metadata: version: 0.0.0-use.local resolution: "@zwave-js/serial@workspace:packages/serial" dependencies: + "@alcalzone/esm2cjs": ^1.1.0 "@sentry/node": ^6.8.0 "@serialport/binding-mock": ^9.0.7 "@types/jest": ^26.0.23 @@ -3927,6 +3898,7 @@ __metadata: version: 0.0.0-use.local resolution: "@zwave-js/shared@workspace:packages/shared" dependencies: + "@alcalzone/esm2cjs": ^1.1.0 "@types/fs-extra": ^9.0.11 "@types/jest": ^26.0.23 "@types/node": ^15.12.5 @@ -3938,24 +3910,15 @@ __metadata: languageName: unknown linkType: soft -"@zwave-js/shared@npm:7.7.3": - version: 7.7.3 - resolution: "@zwave-js/shared@npm:7.7.3" - dependencies: - alcalzone-shared: ^3.0.4 - checksum: b75a4c32757179a0f182882a9fbc80c95473a382d17278d24ccce7b73ded8b3c16169f4ee0ee9ac35df56be15fdc597053d16bb0c93c3ff3342205d878b054ab - languageName: node - linkType: hard - "@zwave-js/testing@7.10.1, @zwave-js/testing@workspace:packages/testing": version: 0.0.0-use.local resolution: "@zwave-js/testing@workspace:packages/testing" dependencies: + "@alcalzone/esm2cjs": ^1.1.0 "@types/jest": ^26.0.23 "@types/node": ^15.12.5 "@types/triple-beam": ^1.3.2 "@zwave-js/core": 7.10.1 - "@zwave-js/shared": 7.7.3 ansi-colors: ^4.1.1 esbuild-register: ^2.6.0 jest-extended: ^0.11.5 @@ -12223,15 +12186,6 @@ fsevents@^2.1.2: languageName: node linkType: hard -"supports-color@npm:^8.1.1": - version: 8.1.1 - resolution: "supports-color@npm:8.1.1" - dependencies: - has-flag: ^4.0.0 - checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406 - languageName: node - linkType: hard - "supports-hyperlinks@npm:^2.0.0": version: 2.2.0 resolution: "supports-hyperlinks@npm:2.2.0" @@ -13393,7 +13347,7 @@ typescript@^4.3.5: languageName: node linkType: hard -"yargs@npm:^16.0.3, yargs@npm:^16.2.0": +"yargs@npm:^16.2.0": version: 16.2.0 resolution: "yargs@npm:16.2.0" dependencies: @@ -13441,6 +13395,7 @@ typescript@^4.3.5: version: 0.0.0-use.local resolution: "zwave-js@workspace:packages/zwave-js" dependencies: + "@alcalzone/esm2cjs": ^1.1.0 "@alcalzone/jsonl-db": ^1.3.0 "@alcalzone/pak": ^0.6.0 "@sentry/integrations": ^6.8.0