Tooling fixes (#1321)

* Fix versioning * Fix native mocha support
project-chip · Oct 27, 2024 · de3c9d2 · de3c9d2
1 parent d35d53b
commit de3c9d2
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 20 deletions.
diff --git a/chip-testing/.mocharc.cjs b/chip-testing/.mocharc.cjs
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-module.exports = require("@matter/tools").mocharc();
+module.exports = require("@matter/testing").mocharc();
diff --git a/packages/general/.mocharc.cjs b/packages/general/.mocharc.cjs
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-module.exports = require("@matter/tools").mocharc();
+module.exports = require("@matter/testing").mocharc();
diff --git a/packages/matter.js/.mocharc.cjs b/packages/matter.js/.mocharc.cjs
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-module.exports = require("@matter/tools").mocharc();
+module.exports = require("@matter/testing").mocharc();
diff --git a/packages/model/.mocharc.cjs b/packages/model/.mocharc.cjs
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-module.exports = require("@matter/tools").mocharc();
+module.exports = require("@matter/testing").mocharc();
diff --git a/packages/node/.mocharc.cjs b/packages/node/.mocharc.cjs
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-module.exports = require("@matter/tools").mocharc();
+module.exports = require("@matter/testing").mocharc();
diff --git a/packages/nodejs/.mocharc.cjs b/packages/nodejs/.mocharc.cjs
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-module.exports = require("@matter/tools").mocharc();
+module.exports = require("@matter/testing").mocharc();
diff --git a/packages/protocol/.mocharc.cjs b/packages/protocol/.mocharc.cjs
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-module.exports = require("@matter/tools").mocharc();
+module.exports = require("@matter/testing").mocharc();
diff --git a/packages/testing/src/mocharc.cjs b/packages/testing/src/mocharc.cjs
@@ -16,9 +16,9 @@ if (globalThis.crypto === undefined) {
 function mocharc(format = "cjs") {
     const { resolve } = require("path");
     const cli = require("mocha/lib/cli/cli");
-    const listSupportFiles = require("./files.js").listSupportFiles;
+    const listSupportFiles = require("./util/files.js").listSupportFiles;
 
-    const TOOLS = resolve(__dirname, "../../..");
+    const TOOLS = resolve(__dirname, "../../../tools");
 
     const testJs = `build/${format}/test`;
     const defaultSpec = `${testJs}/**/*Test.js`;

diff --git a/packages/tools/.mocharc.cjs b/packages/tools/.mocharc.cjs
diff --git a/packages/tools/src/versioning/cli.ts b/packages/tools/src/versioning/cli.ts
@@ -18,14 +18,16 @@ interface Args {
 }
 
 export async function main(argv = process.argv) {
-    const args = commander("matter-version", "Manipulate monorepo package versions.")
+    const program = commander("matter-version", "Manipulate monorepo package versions.")
         .argument("[version]")
         .option("-p, --prefix <prefix>", "specify monorepo directory")
         .option("-s, --set", "sets the release version")
         .option("-a, --apply", "sets package versions to the release version")
         .option("-t, --tag", "adds git tag for release version")
-        .parse(argv)
-        .opts<Args>();
+        .parse(argv);
+
+    const args = program.opts<Args>();
+    args.version = program.args[0];
 
     const version = args.version;
     const pkg = new Package({ path: args.prefix });

diff --git a/packages/types/.mocharc.cjs b/packages/types/.mocharc.cjs
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-module.exports = require("@matter/tools").mocharc();
+module.exports = require("@matter/testing").mocharc();