Merge branch 'master' into master

bookshelf · Dec 9, 2018 · 1d37ed5 · 1d37ed5
2 parents 2705e15 + 4b4a420
commit 1d37ed5
Show file tree

Hide file tree

Showing 100 changed files with 40,504 additions and 8,050 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,5 +1,5 @@
 {
-  "extends": "eslint:recommended",
+  "extends": ["eslint:recommended", "prettier"],
   "parserOptions": {
     "ecmaVersion": 6,
     "sourceType": "module"
@@ -11,7 +11,7 @@
   "rules": {
     "no-console": 1,
     "no-const-assign": 2,
-    "no-unused-vars": [1, {"vars": "all", "args": "none"}],
+    "no-unused-vars": [1, { "vars": "all", "args": "none" }],
     "no-var": 0,
     "prefer-const": 1,
     "no-trailing-spaces": 1

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -231,7 +231,9 @@ just make sure to follow the process explained below in the correct order.
 
 1. You should draft a new release on GitHub. This isn't strictly necessary, but is highly recommended. At this time you
 shouldn't publish it yet, but just save it as a draft instead.
+2. Make sure you're in the `master` branch with all the latest changes: `git pull`.
 2. Update the `CHANGELOG.md` file and update the version number of `package.json`. For the changelog just follow the
 format of the previous update. In general you should link to PRs instead of issues when mentioning changes. If the PRs'
-descriptions are well written they should already include any associated issues. At this point there is no need to commit and/or push these changes since that is taken care of automatically by the release scripts.
+descriptions are well written they should already include any associated issues. At this point there is no need to
+commit and/or push these changes since that is taken care of automatically by the release scripts.
 3. Just run `npm publish` and sit back.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,4 @@ node_modules
 npm-debug.log
 tmp
 coverage/
-index.html
-docs/
 .jsdoc-temp/
diff --git a/.npmignore b/.npmignore
@@ -1,11 +1,12 @@
+coverage/
 docs/
+scripts/
 tutorials/
 test/
-index.html
+.github/
 .eslintrc
 .istanbul.yml
 .travis.yml
 .npmignore
 CNAME
 docker-compose.yml
-scripts
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,8 @@
+{
+  "singleQuote": true,
+  "trailingComma": "none",
+  "arrowParens": "always",
+  "bracketSpacing": false,
+  "semi": true,
+  "printWidth": 120
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-# [bookshelf.js](http://bookshelfjs.org)
+# bookshelf.js
 
 [![NPM Version](https://img.shields.io/npm/v/bookshelf.svg?style=flat)](https://www.npmjs.com/package/bookshelf)
-[![Build Status](https://travis-ci.org/bookshelf/bookshelf.svg?branch=master)](https://travis-ci.org/bookshelf/bookshelf)
+[![Build Status](https://api.travis-ci.org/bookshelf/bookshelf.svg?branch=master)](https://travis-ci.org/bookshelf/bookshelf)
 [![Dependency Status](https://david-dm.org/bookshelf/bookshelf/status.svg)](https://david-dm.org/bookshelf/bookshelf)
 [![devDependency Status](https://david-dm.org/bookshelf/bookshelf/dev-status.svg)](https://david-dm.org/bookshelf/bookshelf?type=dev)
 
@@ -11,10 +11,6 @@ It is designed to work well with PostgreSQL, MySQL, and SQLite3.
 
 [Website and documentation](http://bookshelfjs.org). The project is [hosted on GitHub](http://github.com/bookshelf/bookshelf/), and has a comprehensive [test suite](https://travis-ci.org/bookshelf/bookshelf).
 
-## Notice
-
-This project is currently undergoing some changes. You may want to [read the discussion about the future of bookshelf.js](https://github.com/bookshelf/bookshelf/issues/1600) on GitHub.
-
 ## Introduction
 
 Bookshelf aims to provide a simple library for common tasks when querying databases in JavaScript, and forming relations between these objects, taking a lot of ideas from the the [Data Mapper Pattern](http://en.wikipedia.org/wiki/Data_mapper_pattern).
@@ -79,7 +75,10 @@ var Post = bookshelf.Model.extend({
 Here is an example to get you started:
 
 ```js
-var knex = require('knex')({client: 'mysql', connection: process.env.MYSQL_DATABASE_CONNECTION });
+var knex = require('knex')({
+  client: 'mysql',
+  connection: process.env.MYSQL_DATABASE_CONNECTION
+});
 var bookshelf = require('bookshelf')(knex);
 
 var User = bookshelf.Model.extend({

diff --git a/docs/CNAME b/docs/CNAME
@@ -0,0 +1 @@
+bookshelfjs.org
diff --git a/docs/api.html b/docs/api.html
diff --git a/docs/bookshelf.js.html b/docs/bookshelf.js.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <link rel="icon" href="images/favicon.ico" />
+    <link rel="canonical" href="http://bookshelfjs.org" />
+    <title>Bookshelf.js | bookshelf.js</title>
+    <!--
+    ._.                                                      ._.
+    | |    ______             _        _          _  __      | |
+    | |    | ___ \           | |      | |        | |/ _|     | |
+    | |    | |_/ / ___   ___ | | _____| |__   ___| | |_      | |
+    | |    | ___ \/ _ \ / _ \| |/ / __| '_ \ / _ \ |  _|     | |
+    | |    | |_/ / (_) | (_) |   <\__ \ | | |  __/ | |       | |
+    | |____\____/_\___/_\___/|_|\_\___/_|_|_|\___|_|_|_______| |
+    |                                                          |
+    \________\  /__________________________________\  /________/
+              \/                                    \/
+    -->
+    <script src="scripts/prettify/prettify.js"></script>
+    <script src="scripts/prettify/lang-css.js"></script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Import fonts from Open Font Library -->
+    <link rel="stylesheet" media="screen" href="https://fontlibrary.org/face/carlito" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" media="screen" href="https://fontlibrary.org/face/average-mono" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" media="screen" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
+
+    <link type="text/css" rel="stylesheet" href="styles/main.css">
+  </head>
+  <body class="minami">
+    <nav class="main-navbar">
+      <a href="index.html"><img class="nav-logo" src="images/bookshelf-icon-inverted.svg" />Bookshelf.js
+</a>
+      <label for="show-menu" class="show-menu">
+        <i class="fa fa-bars fa-lg" aria-hidden="true"></i>
+      </label>
+      <input type="checkbox" id="show-menu" role="button" checked>
+      <ul id="menu">
+
+          <li>
+            <a href="tutorials.html"><i class="fa fa-file-text" aria-hidden="true"></i>Guides
+</a>
+          </li>
+
+
+          <li>
+            <a href="api.html"><i class="fa fa-book" aria-hidden="true"></i>API Reference
+</a>
+          </li>
+
+        <li>
+          <a href="https://github.com/bookshelf/bookshelf"><span class="fa fa-github"></span></a>
+        </li>
+      </ul>
+    </nav>
+
+    <div class="page-content">
+
+
+      <div class="main-container source">
+        <div class="main-column">
+
+            <h1 class="page-title">bookshelf.js</h1>
+
+
+
+
+
+
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>/**
+ * (c) 2013-present Tim Griesser
+ * Bookshelf may be freely distributed under the MIT license.
+ * For all details and documentation:
+ * http://bookshelfjs.org
+ *
+ */
+module.exports = require('./lib/bookshelf');
+</code></pre>
+        </article>
+    </section>
+
+
+
+
+
+        </div>
+      </div>
+    </div>
+
+    <footer>
+      <div>
+        Documentation generated by
+        <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+
+          on
+          December 9, 2018
+
+      </div>
+    </footer>
+
+    <script>prettyPrint();</script>
+    <script src="scripts/linenumber.js"></script>
+    <script src="scripts/main.js"></script>
+  </body>
+</html>
diff --git a/docs/images/bookshelf-icon-inverted.svg b/docs/images/bookshelf-icon-inverted.svg
diff --git a/docs/images/favicon.ico b/docs/images/favicon.ico