Merge branch 'commonjs'

Conflicts:
	archive/v0.1.2/mithril.min.js
	archive/v0.1.2/mithril.min.map
	archive/v0.1.2/mithril.min.zip
This commit is contained in:
Leo Horie 2014-04-01 22:22:31 -04:00
commit 34482a0b0f
10 changed files with 51 additions and 2 deletions

View file

@ -77,6 +77,7 @@ module.exports = function(grunt) {
options: {force: true, patterns: [{match: /\.md/g, replacement: ".html"}, {match: /\$version/g, replacement: version}]},
links: {expand: true, flatten: true, src: [tempFolder + "/**/*.html"], dest: currentVersionArchiveFolder + "/"},
index: {src: inputFolder + "/layout/index.html", dest: currentVersionArchiveFolder + "/index.html"},
commonjs: {expand: true, flatten: true, src: [inputFolder + "/layout/*.json"], dest: currentVersionArchiveFolder},
},
copy: {
style: {src: inputFolder + "/layout/style.css", dest: currentVersionArchiveFolder + "/style.css"},

View file

@ -0,0 +1,10 @@
{
"name": "mithril",
"description": "A Javascript framework for building brilliant applications",
"keywords": ["mvc", "framework"],
"repo": "lhorie/mithril",
"main": "mithril.min.js",
"scripts": ["mithril.min.js"],
"version": "0.1.2",
"license": "MIT"
}

View file

@ -418,6 +418,9 @@ new function(window) {
}
}
if (typeof module != "undefined" && module !== null) module.exports = m
if (typeof define == "function" && define.amd) define(function() {return m})
//testing API
m.deps = function(mock) {return window = mock}
}(this)

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

View file

@ -0,0 +1,11 @@
{
"name": "mithril",
"description": "A Javascript Framework for building brilliant applications",
"keywords": ["mvc", "framework"],
"version": "0.1.2",
"author": "Leo Horie <leohorie@hotmail.com>",
"repository": {"type": "git", "url": "https://github.com/lhorie/mithril"},
"main": "mithril.min.js",
"licenses": [{"type": "MIT", "url": "http://opensource.org/licenses/MIT"}]
"files": ["mithril.min.js", "mithril.min.map"]
}

View file

@ -0,0 +1,10 @@
{
"name": "mithril",
"description": "A Javascript framework for building brilliant applications",
"keywords": ["mvc", "framework"],
"repo": "lhorie/mithril",
"main": "mithril.min.js",
"scripts": ["mithril.min.js"],
"version": "$version",
"license": "MIT"
}

11
docs/layout/package.json Normal file
View file

@ -0,0 +1,11 @@
{
"name": "mithril",
"description": "A Javascript Framework for building brilliant applications",
"keywords": ["mvc", "framework"],
"version": "$version",
"author": "Leo Horie <leohorie@hotmail.com>",
"repository": {"type": "git", "url": "https://github.com/lhorie/mithril"},
"main": "mithril.min.js",
"licenses": [{"type": "MIT", "url": "http://opensource.org/licenses/MIT"}]
"files": ["mithril.min.js", "mithril.min.map"]
}

View file

@ -418,6 +418,9 @@ new function(window) {
}
}
if (typeof module != "undefined" && module !== null) module.exports = m
if (typeof define == "function" && define.amd) define(function() {return m})
//testing API
m.deps = function(mock) {return window = mock}
}(this)