Skip to content

Commit

Permalink
Merge pull request #85 from mrsteele/feature/githubActions
Browse files Browse the repository at this point in the history
fix: resolving security issues
  • Loading branch information
mrsteele committed Apr 5, 2021
2 parents e1454fe + 517deaf commit 47dd7ff
Show file tree
Hide file tree
Showing 8 changed files with 3,909 additions and 44 deletions.
101 changes: 101 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
name: Main
on: push

# TODO - Need to not repeat the checkout and setup node steps...

jobs:
# Set the job key. The key is displayed as the job name
# when a job name is not provided
lint:
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 12
- uses: actions/checkout@v2
- name: Install dependencies
run: npm i
- name: Check Security
run: npm audit
- uses: goto-bus-stop/standard-action@v1
with:
# optionally select a different, standard-like linter
# linter: semistandard

# optionally select a different eslint formatter for the log output, default 'stylish'
# formatter: tap

# limit the files to lint, default '**/*.js'
# files: src/*.js

# show errors in the the github diff UI
annotate: true

# Allow the action to add lint errors to the github diff UI
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
test:
name: Test Node v${{ matrix.node }}
runs-on: ubuntu-18.04
strategy:
matrix:
node: [ '10', '12', '14' ]
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
- name: Install dependencies
run: npm i
- name: Test
run: npm t
release:
name: Release
runs-on: ubuntu-18.04
needs: [
test,
lint
]
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 12
- name: Build
run: npm i
- name: 🚀 Release
uses: cycjimmy/semantic-release-action@v2
with:
semantic_version: 17
branches: |
[
'master'
]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ A way to truncate a json object. Useful for circular referenced objects.
## Status

[![npm](https://img.shields.io/npm/v/json-truncate.svg?maxAge=0&style=flat)](https://www.npmjs.com/package/json-truncate)
[![Travis](https://travis-ci.org/mrsteele/json-truncate.svg?branch=master)](https://travis-ci.org/mrsteele/json-truncate)
[![codecov](https://codecov.io/gh/mrsteele/json-truncate/branch/master/graph/badge.svg)](https://codecov.io/gh/mrsteele/json-truncate)
[![Main](https://github.com/mrsteele/json-truncate/actions/workflows/main.yml/badge.svg)](https://github.com/mrsteele/json-truncate/actions/workflows/main.yml)
[![Dependency Status](https://david-dm.org/mrsteele/json-truncate.svg)](#)
[![devDependency Status](https://david-dm.org/mrsteele/json-truncate/dev-status.svg)](https://david-dm.org/mrsteele/json-truncate#info=devDependencies)
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http:https://standardjs.com/)
Expand Down
2 changes: 1 addition & 1 deletion json-truncate.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const truncate = (obj, options = {}, curDepth = 0) => {
return obj
} else if (Array.isArray(obj)) {
const newArr = []
obj.map(value => {
obj.forEach(value => {
if (isFlat(value)) {
newArr.push(value)
} else {
Expand Down
Loading

0 comments on commit 47dd7ff

Please sign in to comment.