From 28ed1b61ac6aaa34182ce3ad4b1022cf70ff44f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 02:44:16 +0100 Subject: [PATCH 01/19] NPM publish using Node container --- .drone.jsonnet | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 2a13019..69aa68a 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -25,14 +25,29 @@ local build_step = { commands: ["bun run build"], }; +// local publish_step = { +// name: "publish", +// image: "plugins/npm", + +// settings: { +// registry: "https://git.jvalver.de/api/packages/jvalverde/npm", +// token: { from_secret: "npm_token" }, +// }, +// }; + local publish_step = { name: "publish", - image: "plugins/npm", + image: "node:20", - settings: { - registry: "https://git.jvalver.de/api/packages/jvalverde/npm", - token: { from_secret: "npm_token" }, + environment: { + NPM_TOKEN: { from_secret: "npm_token" } }, + + commands: [ + "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm", + "npm config set -- '//git.jvalver.de/api/packages/jvalverde/npm/:_authToken' '$NPM_TOKEN'", + "npm publish", + ], }; @@ -75,6 +90,7 @@ local publish_step = { install_step, lint_step, build_step, + publish_step, ], }, -- 2.49.1 From 43a96683e9468f59d15dcd3ecbfabe6290b37ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 02:56:34 +0100 Subject: [PATCH 02/19] Fix attempt --- .drone.jsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.jsonnet b/.drone.jsonnet index 69aa68a..01586ab 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -46,6 +46,7 @@ local publish_step = { commands: [ "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm", "npm config set -- '//git.jvalver.de/api/packages/jvalverde/npm/:_authToken' '$NPM_TOKEN'", + "npm config set always-auth true", "npm publish", ], }; -- 2.49.1 From 73d988393d6064f1f163fa986339ee75087a1284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 02:59:08 +0100 Subject: [PATCH 03/19] Debug --- .drone.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 01586ab..34d9113 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -44,9 +44,9 @@ local publish_step = { }, commands: [ + "echo $NPM_TOKEN", "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm", "npm config set -- '//git.jvalver.de/api/packages/jvalverde/npm/:_authToken' '$NPM_TOKEN'", - "npm config set always-auth true", "npm publish", ], }; -- 2.49.1 From 5d0cfee59476f4e1ce9a6977c537c079ac17bd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:04:37 +0100 Subject: [PATCH 04/19] Debug --- .drone.jsonnet | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 34d9113..738639a 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -37,14 +37,13 @@ local build_step = { local publish_step = { name: "publish", - image: "node:20", + image: "node:18", environment: { NPM_TOKEN: { from_secret: "npm_token" } }, commands: [ - "echo $NPM_TOKEN", "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm", "npm config set -- '//git.jvalver.de/api/packages/jvalverde/npm/:_authToken' '$NPM_TOKEN'", "npm publish", -- 2.49.1 From 0241167018d471ac50792a69660a1c5a3bfdd4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:06:58 +0100 Subject: [PATCH 05/19] Debug --- .drone.jsonnet | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.jsonnet b/.drone.jsonnet index 738639a..1a91a58 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -44,8 +44,10 @@ local publish_step = { }, commands: [ + "npm version", "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm", "npm config set -- '//git.jvalver.de/api/packages/jvalverde/npm/:_authToken' '$NPM_TOKEN'", + "npm whoami", "npm publish", ], }; -- 2.49.1 From 03bb87a06b2c5a3aff8522680fb83ca76cfb105d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:07:52 +0100 Subject: [PATCH 06/19] Debug --- .drone.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 1a91a58..7b07244 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -44,7 +44,7 @@ local publish_step = { }, commands: [ - "npm version", + "npm --version", "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm", "npm config set -- '//git.jvalver.de/api/packages/jvalverde/npm/:_authToken' '$NPM_TOKEN'", "npm whoami", -- 2.49.1 From eec0703aa1166daa5ebd2c517c0426c81dbc7bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:10:09 +0100 Subject: [PATCH 07/19] Debug --- .drone.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 7b07244..efba150 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -37,7 +37,7 @@ local build_step = { local publish_step = { name: "publish", - image: "node:18", + image: "node:14", environment: { NPM_TOKEN: { from_secret: "npm_token" } -- 2.49.1 From 34dd814ff50d9bbb3932b672ee7798be021b9b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:12:32 +0100 Subject: [PATCH 08/19] Debug --- .drone.jsonnet | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index efba150..a288fc0 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -45,8 +45,8 @@ local publish_step = { commands: [ "npm --version", - "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm", - "npm config set -- '//git.jvalver.de/api/packages/jvalverde/npm/:_authToken' '$NPM_TOKEN'", + "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm/", + "npm config set -- //git.jvalver.de/api/packages/jvalverde/npm/:_authToken $NPM_TOKEN", "npm whoami", "npm publish", ], diff --git a/package.json b/package.json index d0cc7dd..957425e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "20231229.0.0", "type": "module", "publishConfig": { - "registry": "https://git.jvalver.de/api/packages/jvalverde/npm" + "registry": "https://git.jvalver.de/api/packages/jvalverde/npm/" }, "exports": { ".": { -- 2.49.1 From 00eebc8246ec7e4b6f8d54d33fd0da555eb78d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:14:53 +0100 Subject: [PATCH 09/19] Debug --- .drone.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index a288fc0..d3d3068 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -47,7 +47,7 @@ local publish_step = { "npm --version", "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm/", "npm config set -- //git.jvalver.de/api/packages/jvalverde/npm/:_authToken $NPM_TOKEN", - "npm whoami", + // "npm whoami", "npm publish", ], }; -- 2.49.1 From e01a909ee42135171b2e9b17dc44cbdacc9db27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:22:33 +0100 Subject: [PATCH 10/19] Debug --- .drone.jsonnet | 8 +++----- package.json | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d3d3068..9253488 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -30,7 +30,7 @@ local build_step = { // image: "plugins/npm", // settings: { -// registry: "https://git.jvalver.de/api/packages/jvalverde/npm", +// registry: "https://git.jvalver.de/api/packages/thilawyn/npm", // token: { from_secret: "npm_token" }, // }, // }; @@ -44,10 +44,8 @@ local publish_step = { }, commands: [ - "npm --version", - "npm set registry https://git.jvalver.de/api/packages/jvalverde/npm/", - "npm config set -- //git.jvalver.de/api/packages/jvalverde/npm/:_authToken $NPM_TOKEN", - // "npm whoami", + "npm set registry https://git.jvalver.de/api/packages/thilawyn/npm/", + "npm config set -- //git.jvalver.de/api/packages/thilawyn/npm/:_authToken $NPM_TOKEN", "npm publish", ], }; diff --git a/package.json b/package.json index 957425e..2e6f204 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "20231229.0.0", "type": "module", "publishConfig": { - "registry": "https://git.jvalver.de/api/packages/jvalverde/npm/" + "registry": "https://git.jvalver.de/api/packages/thilawyn/npm/" }, "exports": { ".": { -- 2.49.1 From fda96c3de2029d07607cf6c14b962ad64db7a5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:28:30 +0100 Subject: [PATCH 11/19] Debug --- .drone.jsonnet | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 9253488..0b6f96f 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -25,19 +25,9 @@ local build_step = { commands: ["bun run build"], }; -// local publish_step = { -// name: "publish", -// image: "plugins/npm", - -// settings: { -// registry: "https://git.jvalver.de/api/packages/thilawyn/npm", -// token: { from_secret: "npm_token" }, -// }, -// }; - local publish_step = { name: "publish", - image: "node:14", + image: "node:20", environment: { NPM_TOKEN: { from_secret: "npm_token" } -- 2.49.1 From d2522e8368551cccabde6bc9b2525752e766d5a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:34:29 +0100 Subject: [PATCH 12/19] Debug --- .drone.jsonnet | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0b6f96f..d7786f5 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -22,7 +22,7 @@ local lint_step = { local build_step = { name: "build", image: bun_image, - commands: ["bun run build"], + commands: ["bun run build", "ls -la"], }; local publish_step = { @@ -34,9 +34,10 @@ local publish_step = { }, commands: [ - "npm set registry https://git.jvalver.de/api/packages/thilawyn/npm/", - "npm config set -- //git.jvalver.de/api/packages/thilawyn/npm/:_authToken $NPM_TOKEN", - "npm publish", + "ls -la", + // "npm set registry https://git.jvalver.de/api/packages/thilawyn/npm/", + // "npm config set -- //git.jvalver.de/api/packages/thilawyn/npm/:_authToken $NPM_TOKEN", + // "npm publish", ], }; -- 2.49.1 From db13a1ee0d4e599d20f56eb3d9fcaa52dff897f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:35:59 +0100 Subject: [PATCH 13/19] Debug --- .drone.jsonnet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d7786f5..bfa489d 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -22,7 +22,7 @@ local lint_step = { local build_step = { name: "build", image: bun_image, - commands: ["bun run build", "ls -la"], + commands: ["bun run build", "ls -la dist"], }; local publish_step = { @@ -34,7 +34,7 @@ local publish_step = { }, commands: [ - "ls -la", + "ls -la dist", // "npm set registry https://git.jvalver.de/api/packages/thilawyn/npm/", // "npm config set -- //git.jvalver.de/api/packages/thilawyn/npm/:_authToken $NPM_TOKEN", // "npm publish", -- 2.49.1 From 2ccdb7184f0d6d2ba1d2521148030c182feb8437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 03:58:39 +0100 Subject: [PATCH 14/19] Fixed? --- .drone.jsonnet | 9 ++++----- .gitignore | 1 - .npmignore | 4 ++++ 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 .npmignore diff --git a/.drone.jsonnet b/.drone.jsonnet index bfa489d..0b6f96f 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -22,7 +22,7 @@ local lint_step = { local build_step = { name: "build", image: bun_image, - commands: ["bun run build", "ls -la dist"], + commands: ["bun run build"], }; local publish_step = { @@ -34,10 +34,9 @@ local publish_step = { }, commands: [ - "ls -la dist", - // "npm set registry https://git.jvalver.de/api/packages/thilawyn/npm/", - // "npm config set -- //git.jvalver.de/api/packages/thilawyn/npm/:_authToken $NPM_TOKEN", - // "npm publish", + "npm set registry https://git.jvalver.de/api/packages/thilawyn/npm/", + "npm config set -- //git.jvalver.de/api/packages/thilawyn/npm/:_authToken $NPM_TOKEN", + "npm publish", ], }; diff --git a/.gitignore b/.gitignore index ceaea36..745264f 100644 --- a/.gitignore +++ b/.gitignore @@ -129,4 +129,3 @@ dist .yarn/build-state.yml .yarn/install-state.gz .pnp.* - diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..3d27aaa --- /dev/null +++ b/.npmignore @@ -0,0 +1,4 @@ +* +!/dist/ +!/LICENSE +!/package.json -- 2.49.1 From 43cd1bf87130a5f98703b3203c734981d2a288d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 04:05:41 +0100 Subject: [PATCH 15/19] Debug --- .drone.jsonnet | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0b6f96f..566f17e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -36,7 +36,8 @@ local publish_step = { commands: [ "npm set registry https://git.jvalver.de/api/packages/thilawyn/npm/", "npm config set -- //git.jvalver.de/api/packages/thilawyn/npm/:_authToken $NPM_TOKEN", - "npm publish", + // "npm publish", + "npm pack", ], }; -- 2.49.1 From fa4dcfbf1c9aa5d207c5a935969d09a0d6c92a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 04:07:17 +0100 Subject: [PATCH 16/19] Debug --- .npmignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.npmignore b/.npmignore index 3d27aaa..3b7ef66 100644 --- a/.npmignore +++ b/.npmignore @@ -1,4 +1,4 @@ * -!/dist/ +!/dist !/LICENSE !/package.json -- 2.49.1 From 0a3edcb4a8fa46ef4d4c5fb7d645e39998447ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 04:12:07 +0100 Subject: [PATCH 17/19] Debug --- .npmignore | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.npmignore b/.npmignore index 3b7ef66..1b733b1 100644 --- a/.npmignore +++ b/.npmignore @@ -1,4 +1,10 @@ -* -!/dist -!/LICENSE -!/package.json +/node_modules/ +/src/ +/.drone.jsonnet +/.gitignore +/.npmignore +/bun.lockb +/README.md +/rollup.config.js +/tsconfig.json +/tsconfig.tsbuildinfo -- 2.49.1 From b0f99b2117260b08e64f40bbce8b167f5fc003d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 04:19:33 +0100 Subject: [PATCH 18/19] Fix --- .drone.jsonnet | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 566f17e..58390e2 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,4 +1,5 @@ local bun_image = "oven/bun:1"; +local node_image = "node:20"; local fetch_step = { @@ -25,9 +26,15 @@ local build_step = { commands: ["bun run build"], }; +local pack_step = { + name: "publish", + image: node_image, + commands: ["npm pack"], +}; + local publish_step = { name: "publish", - image: "node:20", + image: node_image, environment: { NPM_TOKEN: { from_secret: "npm_token" } @@ -36,8 +43,7 @@ local publish_step = { commands: [ "npm set registry https://git.jvalver.de/api/packages/thilawyn/npm/", "npm config set -- //git.jvalver.de/api/packages/thilawyn/npm/:_authToken $NPM_TOKEN", - // "npm publish", - "npm pack", + "npm publish", ], }; @@ -81,7 +87,7 @@ local publish_step = { install_step, lint_step, build_step, - publish_step, + pack_step, ], }, -- 2.49.1 From a8331dd4854c22cc547dbda603900a890b77ad3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 29 Dec 2023 04:23:06 +0100 Subject: [PATCH 19/19] CI fix --- .drone.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 58390e2..71aa14f 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -27,7 +27,7 @@ local build_step = { }; local pack_step = { - name: "publish", + name: "pack", image: node_image, commands: ["npm pack"], }; -- 2.49.1