Skip to content

Commit

Permalink
Merge branch 'release/4.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
tuananh committed Jul 3, 2019
2 parents 6e1e09a + 5292092 commit 2298490
Show file tree
Hide file tree
Showing 10 changed files with 177 additions and 49 deletions.
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**Minimal Script To Reproduce**

```
const { transform } = require('camaro')
// your code
```

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

- camaro versio:
- Node version:
- Operating system:
6 changes: 5 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# ignore pugixml docs and tests
.github
.gitignore
.DS_Store
npm-debug.log
Expand All @@ -16,4 +17,7 @@ lib
build.sh
dist/*.o
# dont need src folder since we publish dist folder
src
src
.vscode
azure-pipelines.yml
azure-test.yml
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Contributing to camaro

* [Issues](#issues)
* [Pull Requests](#pull-requests)

## Issues

* State version of node/camaro/OS.
* Include the script which can reproduce the issue.

## Pull Requests

* Make sure all tests pass.
* If new feature(s) is included, write test(s) for them as well.
* Check the benchmark script to see if there's any performance regression.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# camaro

[![NPM](https://nodei.co/npm/camaro.png?downloads=true)](https://npmjs.org/package/camaro)

> camaro is an utility to transform XML to JSON, using Node.js binding to native XML parser [pugixml](http://pugixml.org/), one of the fastest XML parser around.
[![npm](https://badgen.net/npm/v/camaro)](https://npm.im/camaro)
![npm bundle size](https://badgen.net/packagephobia/publish/camaro)
[![Build Status](https://dev.azure.com/me0499/camaro/_apis/build/status/tuananh.camaro?branchName=develop)](https://dev.azure.com/me0499/camaro/_build/latest?definitionId=1&branchName=develop)
[![Travis](https://badgen.net/travis/tuananh/camaro/master)](https://travis-ci.org/tuananh/camaro)
[![AppVeyor](https://badgen.net/appveyor/ci/tuananh/camaro/master)](https://ci.appveyor.com/project/tuananh/camaro)
[![TypeScript definitions on DefinitelyTyped](https://badgen.net/badge/DefinitelyTyped/.d.ts)](http://definitelytyped.org)
Expand Down
68 changes: 68 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
jobs:

- job: Windows
pool: 'Hosted VS2017'

variables:
os_name: Windows

strategy:
matrix:
node_8_x:
node_version: 8.x
node_9_x:
node_version: 9.x
node_10_x:
node_version: 10.x
node_11_x:
node_version: 11.x
node_12_x:
node_version: 12.x
steps:
- template: azure-test.yml

- job: Linux
pool:
vmImage: 'Ubuntu 16.04'

variables:
os_name: Linux

strategy:
matrix:
node_8_x:
node_version: 8.x
node_9_x:
node_version: 9.x
node_10_x:
node_version: 10.x
node_11_x:
node_version: 11.x
node_12_x:
node_version: 12.x

steps:
- template: azure-test.yml

- job: OSX
pool:
vmImage: 'macOS 10.13'

variables:
os_name: OSX

strategy:
matrix:
node_8_x:
node_version: 8.x
node_9_x:
node_version: 9.x
node_10_x:
node_version: 10.x
node_11_x:
node_version: 11.x
node_12_x:
node_version: 12.x

steps:
- template: azure-test.yml
11 changes: 11 additions & 0 deletions azure-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
steps:

- task: NodeTool@0
inputs:
versionSpec: $(node_version)
displayName: 'Install Node.js'

- bash: |
npm install
npm run test
displayName: 'Install and test'
3 changes: 3 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ echo "1/2 Compiling pugixml"
-s WASM=1 \
-s ALLOW_MEMORY_GROWTH=1 \
-s MODULARIZE=1 \
-s ASSERTIONS=0 \
-DNDEBUG \
-s 'EXPORT_NAME="pugixml"' \
-I node_modules/pugixml/src \
-c node_modules/pugixml/src/pugixml.cpp \
Expand All @@ -27,6 +29,7 @@ echo "2/2 Compiling camaro wasm bindings"
-s MODULARIZE=1 \
-s ASSERTIONS=0 \
-DNDEBUG \
-s 'MALLOC="emmalloc"' \
-s 'EXPORT_NAME="camaro"' \
-I node_modules/pugixml/src \
-I node_modules/json/single_include/nlohmann \
Expand Down
88 changes: 44 additions & 44 deletions dist/camaro.js

Large diffs are not rendered by default.

Binary file modified dist/camaro.wasm
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "camaro",
"version": "4.0.4",
"version": "4.0.5",
"description": "Transforming XML to JSON using Node.js binding to native pugixml parser library",
"homepage": "https://github.com/tuananh/camaro",
"bugs": "https://github.com/tuananh/camaro/issues",
Expand Down Expand Up @@ -37,6 +37,6 @@
},
"devDependencies": {
"napa": "3.0.0",
"tape": "4.10.2"
"tape": "4.11.0"
}
}

0 comments on commit 2298490

Please sign in to comment.