From f4b921d2c338227dd0824c062a0bf4719179205f Mon Sep 17 00:00:00 2001 From: khai96_ Date: Wed, 26 Jul 2023 17:50:17 +0700 Subject: [PATCH] feat: rename `nodejs_bundled` to `standalone` as @zkochan suggested --- .github/workflows/test.yaml | 18 +++++++++--------- README.md | 2 +- action.yml | 2 +- dist/index.js | Bin 272869 -> 272853 bytes run.sh | 2 +- src/inputs/index.ts | 4 ++-- src/install-pnpm/run.ts | 12 ++++++------ 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a1b3c2d..4654da6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -65,8 +65,8 @@ jobs: - name: 'Test: install' run: pnpm install - test_nodejs_bundled: - name: Test with nodejs_bundled + test_standalone: + name: Test with standalone runs-on: ${{ matrix.os }} @@ -78,7 +78,7 @@ jobs: - macos-latest - windows-latest - nodejs_bundled: + standalone: - true - false @@ -89,7 +89,7 @@ jobs: uses: ./ with: version: 7.0.0 - nodejs_bundled: ${{ matrix.nodejs_bundled }} + standalone: ${{ matrix.standalone }} - name: install Node.js uses: actions/setup-node@v3 @@ -101,15 +101,15 @@ jobs: run: which pnpm - name: 'Test: which (pnpx)' - if: matrix.nodejs_bundled == false + if: matrix.standalone == false run: which pnpx - - name: 'Test: install when nodejs_bundled is true' - if: matrix.nodejs_bundled + - name: 'Test: install when standalone is true' + if: matrix.standalone run: pnpm install - - name: 'Test: install when nodejs_bundled is false' - if: matrix.nodejs_bundled == false + - name: 'Test: install when standalone is false' + if: matrix.standalone == false # Since the default shell on windows runner is pwsh, we specify bash explicitly shell: bash run: | diff --git a/README.md b/README.md index d1d9477..56356b3 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If `run_install` is a YAML string representation of either an object or an array **Optional** (_type:_ `string`, _default:_ `package.json`) File path to the `package.json` to read "packageManager" configuration. -### `nodejs_bundled` +### `standalone` **Optional** (_type:_ `boolean`, _default:_ `false`) When set to true, [@pnpm/exe](https://www.npmjs.com/package/@pnpm/exe), which is a Node.js bundled package, will be installed. diff --git a/action.yml b/action.yml index 07e50c2..a8624e1 100644 --- a/action.yml +++ b/action.yml @@ -19,7 +19,7 @@ inputs: description: File path to the package.json to read "packageManager" configuration required: false default: 'package.json' - nodejs_bundled: + standalone: description: When set to true, @pnpm/exe, which is a Node.js bundled package, will be installed. required: false default: 'false' diff --git a/dist/index.js b/dist/index.js index 827c8d3a10649cca1db9988e8899767d88b28eb2..8867301a8c897e3697fe8df388adc9cca4dde3f3 100644 GIT binary patch delta 103 zcmaEQS>WnrferpFT*W1cc`1oG`FW|6V^}1RxSN|;{MeBAlkak!LgH@T!o86ZiQinr U+g`-W2*gZ4%)Gsbm!((+07OhCW&i*H delta 138 zcmcb5S>WkqferpF#(DWEsb0lSrFkhisVP<(20EE~>8T}7`T04iiFuxR1*IjL8cHBV yS;g^55LKJ2S^U^|Q8Z4z%ykM?Wb<D+mm=%ie&&-k1}Kc diff --git a/run.sh b/run.sh index c85c7c3..cda71de 100755 --- a/run.sh +++ b/run.sh @@ -4,5 +4,5 @@ export HOME="$(pwd)" export INPUT_VERSION=4.11.1 export INPUT_DEST='~/pnpm.temp' export INPUT_RUN_INSTALL=null -export INPUT_NODEJS_BUNDLED=false +export INPUT_standalone=false exec node dist/index.js diff --git a/src/inputs/index.ts b/src/inputs/index.ts index 2f0f1ae..a9b705a 100644 --- a/src/inputs/index.ts +++ b/src/inputs/index.ts @@ -7,7 +7,7 @@ export interface Inputs { readonly dest: string readonly runInstall: RunInstall[] readonly packageJsonFile: string - readonly nodeJsBundled: boolean + readonly standalone: boolean } const options: InputOptions = { @@ -21,7 +21,7 @@ export const getInputs = (): Inputs => ({ dest: parseInputPath('dest'), runInstall: parseRunInstall('run_install'), packageJsonFile: parseInputPath('package_json_file'), - nodeJsBundled: getBooleanInput('nodejs_bundled'), + standalone: getBooleanInput('standalone'), }) export default getInputs diff --git a/src/install-pnpm/run.ts b/src/install-pnpm/run.ts index ed5b9e6..7a547f0 100644 --- a/src/install-pnpm/run.ts +++ b/src/install-pnpm/run.ts @@ -6,7 +6,7 @@ import { execPath } from 'process' import { Inputs } from '../inputs' export async function runSelfInstaller(inputs: Inputs): Promise { - const { version, dest, packageJsonFile, nodeJsBundled } = inputs + const { version, dest, packageJsonFile, standalone } = inputs // prepare self install await remove(dest) @@ -15,7 +15,7 @@ export async function runSelfInstaller(inputs: Inputs): Promise { await writeFile(pkgJson, JSON.stringify({ private: true })) // prepare target pnpm - const target = await readTarget({ version, packageJsonFile, nodeJsBundled }) + const target = await readTarget({ version, packageJsonFile, standalone }) const cp = spawn(execPath, [path.join(__dirname, 'pnpm.js'), 'install', target, '--no-lockfile'], { cwd: dest, stdio: ['pipe', 'inherit', 'inherit'], @@ -36,11 +36,11 @@ export async function runSelfInstaller(inputs: Inputs): Promise { async function readTarget(opts: { readonly version?: string | undefined readonly packageJsonFile: string - readonly nodeJsBundled: boolean + readonly standalone: boolean }) { - const { version, packageJsonFile, nodeJsBundled } = opts + const { version, packageJsonFile, standalone } = opts - if (version) return `${ nodeJsBundled ? '@pnpm/exe' : 'pnpm' }@${version}` + if (version) return `${ standalone ? '@pnpm/exe' : 'pnpm' }@${version}` const { GITHUB_WORKSPACE } = process.env if (!GITHUB_WORKSPACE) { @@ -62,7 +62,7 @@ Please specify it by one of the following ways: throw new Error('Invalid packageManager field in package.json') } - if(nodeJsBundled){ + if(standalone){ return packageManager.replace('pnpm@', '@pnpm/exe@') }