Skip to content

Commit 6870309

Browse files
MTRNordMTRNord
committed
Ensure the coverage dependency is made a dependency and ensure we are not running in commonjs mode
Signed-off-by: MTRNord <[email protected]>
1 parent fadbb71 commit 6870309

File tree

8 files changed

+114
-13
lines changed

8 files changed

+114
-13
lines changed

‎example-widget-mui/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"tsc": "tsc",
3737
"build": "tsc && vite build",
3838
"test": "echo \"Tests have to run from root project\"",
39-
"depcheck": "depcheck --ignores=@types/node --ignore-dirs=build",
39+
"depcheck": "depcheck --ignores=@types/node,@vitest/coverage-v8 --ignore-dirs=build",
4040
"translate": "i18next src/**/*.{ts,tsx}",
4141
"check-api-report": "echo \"Nothing to report\"",
4242
"generate-api-report": "echo \"Nothing to report\""
@@ -64,6 +64,7 @@
6464
"@types/react-dom": "^18.2.24",
6565
"@vitejs/plugin-basic-ssl": "^1.1.0",
6666
"@vitejs/plugin-react-swc": "^3.7.0",
67+
"@vitest/coverage-v8": "^2.0.5",
6768
"axe-core": "^4.10.0",
6869
"happy-dom": "^15.7.3",
6970
"i18next-parser": "^9.0.2",

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"containers/*",
77
"packages/*"
88
],
9+
"type": "module",
910
"scripts": {
1011
"dev:example:https": "yarn workspace @matrix-widget-toolkit/example-widget-mui dev:https",
1112
"dev:example": "yarn workspace @matrix-widget-toolkit/example-widget-mui dev",
@@ -69,4 +70,4 @@
6970
"yarn": ">=1.22.1 <2.0.0"
7071
},
7172
"packageManager": "[email protected]+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
72-
}
73+
}

‎packages/api/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
"source": "./src/index.ts",
88
"module": "./src/index.ts",
99
"types": "./src/index.ts",
10+
"type": "module",
1011
"devDependencies": {
1112
"@rollup/plugin-commonjs": "^26.0.1",
1213
"@types/node": "^22.5.3",
1314
"@types/qs": "^6.9.15",
15+
"@vitest/coverage-v8": "^2.0.5",
1416
"typescript": "^5.5.4",
1517
"vite": "^5.4.3",
1618
"vitest": "^2.0.5"
@@ -20,7 +22,7 @@
2022
"tsc": "tsc",
2123
"lint": "eslint .",
2224
"test": "echo \"Tests have to run from root project\"",
23-
"depcheck": "depcheck --ignores=@types/node,@rollup/plugin-commonjs --ignore-dirs=lib",
25+
"depcheck": "depcheck --ignores=@types/node,@rollup/plugin-commonjs,@vitest/coverage-v8 --ignore-dirs=lib",
2426
"prepack": "node ../../scripts/prepack.js",
2527
"postpack": "node ../../scripts/postpack.js",
2628
"translate": "echo \"Nothing to translate\"",
@@ -50,4 +52,4 @@
5052
"widget",
5153
"matrix-widget-api"
5254
]
53-
}
55+
}

‎packages/mui/i18next-parser.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
module.exports = {
17+
const i18NextParserConfig = {
1818
locales: ['en', 'de'],
1919
output: 'src/locales/$LOCALE/$NAMESPACE.json',
2020
sort: true,
2121
resetDefaultValueLocale: 'en',
2222
};
23+
24+
export default i18NextParserConfig;

‎packages/mui/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
"source": "./src/index.ts",
88
"module": "./src/index.ts",
99
"types": "./src/index.ts",
10+
"type": "module",
1011
"devDependencies": {
1112
"@testing-library/jest-dom": "^6.5.0",
1213
"@testing-library/react": "^16.0.1",
1314
"@testing-library/user-event": "^14.5.2",
1415
"@types/lodash": "^4.17.7",
1516
"@types/node": "^22.5.3",
1617
"@types/react": "^18.2.74",
18+
"@vitest/coverage-v8": "^2.0.5",
1719
"axe-core": "^4.10.0",
1820
"copyfiles": "^2.4.1",
1921
"i18next-parser": "^9.0.2",
@@ -28,7 +30,7 @@
2830
"tsc": "tsc",
2931
"lint": "eslint .",
3032
"test": "echo \"Tests have to run from root project\"",
31-
"depcheck": "depcheck --ignores=@types/node --ignore-dirs=lib,build",
33+
"depcheck": "depcheck --ignores=@types/node,@vitest/coverage-v8 --ignore-dirs=lib,build",
3234
"prepack": "node ../../scripts/prepack.js",
3335
"postpack": "node ../../scripts/postpack.js",
3436
"translate": "i18next src/**/*.{ts,tsx}",

‎packages/react/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
"source": "./src/index.ts",
88
"module": "./src/index.ts",
99
"types": "./src/index.ts",
10+
"type": "module",
1011
"devDependencies": {
1112
"@testing-library/jest-dom": "^6.5.0",
1213
"@testing-library/react": "^16.0.1",
1314
"@testing-library/user-event": "^14.5.2",
1415
"@types/node": "^22.5.3",
1516
"@types/react": "^18.2.74",
17+
"@vitest/coverage-v8": "^2.0.5",
1618
"typescript": "^5.5.4",
1719
"vite": "^5.4.3",
1820
"vitest": "^2.0.5"
@@ -22,7 +24,7 @@
2224
"tsc": "tsc",
2325
"lint": "eslint .",
2426
"test": "echo \"Tests have to run from root project\"",
25-
"depcheck": "depcheck --ignores=@types/node --ignore-dirs=lib,build",
27+
"depcheck": "depcheck --ignores=@types/node,@vitest/coverage-v8 --ignore-dirs=lib,build",
2628
"prepack": "node ../../scripts/prepack.js",
2729
"postpack": "node ../../scripts/postpack.js",
2830
"translate": "echo \"Nothing to translate\"",
@@ -54,4 +56,4 @@
5456
"widget",
5557
"matrix-widget-api"
5658
]
57-
}
59+
}

‎packages/testing/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
"source": "./src/index.ts",
88
"module": "./src/index.ts",
99
"types": "./src/index.ts",
10+
"type": "module",
1011
"devDependencies": {
1112
"@types/lodash": "^4.17.7",
1213
"@types/node": "^22.5.3",
14+
"@vitest/coverage-v8": "^2.0.5",
1315
"typescript": "^5.5.4",
1416
"vite": "^5.4.3"
1517
},
@@ -18,7 +20,7 @@
1820
"tsc": "tsc",
1921
"lint": "eslint .",
2022
"test": "echo \"Tests have to run from root project\"",
21-
"depcheck": "depcheck --ignores=@types/node --ignore-dirs=lib",
23+
"depcheck": "depcheck --ignores=@types/node,@vitest/coverage-v8 --ignore-dirs=lib",
2224
"prepack": "node ../../scripts/prepack.js",
2325
"postpack": "node ../../scripts/postpack.js",
2426
"translate": "echo \"Nothing to translate\"",

‎yarn.lock

Lines changed: 93 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
js-tokens "^4.0.0"
6262
picocolors "^1.0.0"
6363

64-
"@babel/parser@^7.23.0", "@babel/parser@^7.25.0", "@babel/parser@^7.25.3", "@babel/parser@^7.25.6":
64+
"@babel/parser@^7.23.0", "@babel/parser@^7.25.0", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6":
6565
version "7.25.6"
6666
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.6.tgz#85660c5ef388cbbf6e3d2a694ee97a38f18afe2f"
6767
integrity sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==
@@ -97,7 +97,7 @@
9797
debug "^4.3.1"
9898
globals "^11.1.0"
9999

100-
"@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.6":
100+
"@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.4", "@babel/types@^7.25.6":
101101
version "7.25.6"
102102
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6"
103103
integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==
@@ -106,6 +106,11 @@
106106
"@babel/helper-validator-identifier" "^7.24.7"
107107
to-fast-properties "^2.0.0"
108108

109+
"@bcoe/v8-coverage@^0.2.3":
110+
version "0.2.3"
111+
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
112+
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
113+
109114
"@bundled-es-modules/cookie@^2.0.0":
110115
version "2.0.0"
111116
resolved "https://registry.yarnpkg.com/@bundled-es-modules/cookie/-/cookie-2.0.0.tgz#c3b82703969a61cf6a46e959a012b2c257f6b164"
@@ -804,6 +809,11 @@
804809
wrap-ansi "^8.1.0"
805810
wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
806811

812+
"@istanbuljs/schema@^0.1.2":
813+
version "0.1.3"
814+
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
815+
integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
816+
807817
"@jridgewell/gen-mapping@^0.3.5":
808818
version "0.3.5"
809819
resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
@@ -828,7 +838,7 @@
828838
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
829839
integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
830840

831-
"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
841+
"@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
832842
version "0.3.25"
833843
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
834844
integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
@@ -1614,6 +1624,24 @@
16141624
dependencies:
16151625
"@swc/core" "^1.5.7"
16161626

1627+
"@vitest/coverage-v8@^2.0.5":
1628+
version "2.0.5"
1629+
resolved "https://registry.yarnpkg.com/@vitest/coverage-v8/-/coverage-v8-2.0.5.tgz#411961ce4fd1177a32b4dd74ab576ed3b859155e"
1630+
integrity sha512-qeFcySCg5FLO2bHHSa0tAZAOnAUbp4L6/A5JDuj9+bt53JREl8hpLjLHEWF0e/gWc8INVpJaqA7+Ene2rclpZg==
1631+
dependencies:
1632+
"@ampproject/remapping" "^2.3.0"
1633+
"@bcoe/v8-coverage" "^0.2.3"
1634+
debug "^4.3.5"
1635+
istanbul-lib-coverage "^3.2.2"
1636+
istanbul-lib-report "^3.0.1"
1637+
istanbul-lib-source-maps "^5.0.6"
1638+
istanbul-reports "^3.1.7"
1639+
magic-string "^0.30.10"
1640+
magicast "^0.3.4"
1641+
std-env "^3.7.0"
1642+
test-exclude "^7.0.1"
1643+
tinyrainbow "^1.2.0"
1644+
16171645
"@vitest/[email protected]":
16181646
version "2.0.5"
16191647
resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-2.0.5.tgz#f3745a6a2c18acbea4d39f5935e913f40d26fa86"
@@ -2484,7 +2512,7 @@ debug@^2.2.0:
24842512
dependencies:
24852513
ms "2.0.0"
24862514

2487-
debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@~4.3.6:
2515+
debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@~4.3.6:
24882516
version "4.3.7"
24892517
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
24902518
integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
@@ -3585,6 +3613,11 @@ homedir-polyfill@^1.0.1:
35853613
dependencies:
35863614
parse-passwd "^1.0.0"
35873615

3616+
html-escaper@^2.0.0:
3617+
version "2.0.2"
3618+
resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
3619+
integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
3620+
35883621
html-parse-stringify@^3.0.1:
35893622
version "3.0.1"
35903623
resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2"
@@ -4022,6 +4055,37 @@ isexe@^2.0.0:
40224055
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
40234056
integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
40244057

4058+
istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.2:
4059+
version "3.2.2"
4060+
resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
4061+
integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
4062+
4063+
istanbul-lib-report@^3.0.0, istanbul-lib-report@^3.0.1:
4064+
version "3.0.1"
4065+
resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
4066+
integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
4067+
dependencies:
4068+
istanbul-lib-coverage "^3.0.0"
4069+
make-dir "^4.0.0"
4070+
supports-color "^7.1.0"
4071+
4072+
istanbul-lib-source-maps@^5.0.6:
4073+
version "5.0.6"
4074+
resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz#acaef948df7747c8eb5fbf1265cb980f6353a441"
4075+
integrity sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==
4076+
dependencies:
4077+
"@jridgewell/trace-mapping" "^0.3.23"
4078+
debug "^4.1.1"
4079+
istanbul-lib-coverage "^3.0.0"
4080+
4081+
istanbul-reports@^3.1.7:
4082+
version "3.1.7"
4083+
resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
4084+
integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
4085+
dependencies:
4086+
html-escaper "^2.0.0"
4087+
istanbul-lib-report "^3.0.0"
4088+
40254089
iterator.prototype@^1.1.2:
40264090
version "1.1.2"
40274091
resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0"
@@ -4297,6 +4361,22 @@ magic-string@^0.30.10, magic-string@^0.30.11, magic-string@^0.30.3:
42974361
dependencies:
42984362
"@jridgewell/sourcemap-codec" "^1.5.0"
42994363

4364+
magicast@^0.3.4:
4365+
version "0.3.5"
4366+
resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.3.5.tgz#8301c3c7d66704a0771eb1bad74274f0ec036739"
4367+
integrity sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==
4368+
dependencies:
4369+
"@babel/parser" "^7.25.4"
4370+
"@babel/types" "^7.25.4"
4371+
source-map-js "^1.2.0"
4372+
4373+
make-dir@^4.0.0:
4374+
version "4.0.0"
4375+
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
4376+
integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
4377+
dependencies:
4378+
semver "^7.5.3"
4379+
43004380
matcher-collection@^2.0.0:
43014381
version "2.0.1"
43024382
resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
@@ -5796,6 +5876,15 @@ term-size@^2.1.0:
57965876
resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
57975877
integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
57985878

5879+
test-exclude@^7.0.1:
5880+
version "7.0.1"
5881+
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-7.0.1.tgz#20b3ba4906ac20994e275bbcafd68d510264c2a2"
5882+
integrity sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==
5883+
dependencies:
5884+
"@istanbuljs/schema" "^0.1.2"
5885+
glob "^10.4.1"
5886+
minimatch "^9.0.4"
5887+
57995888
text-decoder@^1.1.0:
58005889
version "1.1.1"
58015890
resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.1.1.tgz#5df9c224cebac4a7977720b9f083f9efa1aefde8"

0 commit comments

Comments
 (0)