0.12.0

LICENSE

@@ -1,202 +1,4 @@
-Apache License
+This Source Code Form is subject to the terms of the Mozilla
-                           Version 2.0, January 2004
+Public License, v. 2.0. If a copy of the MPL was not distributed
-                        http://www.apache.org/licenses/
+with this file, You can obtain one at
-
+https://mozilla.org/MPL/2.0/.
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

README.md

@@ -441,3 +441,10 @@ The response may include errors of all shapes and sizes.
 ```json
 { "files": { "assets/logo.png": "compiled/assets/logo.png" } }
 ```
+
+# License
+
+This Source Code Form is subject to the terms of the Mozilla \
+Public License, v. 2.0. If a copy of the MPL was not distributed \
+with this file, You can obtain one at \
+https://mozilla.org/MPL/2.0/.

bower.json

@@ -23,7 +23,6 @@
   "homepage": "http://github.com/DearDesi/desirae",
   "ignore": ["**/.*", "node_modules", "bower_components", "test", "tests"],
   "dependencies": {
-    "bluebird": "~2.6.2",
     "escape-string-regexp": "~1.0.2",
     "forEachAsync": "~5.0.5",
     "js-yaml": "~3.2.5",

desirae.js

@@ -1,15 +1,15 @@
 (function (exports) {
   "use strict";
 
-  var PromiseA = exports.Promise || require("bluebird").Promise,
+  var path = exports.path || require("path");
-    path = exports.path || require("path"),
+  var Mustache = exports.Mustache || require("mustache");
-    Mustache = exports.Mustache || require("mustache"),
+  var forEachAsync =
-    forEachAsync = exports.forEachAsync || require("foreachasync").forEachAsync,
+    exports.forEachAsync || require("foreachasync").forEachAsync;
-    THEME_PREFIX = "themes",
+  var THEME_PREFIX = "themes";
-    //, sha1sum       = exports.sha1sum       || require('./lib/node-adaptors').sha1sum
+  //var sha1sum       = exports.sha1sum       || require('./lib/node-adaptors').sha1sum
-    //, safeResolve   = exports.safeResolve   || require('./lib/utils').safeResolve
+  //var safeResolve   = exports.safeResolve   || require('./lib/utils').safeResolve
-    //, UUID          = exports.uuid          || require('node-uuid')
+  //var UUID          = exports.uuid          || require('node-uuid')
-    pforms;
+  var pforms;
 
   function Desi() {}
 
@@ -371,7 +371,7 @@
       // TODO pull state out of this later
       Desi.realFsapi.create(Desi, env);
     }
-    return PromiseA.resolve();
+    return Promise.resolve();
   };
 
   Desi.init = function (desi, env) {
@@ -383,7 +383,7 @@
     }
 
     // config.yml, data.yml, site.yml, authors
-    return PromiseA.all([
+    return Promise.all([
       Desi.fsapi.getAllConfigFiles(),
       /*, fsapi.getBlogdir()*/
     ])
@@ -433,7 +433,7 @@
           //.map(function (n) { return path.join(n, 'layouts'); })
           assetnames = Object.keys(desi.config.assets);
         // TODO make document configurability
-        return PromiseA.all([
+        return Promise.all([
           Desi.fsapi.getMeta(
             themenames.map(function (n) {
               return path.join(THEME_PREFIX, n);
@@ -544,16 +544,16 @@
     droot = getDirty(cacheByPath, cacheBySha1, [desi.meta.root], dthemes);
     dfiles = getDirty(cacheByPath, cacheBySha1, desi.meta.collections, dthemes);
 
-    return PromiseA.all([
+    return Promise.all([
       Object.keys(droot).length
         ? Desi.fsapi.getContents(Object.keys(droot))
-        : PromiseA.resolve([]),
+        : Promise.resolve([]),
       Object.keys(dfiles).length
         ? Desi.fsapi.getContents(Object.keys(dfiles))
-        : PromiseA.resolve([]),
+        : Promise.resolve([]),
       Object.keys(dthemes).length
         ? Desi.fsapi.getContents(Object.keys(dthemes))
-        : PromiseA.resolve([]),
+        : Promise.resolve([]),
     ]).then(function (arr) {
       var result = { root: [], collections: [], themes: [] };
       function noErrors(collectionBase, arr, entity) {
@@ -585,7 +585,7 @@
           }
 
           arr.push(entity);
-          return PromiseA.resolve();
+          return Promise.resolve();
         }
 
         if (env.onError) {
@@ -593,7 +593,7 @@
         } else {
           console.error("Couldn't get file contents for '" + entity.path + "'");
           console.error(entity.error);
-          return PromiseA.reject(entity.error);
+          return Promise.reject(entity.error);
         }
       }
 
@@ -650,7 +650,7 @@
 
           return desi;
         })) ||
-      PromiseA.resolve(desi)
+      Promise.resolve(desi)
     );
   };
 
@@ -705,7 +705,7 @@
       return n;
     });
 
-    return PromiseA.resolve(desi);
+    return Promise.resolve(desi);
   };
 
   Desi.runTransforms = function (desi, env) {
@@ -740,7 +740,7 @@
     desi.content.root.forEach(makeTransformer("root"));
     desi.content.collections.forEach(makeTransformer("collections"));
 
-    return PromiseA.resolve(desi);
+    return Promise.resolve(desi);
   };
 
   Desi._aggregations = [];
@@ -835,7 +835,7 @@
     if (Desi._renderers[type][ext] && Desi._renderers[type][ext].length) {
       return Desi._renderers[type][ext][0](content, view);
     }
-    return PromiseA.reject(
+    return Promise.reject(
       new Error("no '" + type + "' renderer registered for '." + ext + "'")
     );
   };

lib/node-adapters/fsapi.js

@@ -1,17 +1,17 @@
 "use strict";
 
-var PromiseA = require("bluebird").Promise,
+var fs = require("fs").promises;
-  fs = PromiseA.promisifyAll(require("fs")),
+var path = require("path");
-  forEachAsync = require("foreachasync").forEachAsync,
+
-  path = require("path"),
+var forEachAsync = require("foreachasync").forEachAsync;
-  walk = require("walk"),
+var walk = require("walk");
-  escapeRegExp = require("escape-string-regexp"),
+var escapeRegExp = require("escape-string-regexp");
-  safeResolve = require("../utils").safeResolve,
+var safeResolve = require("../utils").safeResolve;
-  sha1sum = function (str) {
+var sha1sum = function (str) {
   return require("secret-utils").hashsum("sha1", str);
-  },
+};
-  mkdirp = PromiseA.promisify(require("mkdirp")),
+var fsExtra = PromiseA.promisifyAll(require("fs.extra"));
-  fsExtra = PromiseA.promisifyAll(require("fs.extra"));
+
 //, tmpdir        = require('os').tmpdir()
 function strip(prefix, pathname) {
   return pathname.substr(prefix.length + 1);
@@ -23,9 +23,9 @@ function walkDir(parent, sub, opts) {
     opts.sha1sum = true;
   }
 
-  var prefix = path.resolve(parent),
+  var prefix = path.resolve(parent);
-    trueRoot = path.resolve(prefix, sub),
+  var trueRoot = path.resolve(prefix, sub);
-    files = [];
+  var files = [];
   function filter(name) {
     if (!name) {
       return false;
@@ -146,7 +146,7 @@ function getfs(blogdir, filepaths) {
     return fs
       .lstatAsync(pathname)
       .then(function (stat) {
-        return fs.readFileAsync(pathname, null).then(function (buffer) {
+        return fs.readFile(pathname, null).then(function (buffer) {
           files.push({
             name: path.basename(pathname),
             relativePath: path.dirname(filepath),
@@ -173,7 +173,7 @@ function getfs(blogdir, filepaths) {
 function makeAllDirs(dirpaths) {
   var errors = [];
   return forEachAsync(dirpaths, function (pathname) {
-    return mkdirp(pathname).catch(function (e) {
+    return fs.mkdir(pathname, { recursive: true }).catch(function (e) {
       // TODO exclude attempting to write files to this dir?
       errors.push({
         type: "directory",
@@ -283,7 +283,7 @@ function putfs(blogdir, files, options) {
       // I figure as batch when there may be hundreds of files,
       // likely within 2 or 3 directories
       return forEachAsync(Object.keys(dirpaths), function (pathname) {
-        return mkdirp(pathname).catch(function (e) {
+        return fs.mkdir(pathname, { recursive: true }).catch(function (e) {
           // TODO exclude attempting to write files to this dir?
           putfsResults.errors.push({
             type: "directory",
@@ -308,18 +308,18 @@ function putfs(blogdir, files, options) {
         return fs
           .existsAsync(file.realPath)
           .then(function () {
-            return fs.writeFileAsync(file.realPath, file.contents, "utf8");
+            return fs.writeFile(file.realPath, file.contents, "utf8");
           })
           .catch(function (/*exists*/) {
             if (file.delete || !file.contents) {
-              return fs.unlinkAsync(file.realPath);
+              return fs.unlink(file.realPath);
             }
 
             if (false === options.replace || false === options.overwrite) {
               throw new Error("EEXIST: the file already exists");
             }
 
-            return fs.writeFileAsync(file.realPath, file.contents, "utf8");
+            return fs.writeFile(file.realPath, file.contents, "utf8");
           })
           .catch(function (e) {
             putfsResults.errors.push({

lib/node-adapters/sha1sum.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var PromiseA = require("bluebird").Promise,
+var secretutils = require("secret-utils");
-  secretutils = require("secret-utils");
+
 module.exports.sha1sum = function (str) {
-  return PromiseA.resolve(secretutils.hashsum("sha1", str));
+  return Promise.resolve(secretutils.hashsum("sha1", str));
 };

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "desirae",
-  "version": "0.11.6",
+  "version": "0.12.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -12,11 +12,6 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "bluebird": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE="
-    },
     "crypto-rand": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/crypto-rand/-/crypto-rand-0.0.2.tgz",
@@ -117,19 +112,6 @@
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
       "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
     },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "mustache": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "desirae",
-  "version": "0.11.6",
+  "version": "0.12.0",
   "description": "An in-browser static blog library and static site generator. Similar to Jekyll, Octopress, Nanoc, etc",
   "main": "desirae.js",
   "scripts": {
@@ -24,19 +24,17 @@
     "nanoc"
   ],
   "author": "AJ ONeal",
-  "license": "Apache2",
+  "license": "MPL-2.0",
   "bugs": {
     "url": "https://git.coolaj86.com/coolaj86/desirae.js/issues"
   },
   "homepage": "https://git.coolaj86.com/coolaj86/desirae.js",
   "dependencies": {
-    "bluebird": "^2.5.3",
     "escape-string-regexp": "^1.0.2",
     "foreachasync": "^5.0.5",
     "fs.extra": "^1.3.2",
     "js-yaml": "^3.2.5",
     "markdown-it": "^3.0.2",
-    "mkdirp": "^0.5.0",
     "mustache": "^2.3.2",
     "node-uuid": "^1.4.2",
     "secret-utils": "^1.0.2",