Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/core-generators/new/after.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ module.exports = function afterGenerate(scope, cb) {

// ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
// MAYBE just install the relevant deps. It's a lot simpler this way.
// (Note that we can prby just omit `sails`, since it'll automatically use the global version.)
// (Note that we can probably just omit `sails`, since it'll automatically use the global version.)
// ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
cb.log.info('Installing dependencies...');
console.log(chalk.gray('Press CTRL+C to cancel.'));
Expand Down
2 changes: 1 addition & 1 deletion lib/core-generators/new/before.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ module.exports = function before (scope, done) {
// ' 3. '+chalk.bold.blue('"Pure" API')+' · Back-end only (no views, no assets)\n'+
// ' 3. '+chalk.bold.blue('Pure API')+' · Back-end only (no views, no assets)\n'+
// ' 3. '+chalk.bold.blue('RESTful API')+' · Back-end only (no views, no assets)\n'+
// ' 4. '+chalk.bold.red ('Minimalist')+' · Bare-bones Node.js server (no ORM, no nothin\')\n'
// ' 4. '+chalk.bold.red ('Minimalist')+' · Bare-bones Node.js server (no ORM, no nothing\')\n'
// ' 8. '+chalk.bold.gray('Customize...')
// ' 3. '+chalk.gray('What should I choose?')
// ' 9. '+chalk.bold.gray('I\'m unsure')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ the account verification message.)`,
.intercept({name: 'UsageError'}, 'invalid')
.fetch();

// If billing feaures are enabled, save a new customer entry in the Stripe API.
// If billing features are enabled, save a new customer entry in the Stripe API.
// Then persist the Stripe customer id in the database.
if (sails.config.custom.enableBillingFeatures) {
let stripeCustomerId = await sails.helpers.stripe.saveBillingInfo.with({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {

fn: async function ({ req }) {

// If there's no sessionID, we don't need to broadcase a message about the old session.
// If there's no sessionID, we don't need to broadcast a message about the old session.
if(!req.sessionID) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ It just means they have a customer entry in Stripe, which might or might not hav
type: 'boolean',
description: 'Whether this user has a default billing card hooked up as their payment method.',
extendedDescription:
`More specifically, this indcates whether this user record's linked customer entry in Stripe has
`More specifically, this indicates whether this user record's linked customer entry in Stripe has
a default payment source (i.e. credit card). Note that a user have a \`stripeCustomerId\`
without necessarily having a billing card.`
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions lib/core-generators/new/templates/assets/dependencies/lodash.js
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@
* @private
* @param {*} value The value to wrap.
* @param {boolean} [chainAll] Enable chaining for all wrapper methods.
* @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.
* @param {Array} [actions=[]] Actions to perform to resolve the unwrapped value.
*/
function LodashWrapper(value, chainAll, actions) {
this.__wrapped__ = value;
Expand Down Expand Up @@ -2375,7 +2375,7 @@
*
* @private
* @param {Object} object The object to inspect.
* @param {Array} matchData The propery names, values, and compare flags to match.
* @param {Array} matchData The property names, values, and compare flags to match.
* @param {Function} [customizer] The function to customize comparing objects.
* @returns {boolean} Returns `true` if `object` is a match, else `false`.
*/
Expand Down Expand Up @@ -2912,7 +2912,7 @@
*
* @private
* @param {*} value The unwrapped value.
* @param {Array} actions Actions to peform to resolve the unwrapped value.
* @param {Array} actions Actions to perform to resolve the unwrapped value.
* @returns {*} Returns the resolved value.
*/
function baseWrapperValue(value, actions) {
Expand Down Expand Up @@ -4075,7 +4075,7 @@
var getLength = baseProperty('length');

/**
* Gets the propery names, values, and compare flags of `object`.
* Gets the property names, values, and compare flags of `object`.
*
* @private
* @param {Object} object The object to query.
Expand Down Expand Up @@ -4663,8 +4663,8 @@
}

/**
* Creates an array with all falsey values removed. The values `false`, `null`,
* `0`, `""`, `undefined`, and `NaN` are falsey.
* Creates an array with all falsy values removed. The values `false`, `null`,
* `0`, `""`, `undefined`, and `NaN` are falsy.
*
* @static
* @memberOf _
Expand Down Expand Up @@ -4786,7 +4786,7 @@

/**
* Creates a slice of `array` excluding elements dropped from the end.
* Elements are dropped until `predicate` returns falsey. The predicate is
* Elements are dropped until `predicate` returns falsy. The predicate is
* bound to `thisArg` and invoked with three arguments: (value, index, array).
*
* If a property name is provided for `predicate` the created `_.property`
Expand Down Expand Up @@ -4841,7 +4841,7 @@

/**
* Creates a slice of `array` excluding elements dropped from the beginning.
* Elements are dropped until `predicate` returns falsey. The predicate is
* Elements are dropped until `predicate` returns falsy. The predicate is
* bound to `thisArg` and invoked with three arguments: (value, index, array).
*
* If a property name is provided for `predicate` the created `_.property`
Expand Down Expand Up @@ -5610,7 +5610,7 @@

/**
* Creates a slice of `array` with elements taken from the end. Elements are
* taken until `predicate` returns falsey. The predicate is bound to `thisArg`
* taken until `predicate` returns falsy. The predicate is bound to `thisArg`
* and invoked with three arguments: (value, index, array).
*
* If a property name is provided for `predicate` the created `_.property`
Expand Down Expand Up @@ -5665,7 +5665,7 @@

/**
* Creates a slice of `array` with elements taken from the beginning. Elements
* are taken until `predicate` returns falsey. The predicate is bound to
* are taken until `predicate` returns falsy. The predicate is bound to
* `thisArg` and invoked with three arguments: (value, index, array).
*
* If a property name is provided for `predicate` the created `_.property`
Expand Down Expand Up @@ -5740,7 +5740,7 @@
/**
* Creates a duplicate-free version of an array, using
* [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
* for equality comparisons, in which only the first occurence of each element
* for equality comparisons, in which only the first occurrence of each element
* is kept. Providing `true` for `isSorted` performs a faster search algorithm
* for sorted arrays. If an iteratee function is provided it's invoked for
* each element in the array to generate the criterion by which uniqueness
Expand Down Expand Up @@ -6894,7 +6894,7 @@
/**
* Creates an array of elements split into two groups, the first of which
* contains elements `predicate` returns truthy for, while the second of which
* contains elements `predicate` returns falsey for. The predicate is bound
* contains elements `predicate` returns falsy for. The predicate is bound
* to `thisArg` and invoked with three arguments: (value, index|key, collection).
*
* If a property name is provided for `predicate` the created `_.property`
Expand Down Expand Up @@ -11889,7 +11889,7 @@
var floor = createRound('floor');

/**
* Gets the maximum value of `collection`. If `collection` is empty or falsey
* Gets the maximum value of `collection`. If `collection` is empty or falsy
* `-Infinity` is returned. If an iteratee function is provided it's invoked
* for each value in `collection` to generate the criterion by which the value
* is ranked. The `iteratee` is bound to `thisArg` and invoked with three
Expand Down Expand Up @@ -11938,7 +11938,7 @@
var max = createExtremum(gt, NEGATIVE_INFINITY);

/**
* Gets the minimum value of `collection`. If `collection` is empty or falsey
* Gets the minimum value of `collection`. If `collection` is empty or falsy
* `Infinity` is returned. If an iteratee function is provided it's invoked
* for each value in `collection` to generate the criterion by which the value
* is ranked. The `iteratee` is bound to `thisArg` and invoked with three
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3657,7 +3657,7 @@ addFormatToken('D', ['DD', 2], 'Do', 'date');

addUnitAlias('date', 'D');

// PRIOROITY
// PRIORITY
addUnitPriority('date', 9);

// PARSING
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ var View = {
}
}

// also regiseter instance in prepatch hook
// also register instance in prepatch hook
// in case the same component instance is reused across different routes
;(data.hook || (data.hook = {})).prepatch = function (_, vnode) {
matched.instances[name] = vnode.componentInstance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
// ...etc.
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

// Make sure backend globals aren't indadvertently tolerated in our client-side JS:
// Make sure backend globals aren't inadvertently tolerated in our client-side JS:
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
"sails": false<%
if (!caviar && !_.contains(without,'lodash')) { %>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ parasails.registerComponent('ajaxForm', {
throw new Error('Invalid data returned from custom form parsing logic. (Should return a dictionary of argins, like `{}`.)');
}//•
} else if (this.formData) {
// Or use the simpler, built-in absorbtion strategy.
// Or use the simpler, built-in absorption strategy.
// > This uses the provided form data as our argins, verbatim. Then it runs
// > built-in client-side validation, if configured to do so.
argins = this.formData;
Expand Down Expand Up @@ -216,7 +216,7 @@ parasails.registerComponent('ajaxForm', {
// is "present" -- i.e. some value other than `null`, `undefined`,
// or `''` (empty string).
//
// > Trying to figure out how to handle a conditionally-requiured
// > Trying to figure out how to handle a conditionally-required
// > field that uses one of these validations? For example, a
// > "Confirm email" re-entry field for an optional email address?
// > Just make `required` validation rule dynamic, and everything
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ module.exports = {
* If, in production, this app has access to physical-layer CASCADE *
* constraints (e.g. PostgreSQL or MySQL), then set those up in the *
* database and uncomment this to disable Waterline's `cascadeOnDestroy` *
* polyfill. (Otherwise, if you are using a databse like Mongo, you might *
* polyfill. (Otherwise, if you are using a database like Mongo, you might *
* choose to keep this enabled.) *
* *
***************************************************************************/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Cloud.setup({
`\n`
});

// Also, if a `test/` folder exists, set up a barebones bounce of this data
// Also, if a `test/` folder exists, set up a bare-bones bounce of this data
// as a JSON file inside of it, for testing purposes:
var hasTestFolder = await sails.helpers.fs.exists(path.resolve(sails.config.appPath, 'test/'));
if (hasTestFolder) {
Expand Down
2 changes: 1 addition & 1 deletion lib/core-generators/new/templates/tasks/config/hash.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = function(grunt) {
hashLength: 8,
hashFunction: function(source, encoding){
if (!source || !encoding) {
throw new Error('Consistency violation: Cannot compute unique hash for production .css/.js cache-busting suffix, because `source` and/or `encoding` are falsey-- but they should be truthy strings! Here they are, respectively:\nsource: '+require('util').inspect(source, {depth:null})+'\nencoding: '+require('util').inspect(encoding, {depth:null}));
throw new Error('Consistency violation: Cannot compute unique hash for production .css/.js cache-busting suffix, because `source` and/or `encoding` are falsy-- but they should be truthy strings! Here they are, respectively:\nsource: '+require('util').inspect(source, {depth:null})+'\nencoding: '+require('util').inspect(encoding, {depth:null}));
}
return require('crypto').createHash('sha1').update(source, encoding).digest('hex');
}
Expand Down