Merge pull request #153 from jhollingworth/v0.9-documentation

v0.9 Documentation
martyjs · Mar 23, 2015 · cda9336 · cda9336
2 parents 1c6b430 + e6c5e3a
commit cda9336
Show file tree

Hide file tree

Showing 81 changed files with 2,265 additions and 1,079 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,8 +1,41 @@
-unreleased
-==================
+0.9.0 / 2015-03-25
+===================
+
+**New features**
+
+- Isomorphism (#13)
+- CookieStateSource
+- LocationStateSource
+- ES6 Classes (#89)
+- Add dataType option to http state source (#161)
+- Lodash v3 instead of underscore (#136)
+- Simplify action creators (#163, #93)
+- replaceState and setState (#126)
+- HttpStateSource hooks (#118)
+- FetchResult#toPromise (#131)
+- Clear fetch history in Store#clear (#149)
+- Batch store change events (#112)
+- Allow you to specify when function context (#76)
+- Marty.createContainer (#204)
+
+**Bugs**
+
+- dependsOn doesn't update when dependent store updates (#113)
+- Don't auto set content-type if using FormData (#140)
+- Fetch API compatibility (#133)
 
-- Replaced `reactify` for `babelify` as Babel now supports JSX transforms too and will help
-with an ES6 transition.
+
+0.8.15 / 2015-03-06
+===================
+- Add reactify as a dependency so you dont have to explicitly add it to parent project
+
+0.8.14 / 2015-03-05
+===================
+- Remove dependency on Babel
+
+0.8.13 / 2015-03-03
+===================
+- Hotfix for fetch incomaptibility in Chrome Canary [#133](https://github.com/jhollingworth/marty/issues/133)
 
 0.8.12 / 2015-02-14
 ===================
@@ -20,4 +53,4 @@ with an ES6 transition.
 - Fixes documentation typos
 - :green_heart: Fixes [#100](https://github.com/jhollingworth/marty/issues/100)
 - Fixes [#94](https://github.com/jhollingworth/marty/issues/94)
-- Fixes [#99](https://github.com/jhollingworth/marty/issues/99)
+- Fixes [#99](https://github.com/jhollingworth/marty/issues/99)
diff --git a/Makefile b/Makefile
@@ -49,8 +49,11 @@ build-browser:
 	@cat dist/browser/marty.js | $(BIN)/uglifyjs -m -c "comparisons=false,keep_fargs=true,unsafe=true,unsafe_comps=true,warnings=false" -b "ascii_only=true,beautify=false" -o dist/browser/marty.min.js
 	@gzip --best dist/browser/marty.min.js -c > dist/browser/marty.min.js.gz
 
-docs: bootstrap-ruby
+docs:
 	@cd docs && bundle exec jekyll serve -w
 
 release-docs: bootstrap-ruby
-	@cd docs && bundle exec rake release
+	@sh ./build/release-docs.sh
+
+prerelease-docs:
+	@sh ./build/prerelease-docs.sh
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+0.9.0
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "marty",
   "main": "dist/browser/marty.js",
-  "version": "0.9.0-rc3",
+  "version": "0.9.0",
   "homepage": "martyjs.org",
   "authors": [
     "jhollingworth <jamiehollingworth@gmail.com>"

diff --git a/build/prerelease-docs.sh b/build/prerelease-docs.sh
@@ -0,0 +1,6 @@
+version=$(cat VERSION)
+
+cd docs
+VERSION=true jekyll build -d ../../marty-gh-pages/v/$version
+
+cd ..
diff --git a/build/release-docs.sh b/build/release-docs.sh
@@ -0,0 +1,19 @@
+version=$(cat VERSION)
+
+mkdir -p tmp/doc-versions
+
+#Copy the old versions of documentation for now
+cp -r ../marty-gh-pages/v/ tmp/doc-versions
+
+cd docs
+
+jekyll build -d ../../marty-gh-pages
+echo martyjs.org > ../../CNAME
+
+# Copy the old versions back again
+cp -r ../tmp/doc-versions/* ../../marty-gh-pages/v/
+rm -rf ../tmp/doc-versions
+
+VERSION=true jekyll build -d ../../marty-gh-pages/v/$version
+
+cd ..
diff --git a/build/updateVersion.js b/build/updateVersion.js
@@ -9,6 +9,7 @@ console.log(version)
 
 updateDocs();
 updateMarty();
+updateVersion();
 ['../package.json', '../bower.json'].forEach(updateConfig);
 
 function updateDocs() {
@@ -29,6 +30,10 @@ function updateConfig(path) {
   write(path, JSON.stringify(config, null, 2));
 }
 
+function updateVersion() {
+  write('../VERSION', version);
+}
+
 function write(path, data) {
   fs.writeFileSync(join(__dirname, path), data);
 }