Merge branch 'development' of https://github.com/0xProject/0x-monorepo into website/feature/react-16

4 files changed, 26 insertions, 6 deletions

diff --git a/packages/sra-spec/CHANGELOG.json b/packages/sra-spec/CHANGELOG.json
index 8467f3c68..e9bac0c4d 100644
--- a/packages/sra-spec/CHANGELOG.json
+++ b/packages/sra-spec/CHANGELOG.json
@@ -1,5 +1,18 @@
 [
     {
+        "version": "1.0.1-rc.6",
+        "changes": [
+            {
+                "note":
+                    "Fix `main` and `types` package.json entries so that they point to the new location of index.d.ts and index.js"
+            },
+            {
+                "note": "Fix relative path to introduction MD file"
+            }
+        ],
+        "timestamp": 1535377027
+    },
+    {
         "version": "1.0.1-rc.5",
         "changes": [
             {
diff --git a/packages/sra-spec/CHANGELOG.md b/packages/sra-spec/CHANGELOG.md
index 1a88b0ce1..60c1cb78f 100644
--- a/packages/sra-spec/CHANGELOG.md
+++ b/packages/sra-spec/CHANGELOG.md
@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.1-rc.6 - _August 27, 2018_
+
+    * Fix `main` and `types` package.json entries so that they point to the new location of index.d.ts and index.js
+    * Fix relative path to introduction MD file
+
 ## v1.0.1-rc.5 - _August 24, 2018_
 
     * Add takerAddress to /orders parameters (#974)
diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json
index 35b51432f..02cf1a54c 100644
--- a/packages/sra-spec/package.json
+++ b/packages/sra-spec/package.json
@@ -1,12 +1,12 @@
 {
     "name": "@0xproject/sra-spec",
-    "version": "1.0.1-rc.5",
+    "version": "1.0.1-rc.6",
     "engines": {
         "node": ">=6.12"
     },
     "description": "Standard Relayer API Open API Spec",
-    "main": "lib/src/index.js",
-    "types": "lib/src/index.d.ts",
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
     "scripts": {
         "serve": "redoc-cli serve lib/api.json --watch",
         "watch_without_deps": "run-p build-json:watch serve",
@@ -17,9 +17,10 @@
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
         "test:circleci": "yarn test:coverage",
         "clean": "shx rm -rf lib",
-        "build": "tsc && yarn build-json",
+        "build": "tsc && yarn copy_md_files && yarn build-json",
         "build-json": "ts-node build_scripts/buildJson.ts",
         "build-json:watch": "chokidar 'src/**/*' -c 'yarn build-json' ",
+        "copy_md_files": "copyfiles -u 2 './src/md/**/*.md' ./lib/md",
         "deploy-site": "discharge deploy"
     },
     "repository": {
@@ -33,7 +34,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-spec/README.md",
     "dependencies": {
-        "@0xproject/json-schemas": "^1.0.1-rc.5"
+        "@0xproject/json-schemas": "^1.0.1-rc.6"
     },
     "devDependencies": {
         "@0xproject/tslint-config": "^1.0.6",
@@ -42,6 +43,7 @@
         "@types/node": "^10.5.3",
         "chai": "^4.0.1",
         "chokidar-cli": "^1.2.0",
+        "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "discharge": "^0.7.1",
         "mocha": "^4.0.1",
diff --git a/packages/sra-spec/src/md/index.ts b/packages/sra-spec/src/md/index.ts
index 076c3c45c..4e778e073 100644
--- a/packages/sra-spec/src/md/index.ts
+++ b/packages/sra-spec/src/md/index.ts
@@ -1,5 +1,5 @@
 import { readFileSync } from 'fs';
 
 export const md = {
-    introduction: readFileSync('src/md/introduction.md').toString(),
+    introduction: readFileSync(`${__dirname}/introduction.md`).toString(),
 };