ci: add NPM publish

.github/workflows/release.yml

@@ -117,7 +117,7 @@ jobs:
           pnpm install
           git config user.name "Github Actions Bot"
           git config user.email "<>"
-          node scripts/set-version.mjs $(git describe --tag --abbrev=0)
+          node scripts/set-version.ts $(git describe --tag --abbrev=0)
           pnpm publish -r --publish-branch main --access public --no-git-checks
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morten-olsen/mini-loader-repo",
   "private": "true",
-  "license": "GPL-3.0",
+  "license": "GPL-3.0-or-later",
   "packageManager": "pnpm@8.10.4",
   "version": "1.0.0",
   "scripts": {
@@ -23,10 +23,5 @@
     "@pnpm/find-workspace-packages": "^6.0.9",
     "@types/node": "^20.10.8",
     "ts-node": "^10.9.2"
-  },
-  "homepage": "https://github.com/morten-olsen/mini-loader",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/morten-olsen/mini-loader"
   }
 }

packages/cli/README.md

@@ -1 +0,0 @@
-[Go to documentation](https://github.com/morten-olsen/mini-loader)

packages/cli/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
-  "license": "GPL-3.0",
+  "license": "GPL-3.0-or-later",
   "bin": {
     "mini-loader": "./bin/index.mjs"
   },
@@ -42,10 +42,5 @@
     "@morten-olsen/mini-loader-server": "workspace:^",
     "@types/inquirer": "^9.0.7",
     "typescript": "^5.3.3"
-  },
-  "homepage": "https://github.com/morten-olsen/mini-loader",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/morten-olsen/mini-loader"
   }
 }

packages/cli/src/commands/artifacts/artifacts.list.ts

@@ -2,7 +2,6 @@ import { Command } from 'commander';
 import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
 
 const list = new Command('list');
 
@@ -22,8 +21,7 @@ list
   .option('-a, --limit <limit>', 'Limit', '1000')
   .action(async () => {
     const { runId, loadId, offset, limit } = list.opts();
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/commands/artifacts/artifacts.pull.ts

@@ -4,7 +4,6 @@ import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
 import { dirname, resolve } from 'path';
 import { mkdir, writeFile } from 'fs/promises';
-import { Config } from '../../config/config.js';
 
 const pull = new Command('pull');
 
@@ -13,8 +12,7 @@ pull
   .argument('<artifact-id>', 'Artifact ID')
   .argument('<file>', 'File to save')
   .action(async (id, file) => {
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const target = resolve(file);
     const client = await step('Connecting to server', async () => {
       return createClient(context);

packages/cli/src/commands/artifacts/artifacts.remove.ts

@@ -3,7 +3,6 @@ import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
 import inquirer from 'inquirer';
-import { Config } from '../../config/config.js';
 
 const remove = new Command('remove');
 
@@ -23,8 +22,7 @@ remove
   .option('-a, --limit <limit>', 'Limit', '1000')
   .action(async () => {
     const { runId, loadId, offset, limit } = remove.opts();
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/commands/auth/auth.login.ts

@@ -2,14 +2,12 @@ import { Command } from 'commander';
 import inquerer from 'inquirer';
 import { Context } from '../../context/context.js';
 import { step } from '../../utils/step.js';
-import { Config } from '../../config/config.js';
 
 const login = new Command('login');
 
 login.description('Login to your account');
 login.action(async () => {
-  const config = new Config();
-  const context = new Context(config.context);
+  const context = new Context();
   const { host, token } = await inquerer.prompt([
     {
       type: 'input',

packages/cli/src/commands/contexts/contexts.current.ts

@@ -1,10 +0,0 @@
-import { Command } from 'commander';
-import { Config } from '../../config/config.js';
-
-const current = new Command('current');
-current.action(async () => {
-  const config = new Config();
-  console.log(config.context);
-});
-
-export { current };

packages/cli/src/commands/contexts/contexts.list.ts

@@ -1,11 +0,0 @@
-import { Command } from 'commander';
-import { Context } from '../../context/context.js';
-
-const list = new Command('list');
-list.alias('ls').description('List contexts');
-list.action(async () => {
-  const contexts = await Context.list();
-  console.table(contexts);
-});
-
-export { list };

packages/cli/src/commands/contexts/contexts.ts

@@ -1,12 +0,0 @@
-import { Command } from 'commander';
-import { list } from './contexts.list.js';
-import { use } from './contexts.use.js';
-import { current } from './contexts.current.js';
-
-const contexts = new Command('contexts');
-contexts.description('Manage contexts');
-contexts.addCommand(list);
-contexts.addCommand(use);
-contexts.addCommand(current);
-
-export { contexts };

packages/cli/src/commands/contexts/contexts.use.ts

@@ -1,11 +0,0 @@
-import { Command } from 'commander';
-import { Config } from '../../config/config.js';
-
-const use = new Command('use');
-
-use.argument('<name>').action(async (name) => {
-  const config = new Config();
-  await config.setContext(name);
-});
-
-export { use };

packages/cli/src/commands/loads/loads.list.ts

@@ -2,7 +2,6 @@ import { Command } from 'commander';
 import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
 
 const list = new Command('list');
 
@@ -10,8 +9,7 @@ list
   .alias('ls')
   .description('List loads')
   .action(async () => {
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/commands/loads/loads.push.ts

@@ -4,7 +4,6 @@ import { createClient } from '../../client/client.js';
 import { bundle } from '../../bundler/bundler.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
 
 const push = new Command('push');
 
@@ -16,8 +15,7 @@ push
   .option('-ai, --auto-install', 'Auto install dependencies', false)
   .action(async (script) => {
     const opts = push.opts();
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const location = resolve(script);
     const client = await step('Connecting to server', async () => {
       return createClient(context);

packages/cli/src/commands/logs/logs.list.ts

@@ -2,7 +2,6 @@ import { Command } from 'commander';
 import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
 
 const list = new Command('list');
 
@@ -24,8 +23,7 @@ list
   .option('-s, --sort <order>', 'Sort', 'desc')
   .action(async () => {
     const { runId, loadId, severities, offset, limit, order } = list.opts();
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/commands/logs/logs.remove.ts

@@ -3,7 +3,6 @@ import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
 import inquirer from 'inquirer';
-import { Config } from '../../config/config.js';
 
 const remove = new Command('remove');
 
@@ -25,8 +24,7 @@ remove
   .option('-s, --sort <order>', 'Sort', 'desc')
   .action(async () => {
     const { runId, loadId, severities, offset, limit, order } = remove.opts();
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/commands/runs/runs.create.ts

@@ -2,7 +2,6 @@ import { Command } from 'commander';
 import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
 
 const create = new Command('create');
 
@@ -10,8 +9,7 @@ create
   .description('Create a new run')
   .argument('load-id', 'Load ID')
   .action(async (loadId) => {
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/commands/runs/runs.list.ts

@@ -2,7 +2,6 @@ import { Command } from 'commander';
 import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
 
 const list = new Command('list');
 
@@ -11,8 +10,7 @@ list
   .description('Find a run')
   .argument('[load-id]', 'Load ID')
   .action(async (loadId) => {
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/commands/secrets/secrets.list.ts

@@ -2,7 +2,6 @@ import { Command } from 'commander';
 import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
 
 const list = new Command('list');
 
@@ -20,8 +19,7 @@ list
   .option('-a, --limit <limit>', 'Limit', '1000')
   .action(async () => {
     const { offset, limit } = list.opts();
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/commands/secrets/secrets.remove.ts

@@ -2,7 +2,6 @@ import { Command } from 'commander';
 import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
 
 const remove = new Command('remove');
 
@@ -10,8 +9,7 @@ remove
   .alias('rm')
   .argument('<id>')
   .action(async (id) => {
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/commands/secrets/secrets.set.ts

@@ -2,7 +2,6 @@ import { Command } from 'commander';
 import { createClient } from '../../client/client.js';
 import { step } from '../../utils/step.js';
 import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
 
 const set = new Command('set');
 
@@ -10,8 +9,7 @@ set
   .argument('<id>')
   .argument('[value]')
   .action(async (id, value) => {
-    const config = new Config();
-    const context = new Context(config.context);
+    const context = new Context();
     const client = await step('Connecting to server', async () => {
       return createClient(context);
     });

packages/cli/src/config/config.ts

@@ -1,44 +0,0 @@
-import envPaths from 'env-paths';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { mkdir } from 'fs/promises';
-import { join, dirname } from 'path';
-
-type ConfigValues = {
-  context?: string;
-};
-
-class Config {
-  #location: string;
-  #config?: ConfigValues;
-
-  constructor() {
-    const paths = envPaths('mini-loader');
-    this.#location = join(paths.config, 'config.json');
-    if (existsSync(this.#location)) {
-      this.#config = JSON.parse(readFileSync(this.#location, 'utf-8'));
-    }
-  }
-
-  public get context() {
-    return this.#config?.context || 'default';
-  }
-
-  public setContext = (context: string) => {
-    this.#config = {
-      ...(this.#config || {}),
-      context,
-    };
-    this.save();
-  };
-
-  public save = async () => {
-    if (!this.#config) {
-      return;
-    }
-    const json = JSON.stringify(this.#config);
-    mkdir(dirname(this.#location), { recursive: true });
-    writeFileSync(this.#location, json);
-  };
-}
-
-export { Config };

packages/cli/src/context/context.ts

@@ -1,7 +1,7 @@
 import envPaths from 'env-paths';
 import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { mkdir, readdir } from 'fs/promises';
-import { dirname, join } from 'path';
+import { mkdir } from 'fs/promises';
+import { dirname } from 'path';
 
 type ContextValues = {
   host: string;
@@ -12,9 +12,9 @@ class Context {
   #location: string;
   #config?: ContextValues;
 
-  constructor(name: string) {
-    const paths = envPaths('mini-loader');
-    this.#location = join(paths.config, 'contexts', name);
+  constructor() {
+    const paths = envPaths('dws');
+    this.#location = paths.config;
     if (existsSync(this.#location)) {
       this.#config = JSON.parse(readFileSync(this.#location, 'utf-8'));
     }
@@ -45,15 +45,6 @@ class Context {
     mkdir(dirname(this.#location), { recursive: true });
     writeFileSync(this.#location, json);
   };
-
-  public static list = async () => {
-    const paths = envPaths('mini-loader');
-    const location = join(paths.config, 'contexts');
-    if (!existsSync(location)) {
-      return [];
-    }
-    return await readdir(location);
-  };
 }
 
 export { Context };

packages/cli/src/index.ts

@@ -6,7 +6,6 @@ import { artifacts } from './commands/artifacts/artifacts.js';
 import { secrets } from './commands/secrets/secrets.js';
 import { local } from './commands/local/local.js';
 import { auth } from './commands/auth/auth.js';
-import { contexts } from './commands/contexts/contexts.js';
 
 program.addCommand(loads);
 program.addCommand(runs);
@@ -15,6 +14,5 @@ program.addCommand(artifacts);
 program.addCommand(secrets);
 program.addCommand(local);
 program.addCommand(auth);
-program.addCommand(contexts);
 
 await program.parseAsync();

packages/configs/package.json

@@ -9,10 +9,5 @@
   },
   "keywords": [],
   "author": "",
-  "license": "GPL-3.0",
-  "homepage": "https://github.com/morten-olsen/mini-loader",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/morten-olsen/mini-loader"
-  }
+  "license": "GPL-3.0-or-later"
 }

packages/examples/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morten-olsen/mini-loader-examples",
   "version": "1.0.0",
-  "license": "GPL-3.0",
+  "license": "GPL-3.0-or-later",
   "private": true,
   "main": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -23,10 +23,5 @@
     "@morten-olsen/mini-loader": "workspace:^",
     "@types/node": "^20.10.8",
     "typescript": "^5.3.3"
-  },
-  "homepage": "https://github.com/morten-olsen/mini-loader",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/morten-olsen/mini-loader"
   }
 }

packages/mini-loader/README.md

@@ -1 +0,0 @@
-[Go to documentation](https://github.com/morten-olsen/mini-loader)

packages/mini-loader/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morten-olsen/mini-loader",
   "version": "1.0.0",
-  "license": "GPL-3.0",
+  "license": "GPL-3.0-or-later",
   "main": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
   "scripts": {
@@ -20,10 +20,5 @@
     "@morten-olsen/mini-loader-configs": "workspace:^",
     "@types/node": "^20.10.8",
     "typescript": "^5.3.3"
-  },
-  "homepage": "https://github.com/morten-olsen/mini-loader",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/morten-olsen/mini-loader"
   }
 }

packages/runner/README.md

@@ -1 +0,0 @@
-[Go to documentation](https://github.com/morten-olsen/mini-loader)

packages/runner/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morten-olsen/mini-loader-runner",
   "version": "1.0.0",
-  "license": "GPL-3.0",
+  "license": "GPL-3.0-or-later",
   "main": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
   "scripts": {
@@ -25,10 +25,5 @@
   "dependencies": {
     "eventemitter3": "^5.0.1",
     "nanoid": "^5.0.4"
-  },
-  "homepage": "https://github.com/morten-olsen/mini-loader",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/morten-olsen/mini-loader"
   }
 }

packages/server/README.md

@@ -1 +0,0 @@
-[Go to documentation](https://github.com/morten-olsen/mini-loader)

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morten-olsen/mini-loader-server",
   "version": "1.0.0",
-  "license": "GPL-3.0",
+  "license": "GPL-3.0-or-later",
   "main": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
   "bin": {
@@ -39,10 +39,5 @@
     "sqlite3": "^5.1.7",
     "superjson": "^2.2.1",
     "zod": "^3.22.4"
-  },
-  "homepage": "https://github.com/morten-olsen/mini-loader",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/morten-olsen/mini-loader"
   }
 }

scripts/set-version.mjs

@@ -1,9 +1,7 @@
 import { findWorkspacePackages } from '@pnpm/find-workspace-packages';
-import { readFile, writeFile } from 'fs/promises';
+import { writeFile } from 'fs/promises';
 import { join } from 'path';
 
-const sharedData = JSON.parse(await readFile(join(process.cwd(), 'scripts/shared-data.json')));
-
 const version = process.argv[2];
 if (!version) {
   throw new Error('Version is required');
@@ -13,9 +11,6 @@ const packages = await findWorkspacePackages(process.cwd());
 
 for (const { manifest, dir } of packages) {
   console.log(dir, version);
-  for (let [key, value] of Object.entries(sharedData || {})) {
-    manifest[key] = value;
-  }
   manifest.version = version;
   await writeFile(join(dir, 'package.json'), JSON.stringify(manifest, null, 2));
 }

scripts/shared-data.json

@@ -1,8 +0,0 @@
-{
-  "license": "GPL-3.0",
-  "homepage": "https://github.com/morten-olsen/mini-loader",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/morten-olsen/mini-loader"
-  }
-}