Skip to content

Commit

Permalink
Merge branch 'add_buffer_size_option' of github.com:bidoubiwa/combine…
Browse files Browse the repository at this point in the history
…-json into add_buffer_size_option
  • Loading branch information
bidoubiwa committed Nov 27, 2021
2 parents 94b3062 + 4fbaf46 commit 4777768
Show file tree
Hide file tree
Showing 4 changed files with 983 additions and 1,908 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,23 @@ on:
jobs:
publish-npm:
runs-on: ubuntu-latest
name: Node.js Package
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
registry-url: 'https://registry.npmjs.org'
registry-url: "https://registry.npmjs.org"
- name: Install dependencies
run: yarn install
- name: Build
run: yarn build
- name: Check release validity
run: sh scripts/check-release.sh
- name: Publish
run: npm publish .
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

name: Node.js Package
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
publish-github:
runs-on: ubuntu-latest
permissions:
Expand All @@ -30,11 +33,14 @@ jobs:
# Setup .npmrc file to publish to GitHub Packages
- uses: actions/setup-node@v2
with:
node-version: '14.x'
registry-url: 'https://npm.pkg.github.com'
node-version: "14.x"
registry-url: "https://npm.pkg.github.com"
- name: Check release validity
run: sh scripts/check-release.sh
- run: npm install
- name: Install dependencies
run: yarn install
- name: Build
run: yarn build
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
turbo-json.js is a tool that combines all json files found in a directory into one big json file using **streaming** to avoid out-of-memory.

```bash
npx turbo-json data/
npx turbo-json.js data/
# Outputs `combined.json` file containing the content of all json files found in the data/ directory
```

Expand Down Expand Up @@ -169,7 +169,7 @@ Using the JSON files present in `misc`, you can observe the outputed file [misc_
At the root of the repository use the following:

```bash
npx turbo-json misc
npx turbo-json.js misc
```

it will generate a combined.json file with all the JSON objects found in misc.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "turbo-json.js",
"description": "Combine with streams multiple json files into one json array. Read and Write is streamed.",
"version": "0.2.0",
"version": "0.2.1",
"main": "src/index.js",
"scripts": {
"start": "src/cli.js",
Expand All @@ -24,7 +24,7 @@
"email": "[email protected]"
},
"bin": {
"turbo-json": "./src/cli.js"
"turbo-json.js": "./src/cli.js"
},
"files": [
"src/"
Expand All @@ -34,16 +34,16 @@
},
"license": "MIT",
"dependencies": {
"chalk": "^3.0.0",
"commander": "^8.1.0",
"stream-json": "^1.7.2"
"chalk": "^4.1.2",
"commander": "^8.3.0",
"stream-json": "^1.7.3"
},
"devDependencies": {
"jest": "^26.6.3",
"rimraf": "^3.0.2",
"eslint": "^7.29.0",
"eslint": "^8.2.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"prettier": "^2.3.2"
"jest": "^27.3.1",
"prettier": "^2.3.2",
"rimraf": "^3.0.2"
}
}
Loading

0 comments on commit 4777768

Please sign in to comment.