From 2a6d0912b681e35827a1ea69177661265e3d8407 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Sat, 16 Dec 2023 07:46:44 +1300
Subject: [PATCH] Avoid rollup step for schema-cli package

---
 .../schema-cli/bin/preserves-schema-ts.js       |  2 +-
 .../schema-cli/bin/preserves-schemac.js         |  2 +-
 .../javascript/packages/schema-cli/package.json |  4 +---
 .../packages/schema-cli/rollup.config.mjs       | 17 -----------------
 .../packages/schema-cli/tsconfig.json           |  1 +
 5 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 implementations/javascript/packages/schema-cli/rollup.config.mjs

diff --git a/implementations/javascript/packages/schema-cli/bin/preserves-schema-ts.js b/implementations/javascript/packages/schema-cli/bin/preserves-schema-ts.js
index 557ba22..9a21b11 100755
--- a/implementations/javascript/packages/schema-cli/bin/preserves-schema-ts.js
+++ b/implementations/javascript/packages/schema-cli/bin/preserves-schema-ts.js
@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../dist/bin/preserves-schema-ts.js').main(process.argv.slice(2));
+require('../lib/bin/preserves-schema-ts.js').main(process.argv.slice(2));
diff --git a/implementations/javascript/packages/schema-cli/bin/preserves-schemac.js b/implementations/javascript/packages/schema-cli/bin/preserves-schemac.js
index 7cb0734..eb6d84f 100755
--- a/implementations/javascript/packages/schema-cli/bin/preserves-schemac.js
+++ b/implementations/javascript/packages/schema-cli/bin/preserves-schemac.js
@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../dist/bin/preserves-schemac.js').main(process.argv.slice(2));
+require('../lib/bin/preserves-schemac.js').main(process.argv.slice(2));
diff --git a/implementations/javascript/packages/schema-cli/package.json b/implementations/javascript/packages/schema-cli/package.json
index 8215df8..c9dafc0 100644
--- a/implementations/javascript/packages/schema-cli/package.json
+++ b/implementations/javascript/packages/schema-cli/package.json
@@ -11,11 +11,9 @@
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "scripts": {
     "clean": "rm -rf lib dist",
-    "prepare": "yarn compile && yarn rollup",
+    "prepare": "yarn compile",
     "compile": "tsc",
     "compile:watch": "yarn compile -w",
-    "rollup": "rollup -c",
-    "rollup:watch": "yarn rollup -w",
     "test": "true",
     "veryclean": "yarn run clean && rm -rf node_modules"
   },
diff --git a/implementations/javascript/packages/schema-cli/rollup.config.mjs b/implementations/javascript/packages/schema-cli/rollup.config.mjs
deleted file mode 100644
index be21d34..0000000
--- a/implementations/javascript/packages/schema-cli/rollup.config.mjs
+++ /dev/null
@@ -1,17 +0,0 @@
-import terser from '@rollup/plugin-terser';
-
-function cli(name) {
-  return {
-    input: `lib/bin/${name}.js`,
-    output: [{file: `dist/bin/${name}.js`, format: 'commonjs'}],
-    external: [
-      '@preserves/core',
-      '@preserves/schema',
-    ],
-  };
-}
-
-export default [
-  cli('preserves-schema-ts'),
-  cli('preserves-schemac'),
-];
diff --git a/implementations/javascript/packages/schema-cli/tsconfig.json b/implementations/javascript/packages/schema-cli/tsconfig.json
index 299625c..a6151a1 100644
--- a/implementations/javascript/packages/schema-cli/tsconfig.json
+++ b/implementations/javascript/packages/schema-cli/tsconfig.json
@@ -9,6 +9,7 @@
     "declarationDir": "./lib",
     "esModuleInterop": true,
     "moduleResolution": "node",
+    "module": "commonjs",
     "sourceMap": true,
     "strict": true
   },