From e247c068b3af563ce3cd03f5b1039299464190ea Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 17 Aug 2024 21:41:09 +0900 Subject: [PATCH 01/10] feat(nodejs/node): scaffold nodejs/node --- pkgs/nodejs/node/pkg.yaml | 1 + pkgs/nodejs/node/registry.yaml | 9 +++++++++ registry.yaml | 8 ++++++++ 3 files changed, 18 insertions(+) create mode 100644 pkgs/nodejs/node/pkg.yaml create mode 100644 pkgs/nodejs/node/registry.yaml diff --git a/pkgs/nodejs/node/pkg.yaml b/pkgs/nodejs/node/pkg.yaml new file mode 100644 index 00000000000..3334c0e4395 --- /dev/null +++ b/pkgs/nodejs/node/pkg.yaml @@ -0,0 +1 @@ +packages: [] diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml new file mode 100644 index 00000000000..1a973a433c8 --- /dev/null +++ b/pkgs/nodejs/node/registry.yaml @@ -0,0 +1,9 @@ +packages: + - type: github_release + repo_owner: nodejs + repo_name: node + description: Node.js JavaScript runtime + version_constraint: "false" + version_overrides: + - version_constraint: "true" + no_asset: true diff --git a/registry.yaml b/registry.yaml index 1011e643eab..347024cd6c0 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33596,6 +33596,14 @@ packages: type: github_release asset: checksums.txt algorithm: sha256 + - type: github_release + repo_owner: nodejs + repo_name: node + description: Node.js JavaScript runtime + version_constraint: "false" + version_overrides: + - version_constraint: "true" + no_asset: true - type: github_release repo_owner: nojima repo_name: httpie-go From d7d3620a910613bb87dd05d72ade02186a7f5231 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 17 Aug 2024 22:09:28 +0900 Subject: [PATCH 02/10] fix(nodejs/node): fix the setting --- pkgs/nodejs/node/pkg.yaml | 3 ++- pkgs/nodejs/node/registry.yaml | 35 +++++++++++++++++++++++++++++++--- registry.yaml | 35 +++++++++++++++++++++++++++++++--- 3 files changed, 66 insertions(+), 7 deletions(-) diff --git a/pkgs/nodejs/node/pkg.yaml b/pkgs/nodejs/node/pkg.yaml index 3334c0e4395..06d6b545f8b 100644 --- a/pkgs/nodejs/node/pkg.yaml +++ b/pkgs/nodejs/node/pkg.yaml @@ -1 +1,2 @@ -packages: [] +packages: + - name: nodejs/node@v22.6.0 diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml index 1a973a433c8..6c19f568d47 100644 --- a/pkgs/nodejs/node/registry.yaml +++ b/pkgs/nodejs/node/registry.yaml @@ -1,9 +1,38 @@ packages: - - type: github_release + - type: http repo_owner: nodejs repo_name: node - description: Node.js JavaScript runtime + description: | + Node.js JavaScript runtime + + # Setup + + To execute tools installed by npm, you need to add the following to your PATH: + + ```sh + export PATH="$(dirname "$(aqua which node)"):$PATH" + ``` version_constraint: "false" version_overrides: - version_constraint: "true" - no_asset: true + url: https://nodejs.org/dist/{{.Version}}/node-{{.Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: tar.gz + replacements: + amd64: x64 + windows: win + files: + - name: corepack + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/corepack + - name: node + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/node + - name: npm + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npm + - name: npx + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npx + overrides: + - goos: windows + format: zip + # TODO: Support Windows + supported_envs: + - darwin + - linux diff --git a/registry.yaml b/registry.yaml index 347024cd6c0..df8acb9e5b1 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33596,14 +33596,43 @@ packages: type: github_release asset: checksums.txt algorithm: sha256 - - type: github_release + - type: http repo_owner: nodejs repo_name: node - description: Node.js JavaScript runtime + description: | + Node.js JavaScript runtime + + # Setup + + To execute tools installed by npm, you need to add the following to your PATH: + + ```sh + export PATH="$(dirname "$(aqua which node)"):$PATH" + ``` version_constraint: "false" version_overrides: - version_constraint: "true" - no_asset: true + url: https://nodejs.org/dist/{{.Version}}/node-{{.Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: tar.gz + replacements: + amd64: x64 + windows: win + files: + - name: corepack + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/corepack + - name: node + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/node + - name: npm + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npm + - name: npx + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npx + overrides: + - goos: windows + format: zip + # TODO: Support Windows + supported_envs: + - darwin + - linux - type: github_release repo_owner: nojima repo_name: httpie-go From 8d1a3ec9876a0fc56c1501a32165e3718dd0c174 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 17 Aug 2024 22:16:32 +0900 Subject: [PATCH 03/10] fix(nodejs/node): fix the setup --- pkgs/nodejs/node/registry.yaml | 4 +++- registry.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml index 6c19f568d47..364760279ef 100644 --- a/pkgs/nodejs/node/registry.yaml +++ b/pkgs/nodejs/node/registry.yaml @@ -10,7 +10,9 @@ packages: To execute tools installed by npm, you need to add the following to your PATH: ```sh - export PATH="$(dirname "$(aqua which node)"):$PATH" + if node_path="$(dirname "$(aqua which node)" | grep aquaproj)"; then + export PATH="$node_path:$PATH" + fi ``` version_constraint: "false" version_overrides: diff --git a/registry.yaml b/registry.yaml index df8acb9e5b1..8d6b2b75207 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33607,7 +33607,9 @@ packages: To execute tools installed by npm, you need to add the following to your PATH: ```sh - export PATH="$(dirname "$(aqua which node)"):$PATH" + if node_path="$(dirname "$(aqua which node)" | grep aquaproj)"; then + export PATH="$node_path:$PATH" + fi ``` version_constraint: "false" version_overrides: From 59964d1fa729168b11e558c597cb5b8623356f1c Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 17 Aug 2024 22:26:37 +0900 Subject: [PATCH 04/10] fix(nodejs/node): fix the setup --- pkgs/nodejs/node/registry.yaml | 2 +- registry.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml index 364760279ef..c58860b4f03 100644 --- a/pkgs/nodejs/node/registry.yaml +++ b/pkgs/nodejs/node/registry.yaml @@ -10,7 +10,7 @@ packages: To execute tools installed by npm, you need to add the following to your PATH: ```sh - if node_path="$(dirname "$(aqua which node)" | grep aquaproj)"; then + if node_path="$(dirname "$(aqua which node 2>/dev/null)" | grep aquaproj 2>/dev/null)"; then export PATH="$node_path:$PATH" fi ``` diff --git a/registry.yaml b/registry.yaml index 8d6b2b75207..6cd17af44ce 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33607,7 +33607,7 @@ packages: To execute tools installed by npm, you need to add the following to your PATH: ```sh - if node_path="$(dirname "$(aqua which node)" | grep aquaproj)"; then + if node_path="$(dirname "$(aqua which node 2>/dev/null)" | grep aquaproj 2>/dev/null)"; then export PATH="$node_path:$PATH" fi ``` From 5e315f2944649f6c9b7c38bbcc2d0487c2d7a7e2 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Mon, 19 Aug 2024 21:17:29 +0900 Subject: [PATCH 05/10] feat(nodejs/node): add shell --- pkgs/nodejs/node/registry.yaml | 3 +++ registry.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml index c58860b4f03..e450182ef51 100644 --- a/pkgs/nodejs/node/registry.yaml +++ b/pkgs/nodejs/node/registry.yaml @@ -31,6 +31,9 @@ packages: src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npm - name: npx src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npx + shell: + env: + PATH: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin overrides: - goos: windows format: zip diff --git a/registry.yaml b/registry.yaml index 6cd17af44ce..62da9e0144c 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33628,6 +33628,9 @@ packages: src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npm - name: npx src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npx + shell: + env: + PATH: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin overrides: - goos: windows format: zip From e81cf7100c7e31f82a07c43992c201242305512b Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Wed, 21 Aug 2024 21:27:04 +0900 Subject: [PATCH 06/10] fix(nodejs/node): update the description --- pkgs/nodejs/node/registry.yaml | 12 ++++++++---- registry.yaml | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml index e450182ef51..f19d98af831 100644 --- a/pkgs/nodejs/node/registry.yaml +++ b/pkgs/nodejs/node/registry.yaml @@ -7,12 +7,16 @@ packages: # Setup - To execute tools installed by npm, you need to add the following to your PATH: + To execute tools installed by npm, you need to run the following command: ```sh - if node_path="$(dirname "$(aqua which node 2>/dev/null)" | grep aquaproj 2>/dev/null)"; then - export PATH="$node_path:$PATH" - fi + eval "$(aqua set-shell )" + ``` + + e.g. .bashrc + + ```sh + eval "$(aqua set-shell bash)" ``` version_constraint: "false" version_overrides: diff --git a/registry.yaml b/registry.yaml index 62da9e0144c..1b23b54332c 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33604,12 +33604,16 @@ packages: # Setup - To execute tools installed by npm, you need to add the following to your PATH: + To execute tools installed by npm, you need to run the following command: ```sh - if node_path="$(dirname "$(aqua which node 2>/dev/null)" | grep aquaproj 2>/dev/null)"; then - export PATH="$node_path:$PATH" - fi + eval "$(aqua set-shell )" + ``` + + e.g. .bashrc + + ```sh + eval "$(aqua set-shell bash)" ``` version_constraint: "false" version_overrides: From b1b803eb9e1eb9759908616413978dc1d6f92eea Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Thu, 22 Aug 2024 22:46:18 +0900 Subject: [PATCH 07/10] fix(nodejs/node): support windows --- pkgs/nodejs/node/registry.yaml | 11 ++++++++++- registry.yaml | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml index f19d98af831..dc80671d8c5 100644 --- a/pkgs/nodejs/node/registry.yaml +++ b/pkgs/nodejs/node/registry.yaml @@ -41,7 +41,16 @@ packages: overrides: - goos: windows format: zip - # TODO: Support Windows + files: + - name: corepack + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/corepack + - name: node + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/node + - name: npm + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npm + - name: npx + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npx supported_envs: - darwin - linux + - amd64 diff --git a/registry.yaml b/registry.yaml index 1b23b54332c..b3b1a9bca43 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33638,10 +33638,19 @@ packages: overrides: - goos: windows format: zip - # TODO: Support Windows + files: + - name: corepack + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/corepack + - name: node + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/node + - name: npm + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npm + - name: npx + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npx supported_envs: - darwin - linux + - amd64 - type: github_release repo_owner: nojima repo_name: httpie-go From e833e85f301e8ed08c06c253463028bef80b8b8d Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Thu, 22 Aug 2024 23:16:15 +0900 Subject: [PATCH 08/10] fix(nodejs/node): fix source paths of npm, npx, and corepack on Windows --- pkgs/nodejs/node/registry.yaml | 6 +++--- registry.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml index dc80671d8c5..fca4d2d44b1 100644 --- a/pkgs/nodejs/node/registry.yaml +++ b/pkgs/nodejs/node/registry.yaml @@ -43,13 +43,13 @@ packages: format: zip files: - name: corepack - src: node-{{.Version}}-{{.OS}}-{{.Arch}}/corepack + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/corepack.cmd - name: node src: node-{{.Version}}-{{.OS}}-{{.Arch}}/node - name: npm - src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npm + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npm.cmd - name: npx - src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npx + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npx.cmd supported_envs: - darwin - linux diff --git a/registry.yaml b/registry.yaml index b3b1a9bca43..330491aab81 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33640,13 +33640,13 @@ packages: format: zip files: - name: corepack - src: node-{{.Version}}-{{.OS}}-{{.Arch}}/corepack + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/corepack.cmd - name: node src: node-{{.Version}}-{{.OS}}-{{.Arch}}/node - name: npm - src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npm + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npm.cmd - name: npx - src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npx + src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npx.cmd supported_envs: - darwin - linux From 3b90312d29d24105899543c0cc239d54d1cf5c5f Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 24 Aug 2024 08:30:45 +0900 Subject: [PATCH 09/10] fix(nodejs/node): remove shell --- pkgs/nodejs/node/registry.yaml | 19 +++---------------- registry.yaml | 19 +++---------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml index fca4d2d44b1..8831ffeae21 100644 --- a/pkgs/nodejs/node/registry.yaml +++ b/pkgs/nodejs/node/registry.yaml @@ -5,24 +5,15 @@ packages: description: | Node.js JavaScript runtime - # Setup + ## How to set up - To execute tools installed by npm, you need to run the following command: - - ```sh - eval "$(aqua set-shell )" - ``` - - e.g. .bashrc - - ```sh - eval "$(aqua set-shell bash)" - ``` + Please see https://aquaproj.github.io/docs/reference/nodejs-support version_constraint: "false" version_overrides: - version_constraint: "true" url: https://nodejs.org/dist/{{.Version}}/node-{{.Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: tar.gz + windows_arm_emulation: true replacements: amd64: x64 windows: win @@ -35,9 +26,6 @@ packages: src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npm - name: npx src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npx - shell: - env: - PATH: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin overrides: - goos: windows format: zip @@ -53,4 +41,3 @@ packages: supported_envs: - darwin - linux - - amd64 diff --git a/registry.yaml b/registry.yaml index 330491aab81..3c8372d4a63 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33602,24 +33602,15 @@ packages: description: | Node.js JavaScript runtime - # Setup + ## How to set up - To execute tools installed by npm, you need to run the following command: - - ```sh - eval "$(aqua set-shell )" - ``` - - e.g. .bashrc - - ```sh - eval "$(aqua set-shell bash)" - ``` + Please see https://aquaproj.github.io/docs/reference/nodejs-support version_constraint: "false" version_overrides: - version_constraint: "true" url: https://nodejs.org/dist/{{.Version}}/node-{{.Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: tar.gz + windows_arm_emulation: true replacements: amd64: x64 windows: win @@ -33632,9 +33623,6 @@ packages: src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npm - name: npx src: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin/npx - shell: - env: - PATH: node-{{.Version}}-{{.OS}}-{{.Arch}}/bin overrides: - goos: windows format: zip @@ -33650,7 +33638,6 @@ packages: supported_envs: - darwin - linux - - amd64 - type: github_release repo_owner: nojima repo_name: httpie-go From 7da7cc24aaa7ee35a970ce31c9dcc5ea82115377 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 24 Aug 2024 15:04:18 +0900 Subject: [PATCH 10/10] fix(nodejs/node): support Windows --- pkgs/nodejs/node/registry.yaml | 3 --- registry.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/pkgs/nodejs/node/registry.yaml b/pkgs/nodejs/node/registry.yaml index 8831ffeae21..4ff3044f892 100644 --- a/pkgs/nodejs/node/registry.yaml +++ b/pkgs/nodejs/node/registry.yaml @@ -38,6 +38,3 @@ packages: src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npm.cmd - name: npx src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npx.cmd - supported_envs: - - darwin - - linux diff --git a/registry.yaml b/registry.yaml index 3c8372d4a63..319b578e41f 100644 --- a/registry.yaml +++ b/registry.yaml @@ -33635,9 +33635,6 @@ packages: src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npm.cmd - name: npx src: node-{{.Version}}-{{.OS}}-{{.Arch}}/npx.cmd - supported_envs: - - darwin - - linux - type: github_release repo_owner: nojima repo_name: httpie-go