diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..b7ca95b5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# JS files must always use LF for tools to work +*.js eol=lf diff --git a/.gitignore b/.gitignore index b5a693a5..633f1bde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,3 @@ -dist -node_modules -config.json -.project -*~ -*.diff -*.patch -.DS_Store -.settings \ No newline at end of file +/dist/ +/node_modules/ +config.js* diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 630bbc3d..d6d55695 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,4 +2,4 @@ Welcome! Thanks for your interest in contributing to api.jquerymobile.com. You'r You may also want to take a look at our [commit & pull request guide](http://contribute.jquery.org/commits-and-pull-requests/) and [style guides](http://contribute.jquery.org/style-guide/) for instructions on how to maintain your fork and submit your code. Before we can merge any pull request, we'll also need you to sign our [contributor license agreement](http://contribute.jquery.org/cla). -You can find us on [IRC](http://irc.jquery.org), specifically in [#jquerymobile-dev](irc://irc.freenode.net/#jquerymobile-dev) and [#jquery-content](irc://irc.freenode.net/#jquery-content) should you have any questions. If you've never contributed to open source before, we've put together [a short guide with tips, tricks, and ideas on getting started](http://contribute.jquery.org/open-source/). +You can find us on [IRC](http://irc.jquery.org), specifically in #jqueryui-dev and #jquery-content should you have any questions. If you've never contributed to open source before, we've put together [a short guide with tips, tricks, and ideas on getting started](http://contribute.jquery.org/open-source/). diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 00000000..15d01b05 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,41 @@ +module.exports = function( grunt ) { + +grunt.loadNpmTasks( "grunt-jquery-content" ); + +grunt.initConfig({ + xmllint: { + all: [ + "entries/**", + "includes/**", + "categories.xml", + "entries2html.xsl", + "notes.xsl" + ] + }, + "build-posts": { + page: "pages/**" + }, + "build-xml-entries": { + all: "entries/**" + }, + "build-resources": { + all: "resources/**" + }, + wordpress: (function() { + var config = require( "./config" ); + config.dir = "dist/wordpress"; + return config; + })() +}); + +grunt.registerTask( "lint", [ "xmllint" ] ); + +grunt.registerTask( "build", [ + "build-posts", + "build-resources", + "build-xml-entries", + "build-xml-categories", + "build-xml-full" +]); + +}; diff --git a/LICENSE-MIT.txt b/LICENSE-MIT.txt index 8c920551..ccfcfebe 100644 --- a/LICENSE-MIT.txt +++ b/LICENSE-MIT.txt @@ -1,4 +1,4 @@ -Copyright (c) 2013 jQuery Foundation, https://jquery.org/ +Copyright jQuery Foundation and other contributors, https://jquery.org/ This software consists of voluntary contributions made by many individuals. For exact contribution history, see the revision history diff --git a/README.md b/README.md index de73f94d..c5288026 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,12 @@ -api.jquerymobile.com -==================== +# api.jquerymobile.com -## Building +## Building and Deploying -### Requirements -* libxml2 -* libxslt - -The `xmllint` and `xsltproc` utilities need to be in your path. If you are on Windows, you can get libxml2 and libxslt from GnuWin32. +To build and deploy your changes for previewing in a [`jquery-wp-content`](https://github.com/jquery/jquery-wp-content) instance, follow the [workflow instructions](http://contribute.jquery.org/web-sites/#workflow) from our documentation on [contributing to jQuery Foundation web sites](http://contribute.jquery.org/web-sites/). -### Build +### Requirements -To build and deploy your changes for previewing in a [`jquery-wp-content`](https://github.com/jquery/jquery-wp-content) instance, follow the [workflow instructions](http://contribute.jquery.org/web-sites/#workflow) from our documentation on [contributing to jQuery Foundation web sites](http://contribute.jquery.org/web-sites/). +* [libxml2](http://xmlsoft.org/) +* [libxslt](http://xmlsoft.org/libxslt/) +The `xmllint` and `xsltproc` utilities need to be in your path. If you are on Windows, you can get libxml2 and libxslt from GnuWin32. diff --git a/grunt.js b/grunt.js deleted file mode 100644 index cd4af15f..00000000 --- a/grunt.js +++ /dev/null @@ -1,54 +0,0 @@ -/*jshint node:true */ -module.exports = function( grunt ) { - -"use strict"; - -var entryFiles = grunt.file.expandFiles( "entries/*.xml" ); - -grunt.loadNpmTasks( "grunt-clean" ); -grunt.loadNpmTasks( "grunt-wordpress" ); -grunt.loadNpmTasks( "grunt-jquery-content" ); -grunt.loadNpmTasks( "grunt-check-modules" ); - -grunt.initConfig({ - clean: { - folder: "dist" - }, - lint: { - grunt: "grunt.js" - }, - xmllint: { - all: [].concat( entryFiles, "categories.xml", "entries2html.xsl" ) - }, - xmltidy: { - all: [].concat( entryFiles, "categories.xml" ) - }, - "build-pages": { - all: grunt.file.expandFiles( "pages/**" ) - }, - "build-xml-entries": { - all: entryFiles - }, - "build-resources": { - all: grunt.file.expandFiles( "resources/**" ) - }, - wordpress: grunt.utils._.extend({ - dir: "dist/wordpress" - }, grunt.file.readJSON( "config.json" ) ), - watch: { - scripts: { - files: 'entries/*.xml', - tasks: ['build'], - options: { - interrupt: true - } - } - } -}); - -grunt.registerTask( "default", "build-wordpress" ); -grunt.registerTask( "build", "build-pages build-xml-entries build-xml-categories build-xml-full build-resources" ); -grunt.registerTask( "build-wordpress", "check-modules clean lint xmllint build" ); -grunt.registerTask( "tidy", "xmllint xmltidy" ); - -}; diff --git a/package.json b/package.json index 31835c97..7a342884 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,11 @@ "name": "api.jquerymobile.com", "title": "jQuery Mobile API Docs", "description": "API reference documentation for jQuery Mobile.", - "version": "1.3.3", + "version": "1.3.10", "homepage": "https://github.comom/jquery/api.jquerymobile.com", - "author": "jQuery Foundation (http://jquery.org/)", + "author": { + "name": "jQuery Foundation and other contributors" + }, "repository": { "type": "git", "url": "git://github.com/jquery/api.jquerymobile.com.git" @@ -15,21 +17,11 @@ "licenses": [ { "type": "MIT", - "url": "http://www.opensource.org/licenses/MIT" + "url": "https://github.com/jquery/api.jquerymobile.com/blob/1-3/LICENSE.txt" } ], "dependencies": { - "grunt": "0.3.17", - "grunt-clean": "0.3.0", - "grunt-wordpress": "1.0.7", - "grunt-jquery-content": "0.10.4", - "grunt-check-modules": "0.1.0", - "grunt-contrib-watch": "0.1.4" - }, - "devDependencies": {}, - "keywords": [], - "optionalDependencies": {}, - "engines": { - "node": "*" + "grunt": "1.5.3", + "grunt-jquery-content": "3.1.0" } }