Skip to content

Commit

Permalink
feat: expose merger at root of the package
Browse files Browse the repository at this point in the history
you can now import merger directly
  • Loading branch information
Neckaros committed Nov 21, 2018
1 parent 76ca025 commit f2a6b3c
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

//registry.npmjs.org/:_authToken = ${NPM_TOKEN}
20 changes: 20 additions & 0 deletions .tavis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
language: node_js
cache:
directories:
- ~/.npm
notifications:
email: false
node_js:
- '10'
- '11'
- '8'
- '6'
script:
- npm run test:prod && npm run build
after_success:
- npm run travis-deploy-once "npm run report-coverage"
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then npm run travis-deploy-once "npm run deploy-docs"; fi
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then npm run travis-deploy-once "npm run semantic-release"; fi
branches:
except:
- /^v\d+\.\d+\.\d+$/
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
{
"name": "decorated-merger",
"version": "0.0.0-development",
"description": "",
"keywords": [],
"version": "1.0.0",
"description": "Small utility to merge your object, respecting class decoration if any exist",
"keywords": [
"typescript",
"javascript",
"merge",
"class",
"es6",
"es7"
],
"main": "dist/decorated-merger.umd.js",
"module": "dist/decorated-merger.es5.js",
"typings": "dist/types/decorated-merger.d.ts",
Expand All @@ -29,7 +36,7 @@
"deploy-docs": "ts-node tools/gh-pages-publish",
"report-coverage": "cat ./coverage/lcov.info | coveralls",
"commit": "git-cz",
"semantic-release": "semantic-release",
"semantic-release": "semantic-release --no-ci",
"semantic-release-prepare": "ts-node tools/semantic-release-prepare",
"precommit": "lint-staged",
"travis-deploy-once": "travis-deploy-once"
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { merger } from './decorated-merger'

0 comments on commit f2a6b3c

Please sign in to comment.