Merge branch 'master' of https://github.com/danibram/mocker-data-gene…

…rator # Conflicts: # package.json
danibram · Oct 23, 2017 · e479eab · e479eab
2 parents f0b2ec2 + 97f9471
commit e479eab
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 63 deletions.
diff --git a/config/exports/build-tests.js b/config/exports/build-tests.js
diff --git a/config/exports/rollup.config.js b/config/exports/rollup.config.js
diff --git a/config/exports/tsconfig.module.json b/config/exports/tsconfig.module.json
diff --git a/package.json b/package.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
     "name": "mocker-data-generator",
     "version": "2.4.9",
     "description": "A simplified way to generate mock data, builds using a simple schema and with the FakerJs",
@@ -26,6 +27,135 @@
         "email": "info@dbr.io",
         "url": "dbr.io"
     },
+=======
+  "name": "mocker-data-generator",
+  "version": "2.4.9",
+  "description": "A simplified way to generate mock data, builds using a simple schema and with the FakerJs",
+  "main": "build/main/index.js",
+  "typings": "build/main/index.d.ts",
+  "module": "build/module/index.js",
+  "repository": "https://github.com/danibram/mocker-data-generator",
+  "keywords": [
+    "mock",
+    "data",
+    "faker",
+    "fakerjs",
+    "chance",
+    "chancejs",
+    "casual",
+    "randexp",
+    "json",
+    "fake",
+    "mocks",
+    "massive",
+    "generator"
+  ],
+  "author": {
+    "name": "Daniel Biedma Ramos",
+    "email": "info@dbr.io",
+    "url": "dbr.io"
+  },
+  "files": [
+    "build/main/**/*",
+    "build/module/**/*",
+    "build/browser/**/*",
+    "package.json",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE"
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/danibram/mocker-data-generator/issues"
+  },
+  "scripts": {
+    "info": "npm-scripts-info",
+    "build": "trash build && tsc -p tsconfig.json && tsc -p config/tsconfig.module.json && yarn run build:browser",
+    "build:browser": "rollup -c config/exports/rollup.config.js -f es -o build/browser/index.js",
+    "build:tests": "trash test && node config/exports/build-tests.js",
+    "lint": "tslint src/**/*.ts",
+    "unit": "yarn build && nyc ava",
+    "check-coverage": "nyc check-coverage --lines 80 --functions 80 --branches 80",
+    "test": " yarn unit && yarn check-coverage",
+    "watch": "trash build && multiview [yarn watch:build] [yarn watch:unit]",
+    "watch:build": "tsc -p tsconfig.json -w",
+    "watch:unit": "tsc -p tsconfig.json && ava --watch --verbose",
+    "cov": "yarn unit && yarn html-coverage && opn coverage/index.html",
+    "html-coverage": "nyc report --reporter=html",
+    "send-coverage": "nyc report --reporter=lcov > coverage.lcov && codecov",
+    "docs": "typedoc src/index.ts --excludePrivate --mode file --theme minimal --out build/docs && opn build/docs/index.html",
+    "docs:json": "typedoc --mode file --json build/docs/typedoc.json src/index.ts",
+    "release": "standard-version",
+    "release-github": "source .env.sh && conventional-github-releaser -p angular -r 1",
+    "prett": "prettier 'src/**/*.ts' --write",
+    "docs:dev": "cd _docs_website && next",
+    "docs:build": "cd _docs_website && next build",
+    "docs:start": "cd _docs_website && next start",
+    "docs:examples": "node _docs_website/generateExamples.js",
+    "docs:export": "yarn docs:examples && cd _docs_website && next build && NODE_ENV=production next export && touch out/.nojekyll",
+    "docs:serve:prod": "http-server _docs_website/out",
+    "docs:deploy:gh-pages": "git subtree push --prefix=_docs_website/out origin gh-pages"
+  },
+  "scripts-info": {
+    "info": "Display information about the scripts",
+    "build": "(Trash and re)build the library",
+    "lint": "Lint all typescript source files",
+    "unit": "Run unit tests",
+    "test": "Lint and test the library",
+    "watch": "Watch source files, rebuild library on changes, rerun relevant tests",
+    "watch:build": "Watch source files, rebuild library on changes",
+    "watch:unit": "Watch the build, rerun relevant tests on changes",
+    "cov": "Run tests, generate the HTML coverage report, and open it in a browser",
+    "html-coverage": "Output HTML test coverage report",
+    "send-coverage": "Output lcov test coverage report and send it to codecov",
+    "docs": "Generate API documentation and open it in a browser",
+    "docs:json": "Generate API documentation in typedoc JSON format",
+    "release": "Bump package.json version, update CHANGELOG.md, tag a release"
+  },
+  "devDependencies": {
+    "@types/chance": "^0.7.35",
+    "@types/faker": "^4.1.1",
+    "@types/node": "^8.0.41",
+    "ava": "^0.22.0",
+    "brace": "^0.10.0",
+    "codecov": "^2.3.1",
+    "conventional-github-releaser": "^1.1.12",
+    "http-server": "^0.10.0",
+    "multiview": "^2.5.3",
+    "next": "^4.1.3",
+    "npm-scripts-info": "^0.3.6",
+    "nyc": "^11.0.2",
+    "opn-cli": "^3.1.0",
+    "prettier": "^1.7.4",
+    "react": "^16.0.0",
+    "react-ace": "^5.4.0",
+    "react-dom": "^16.0.0",
+    "rollup": "^0.44.0",
+    "rollup-plugin-alias": "^1.2.0",
+    "rollup-plugin-commonjs": "^8.0.2",
+    "rollup-plugin-node-resolve": "^3.0.0",
+    "rollup-watch": "^4.0.0",
+    "standard-version": "^4.2.0",
+    "trash-cli": "^1.4.0",
+    "tslint": "^5.8.0",
+    "tslint-config-standard": "^6.0.0",
+    "typedoc": "^0.9.0",
+    "typescript": "^2.5.3"
+  },
+  "dependencies": {
+    "casual-browserify": "^1.5.12",
+    "chance": "^1.0.11",
+    "faker": "^4.1.0",
+    "randexp": "^0.4.6",
+    "tslib": "^1.8.0"
+  },
+  "nyc": {
+    "exclude": [
+      "**/*.spec.js"
+    ]
+  },
+  "ava": {
+>>>>>>> 97f9471ddb22d56de9c6866b53e1ace848b3cf06
     "files": [
         "build/main/**/*",
         "build/module/**/*",