sails - npm Package Compare versions

Comparing version 1.0.3-4 to 1.1.0-1

lib/app/private/bootstrap.js

@@ -44,3 +44,4 @@ /**
   // If bootstrap takes too long, display warning message
-  // (just in case user forgot to call THEIR bootstrap's `done` callback)
+  // (just in case user forgot to call THEIR bootstrap's `done` callback, if
+  // they're using that approach)
   var timeoutMs = sails.config.bootstrapTimeout || 5000;
@@ -50,3 +51,3 @@ var timer = setTimeout(function bootstrapTookTooLong() {
     'Bootstrap is taking a while to finish ('+timeoutMs+' milliseconds).\n'+
-    'If this is unexpected, and if the bootstrap function uses a callback,\n'+
+    'If this is unexpected, and *if* the bootstrap function uses a callback,\n'+
     'maybe double-check to be sure that callback is getting called.\n'+
@@ -101,6 +102,6 @@ ' [?] Read more: https://sailsjs.com/config/bootstrap');
       if (err) {
-        sails.log.error('The bootstrap function encountered an error *AFTER* calling its callback!  Details:',err);
+        sails.log.error('The bootstrap function encountered an error *AFTER* it already ran once!  Details:',err);
       }
       else {
-        sails.log.error('The bootstrap function (`sails.config.bootstrap`) called its callback more than once!');
+        sails.log.error('The bootstrap function (`sails.config.bootstrap`) signaled that it is finished, but it already ran once!  (*If* it is using a callback, check that the callback is not being called more than once.)');
       }
@@ -107,0 +108,0 @@ return;

lib/app/private/controller/help-register-action.js

@@ -43,3 +43,4 @@ /**
   // Identities should only have letters, numbers, dots, dashes and slashes.
-  if (!identity.match(/^[a-z_\$][a-z0-9-_.\$]*(\/[a-z_\$][a-z0-9-_\$.]*)*$/)) {
+  var IS_VALID_ACTION_IDENTITY_RX = /^[a-z_\$][a-z0-9-_.\$]*(\/[a-z_\$][a-z0-9-_\$.]*)*$/;
+  if (!identity.match(IS_VALID_ACTION_IDENTITY_RX)) {
     throw flaverr({ name: 'userError', code: 'E_INVALID_ACTION_IDENTITY' }, new Error('Could not register action with invalid identity `' + identity + '`'));
@@ -46,0 +47,0 @@ }

lib/app/private/loadHooks.js

@@ -204,3 +204,3 @@ /**
             '  -• Is `'+id+'` a custom or 3rd party hook?\n'+
-            '    (Make sure its `initialize()` function triggers its callback.)\n'+
+            '    (*If* `initialize()` is using a callback, make sure it\'s being called.)\n'+
             '--  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --\n'
@@ -207,0 +207,0 @@ );

lib/router/index.js

@@ -429,7 +429,8 @@ /**
     // Bail if the action contains characters other than letters, numbers, dashes and forward slashes.
-    if (!actionIdentity.match(/^\w+[a-zA-Z0-9\/-]*$/)) {
-      var didYouMean = '';
+    if (!actionIdentity.match(/^[a-zA-Z_\$]+[a-zA-Z0-9_\/\-\$]*$/)) {
       // If the action didn't contain weird characters, make a suggestion by removing "Controller" and
       // replacing dots with slashes.
-      if (!actionIdentity.match(/[^a-zA-Z0-9.\/-]/)) {
+      var didYouMean = '';
+      var RX_DOESNT_HAVE_ANY_WEIRD_CHARS = /[^a-zA-Z0-9.\/\-\$]/;
+      if (!actionIdentity.match(RX_DOESNT_HAVE_ANY_WEIRD_CHARS)) {
         didYouMean = ' Did you mean `' + actionIdentity.replace('Controller', '').replace(/\./g,'/') + '`?';
@@ -459,3 +460,3 @@ }
     // If the result contains anything other than letters, numbers, dashes, underscores or forward-slashes, bail.
-    if (!actionIdentity.match(/^\w+[a-zA-Z0-9\/\-_]*$/)) {
+    if (!actionIdentity.match(/^[a-zA-Z_\$]+[a-zA-Z0-9_\/\-\$]*$/)) {
       throw flaverr({name: 'userError', code: 'E_NOT_ACTION_TARGET'}, new Error(
@@ -462,0 +463,0 @@ '\nCould not parse invalid action `' + target + '`.\n'+

MODULES.md

@@ -32,2 +32,3 @@ # Modules
 | `sockets`      | [sails-hook-sockets](https://npmjs.com/package/sails-hook-sockets)  | [![NPM version](https://badge.fury.io/js/sails-hook-sockets.png)](http://badge.fury.io/js/sails-hook-sockets) | [![Build Status](https://travis-ci.org/balderdashy/sails-hook-sockets.png?branch=master)](https://travis-ci.org/balderdashy/sails-hook-sockets)  | Implements Socket.io support in Sails.  |
+| `organics`     | [sails-hook-organics](https://npmjs.com/package/sails-hook-organics)                | [![NPM version](https://badge.fury.io/js/sails-stdlib.png)](http://badge.fury.io/js/sails-stdlib) | [![Build Status](https://travis-ci.org/sailshq/sails-hook-organics.png?branch=master)](https://travis-ci.org/sailshq/sails-hook-organics)             | Evolving library of well-tested, well-documented, and officially supported modules for the most common everyday tasks in apps (e.g. password encryption, etc.)
 
@@ -45,2 +46,9 @@ > These are not _all_ the core hooks in Sails.  There are other core hooks built in to the `sails` package itself (see [`lib/hooks/`](https://github.com/balderdashy/sails/tree/master/lib/hooks)).  These other, _built-in hooks_ can still be disabled or overridden using the same configuration.
 
+#### Other browser libraries
+
+The "Web App" template in Sails comes with a lightweight client-side JavaScript wrapper for Vue.js called `parasails`:
+
+[![NPM version](https://badge.fury.io/js/parasails.png)](https://npmjs.com/package/parasails)
+
+
 #### Core database adapters
@@ -98,3 +106,3 @@
 | [sails-docs](https://github.com/balderdashy/sails-docs)  | Raw content for reference, conceptual, anatomical, and other documentation on the Sails website (in Markdown).
-| [www.sailsjs.com](https://github.com/balderdashy/www.sailsjs.com) | The Sails app that powers [sailsjs.com](http://sailsjs.com).  HTML content is automatically compiled from [`sails-docs`](https://github.com/balderdashy/sails-docs).
+| [www.sailsjs.com](https://sailsjs.com) | The Sails app that powers [sailsjs.com](http://sailsjs.com).  HTML content is automatically compiled from [`sails-docs`](https://github.com/balderdashy/sails-docs).
 | [doc-templater](https://github.com/uncletammy/doc-templater) | The module we use to pre-process, compile, and format Markdown documentation files into the HTML markup and tree menus at [`sailsjs.com/documentation`](http://sailsjs.com/documentation).
@@ -200,4 +208,2 @@
 |-------------------------------------------------------------------------------------|---------------------------------|:------------|
-| [sails-stdlib](https://npmjs.com/package/sails-stdlib)                              | [![NPM version](https://badge.fury.io/js/sails-stdlib.png)](http://badge.fury.io/js/sails-stdlib) | Evolving library of well-tested, well-documented, and officially supported modules for the most common everyday tasks in apps (e.g. password encryption, etc.)
-| [stdlib](https://npmjs.com/package/stdlib)                                          | [![NPM version](https://badge.fury.io/js/stdlib.png)](http://badge.fury.io/js/stdlib) | A lighter build of `sails-stdlib`, designed for use outside of the environment of a Sails app (e.g. when building lower-level Node.js modules like machinepacks)
 | [sails-migrations](https://github.com/BlueHotDog/sails-migrations)                  | [![NPM version](https://badge.fury.io/js/sails-migrations.png)](http://badge.fury.io/js/sails-migrations) | Manual migration tool for Sails, built on Knex.
@@ -204,0 +210,0 @@ | [sails-mysql-transactions](https://github.com/postmanlabs/sails-mysql-transactions) | [![NPM version](https://badge.fury.io/js/sails-mysql-transactions.png)](http://badge.fury.io/js/sails-mysql-transactions) | Augmented database adapter for mySQL with transaction and replication support.

package.json

 {
   "name": "sails",
   "author": "Mike McNeil <@mikermcneil>",
-  "version": "1.0.3-4",
+  "version": "1.1.0-1",
   "description": "API-driven framework for building realtime apps, using MVC conventions (based on Express and Socket.io)",
@@ -61,3 +61,3 @@ "license": "MIT",
     "rttc": "^10.0.0-0",
-    "sails-generate": "^1.15.19",
+    "sails-generate": "^1.16-0",
     "sails-stringfile": "0.3.2",
@@ -64,0 +64,0 @@ "semver": "4.3.6",

No alert changes

Improved metrics

Total package byte prevSize

1511246

increased by0.02%

Lines of code

32296

increased by0.01%

Dependency changes

• - Removedansi-regex@2.1.1(transitive)

• - Removedansi-styles@2.2.1(transitive)

• - Removedchalk@1.1.3(transitive)

• - Removedcross-spawn@4.0.2(transitive)

• - Removedhas-ansi@2.0.0(transitive)

• - Removedis-wsl@1.1.0(transitive)

• - Removedisexe@2.0.0(transitive)

• - Removedlru-cache@4.1.5(transitive)

• - Removedmachinepack-process@4.0.1(transitive)

• - Removedopn@5.3.0(transitive)

• - Removedparasails@0.7.11(transitive)

• - Removedpseudomap@1.0.2(transitive)

• - Removedreportback@2.0.2(transitive)

• - Removedsails-generate@1.17.2(transitive)

• - Removedsails.io.js-dist@1.2.1(transitive)

• - Removedstrip-ansi@3.0.1(transitive)

• - Removedsupports-color@2.0.0(transitive)

• - Removedwhich@1.3.1(transitive)

• - Removedyallist@2.1.2(transitive)

• Updatedsails-generate@^1.16-0