From 7115d85c71219f221e0f88d223b3750dcacc37c1 Mon Sep 17 00:00:00 2001 From: Alexander Sadovsky Date: Mon, 30 Jul 2018 20:24:32 +0200 Subject: [PATCH] removed grunt and ejs --- .sailsrc | 4 +- Gruntfile.js | 82 -------- package.json | 13 -- tasks/README.md | 54 ----- tasks/config/clean.js | 21 -- tasks/config/coffee.js | 33 --- tasks/config/concat.js | 31 --- tasks/config/copy.js | 44 ---- tasks/config/cssmin.js | 27 --- tasks/config/jst.js | 48 ----- tasks/config/less.js | 31 --- tasks/config/sails-linker.js | 283 -------------------------- tasks/config/sync.js | 31 --- tasks/config/uglify.js | 22 -- tasks/config/watch.js | 31 --- tasks/pipeline.js | 87 -------- tasks/register/build.js | 27 --- tasks/register/buildProd.js | 29 --- tasks/register/compileAssets.js | 22 -- tasks/register/default.js | 26 --- tasks/register/linkAssets.js | 23 --- tasks/register/linkAssetsBuild.js | 22 -- tasks/register/linkAssetsBuildProd.js | 22 -- tasks/register/prod.js | 27 --- tasks/register/syncAssets.js | 20 -- yarn.lock | 4 +- 26 files changed, 4 insertions(+), 1060 deletions(-) delete mode 100644 Gruntfile.js delete mode 100644 tasks/README.md delete mode 100644 tasks/config/clean.js delete mode 100644 tasks/config/coffee.js delete mode 100644 tasks/config/concat.js delete mode 100644 tasks/config/copy.js delete mode 100644 tasks/config/cssmin.js delete mode 100644 tasks/config/jst.js delete mode 100644 tasks/config/less.js delete mode 100644 tasks/config/sails-linker.js delete mode 100644 tasks/config/sync.js delete mode 100644 tasks/config/uglify.js delete mode 100644 tasks/config/watch.js delete mode 100644 tasks/pipeline.js delete mode 100644 tasks/register/build.js delete mode 100644 tasks/register/buildProd.js delete mode 100644 tasks/register/compileAssets.js delete mode 100644 tasks/register/default.js delete mode 100644 tasks/register/linkAssets.js delete mode 100644 tasks/register/linkAssetsBuild.js delete mode 100644 tasks/register/linkAssetsBuildProd.js delete mode 100644 tasks/register/prod.js delete mode 100644 tasks/register/syncAssets.js diff --git a/.sailsrc b/.sailsrc index fa89f5e..a74807e 100644 --- a/.sailsrc +++ b/.sailsrc @@ -1,5 +1,5 @@ { - "generators": { - "modules": {} + "hooks": { + "grunt": false } } \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index 212c569..0000000 --- a/Gruntfile.js +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Gruntfile - * - * This Node script is executed when you run `grunt` or `sails lift`. - * It's purpose is to load the Grunt tasks in your project's `tasks` - * folder, and allow you to add and remove tasks as you see fit. - * For more information on how this works, check out the `README.md` - * file that was generated in your `tasks` folder. - * - * WARNING: - * Unless you know what you're doing, you shouldn't change this file. - * Check out the `tasks` directory instead. - */ - -module.exports = function(grunt) { - - - // Load the include-all library in order to require all of our grunt - // configurations and task registrations dynamically. - var includeAll; - try { - includeAll = require('include-all'); - } catch (e0) { - try { - includeAll = require('sails/node_modules/include-all'); - } catch (e1) { - console.error('Could not find `include-all` module.'); - console.error('Skipping grunt tasks...'); - console.error('To fix this, please run:'); - console.error('npm install include-all --save`'); - console.error(); - - grunt.registerTask('default', []); - return; - } - } - - - /** - * Loads Grunt configuration modules from the specified - * relative path. These modules should export a function - * that, when run, should either load/configure or register - * a Grunt task. - */ - function loadTasks(relPath) { - return includeAll({ - dirname: require('path').resolve(__dirname, relPath), - filter: /(.+)\.js$/, - excludeDirs: /^\.(git|svn)$/ - }) || {}; - } - - /** - * Invokes the function from a Grunt configuration module with - * a single argument - the `grunt` object. - */ - function invokeConfigFn(tasks) { - for (var taskName in tasks) { - if (tasks.hasOwnProperty(taskName)) { - tasks[taskName](grunt); - } - } - } - - - - // Load task functions - var taskConfigurations = loadTasks('./tasks/config'), - registerDefinitions = loadTasks('./tasks/register'); - - // (ensure that a default task exists) - if (!registerDefinitions.default) { - registerDefinitions.default = function(grunt) { - grunt.registerTask('default', []); - }; - } - - // Run task functions to configure Grunt. - invokeConfigFn(taskConfigurations); - invokeConfigFn(registerDefinitions); - -}; diff --git a/package.json b/package.json index 5cc3125..ba1bedf 100644 --- a/package.json +++ b/package.json @@ -7,19 +7,6 @@ "dependencies": { "@types/express": "^4.11.1", "@types/node": "^9.4.6", - "ejs": "2.3.4", - "grunt": "1.0.1", - "grunt-contrib-clean": "1.0.0", - "grunt-contrib-coffee": "1.0.0", - "grunt-contrib-concat": "1.0.1", - "grunt-contrib-copy": "1.0.0", - "grunt-contrib-cssmin": "1.0.1", - "grunt-contrib-jst": "1.0.0", - "grunt-contrib-less": "1.3.0", - "grunt-contrib-uglify": "1.0.1", - "grunt-contrib-watch": "1.0.0", - "grunt-sails-linker": "~0.10.1", - "grunt-sync": "0.5.2", "include-all": "^1.0.0", "rc": "1.0.1", "sails": "~0.12.14", diff --git a/tasks/README.md b/tasks/README.md deleted file mode 100644 index 78d2f51..0000000 --- a/tasks/README.md +++ /dev/null @@ -1,54 +0,0 @@ -# About the `tasks` folder - -The `tasks` directory is a suite of Grunt tasks and their configurations, bundled for your convenience. The Grunt integration is mainly useful for bundling front-end assets, (like stylesheets, scripts, & markup templates) but it can also be used to run all kinds of development tasks, from browserify compilation to database migrations. - -If you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, read on! - - -### How does this work? - -The asset pipeline bundled in Sails is a set of Grunt tasks configured with conventional defaults designed to make your project more consistent and productive. - -The entire front-end asset workflow in Sails is completely customizable-- while it provides some suggestions out of the box, Sails makes no pretense that it can anticipate all of the needs you'll encounter building the browser-based/front-end portion of your application. Who's to say you're even building an app for a browser? - - - -### What tasks does Sails run automatically? - -Sails runs some of these tasks (the ones in the `tasks/register` folder) automatically when you run certain commands. - -###### `sails lift` - -Runs the `default` task (`tasks/register/default.js`). - -###### `sails lift --prod` - -Runs the `prod` task (`tasks/register/prod.js`). - -###### `sails www` - -Runs the `build` task (`tasks/register/build.js`). - -###### `sails www --prod` (production) - -Runs the `buildProd` task (`tasks/register/buildProd.js`). - - -### Can I customize this for SASS, Angular, client-side Jade templates, etc? - -You can modify, omit, or replace any of these Grunt tasks to fit your requirements. You can also add your own Grunt tasks- just add a `someTask.js` file in the `grunt/config` directory to configure the new task, then register it with the appropriate parent task(s) (see files in `grunt/register/*.js`). - - -### Do I have to use Grunt? - -Nope! To disable Grunt integration in Sails, just delete your Gruntfile or disable the Grunt hook. - - -### What if I'm not building a web frontend? - -That's ok! A core tenant of Sails is client-agnosticism-- it's especially designed for building APIs used by all sorts of clients; native Android/iOS/Cordova, serverside SDKs, etc. - -You can completely disable Grunt by following the instructions above. - -If you still want to use Grunt for other purposes, but don't want any of the default web front-end stuff, just delete your project's `assets` folder and remove the front-end oriented tasks from the `grunt/register` and `grunt/config` folders. You can also run `sails new myCoolApi --no-frontend` to omit the `assets` folder and front-end-oriented Grunt tasks for future projects. You can also replace your `sails-generate-frontend` module with alternative community generators, or create your own. This allows `sails new` to create the boilerplate for native iOS apps, Android apps, Cordova apps, SteroidsJS apps, etc. - diff --git a/tasks/config/clean.js b/tasks/config/clean.js deleted file mode 100644 index ff2efc6..0000000 --- a/tasks/config/clean.js +++ /dev/null @@ -1,21 +0,0 @@ -/** - * `clean` - * - * --------------------------------------------------------------- - * - * Remove the files and folders in your Sails app's web root - * (conventionally a hidden directory called `.tmp/public`). - * - * For usage docs see: - * https://github.com/gruntjs/grunt-contrib-clean - * - */ -module.exports = function(grunt) { - - grunt.config.set('clean', { - dev: ['.tmp/public/**'], - build: ['www'] - }); - - grunt.loadNpmTasks('grunt-contrib-clean'); -}; diff --git a/tasks/config/coffee.js b/tasks/config/coffee.js deleted file mode 100644 index 0d69dfa..0000000 --- a/tasks/config/coffee.js +++ /dev/null @@ -1,33 +0,0 @@ -/** - * `coffee` - * - * --------------------------------------------------------------- - * - * Compile CoffeeScript files located in `assets/js` into Javascript - * and generate new `.js` files in `.tmp/public/js`. - * - * For usage docs see: - * https://github.com/gruntjs/grunt-contrib-coffee - * - */ -module.exports = function(grunt) { - - grunt.config.set('coffee', { - dev: { - options: { - bare: true, - sourceMap: true, - sourceRoot: './' - }, - files: [{ - expand: true, - cwd: 'assets/js/', - src: ['**/*.coffee'], - dest: '.tmp/public/js/', - ext: '.js' - }] - } - }); - - grunt.loadNpmTasks('grunt-contrib-coffee'); -}; diff --git a/tasks/config/concat.js b/tasks/config/concat.js deleted file mode 100644 index 5fdc67b..0000000 --- a/tasks/config/concat.js +++ /dev/null @@ -1,31 +0,0 @@ -/** - * `concat` - * - * --------------------------------------------------------------- - * - * Concatenates the contents of multiple JavaScript and/or CSS files - * into two new files, each located at `concat/production.js` and - * `concat/production.css` respectively in `.tmp/public/concat`. - * - * This is used as an intermediate step to generate monolithic files - * that can then be passed in to `uglify` and/or `cssmin` for minification. - * - * For usage docs see: - * https://github.com/gruntjs/grunt-contrib-concat - * - */ -module.exports = function(grunt) { - - grunt.config.set('concat', { - js: { - src: require('../pipeline').jsFilesToInject, - dest: '.tmp/public/concat/production.js' - }, - css: { - src: require('../pipeline').cssFilesToInject, - dest: '.tmp/public/concat/production.css' - } - }); - - grunt.loadNpmTasks('grunt-contrib-concat'); -}; diff --git a/tasks/config/copy.js b/tasks/config/copy.js deleted file mode 100644 index 7406346..0000000 --- a/tasks/config/copy.js +++ /dev/null @@ -1,44 +0,0 @@ -/** - * `copy` - * - * --------------------------------------------------------------- - * - * Copy files and/or folders from your `assets/` directory into - * the web root (`.tmp/public`) so they can be served via HTTP, - * and also for further pre-processing by other Grunt tasks. - * - * #### Normal usage (`sails lift`) - * Copies all directories and files (except CoffeeScript and LESS) - * from the `assets/` folder into the web root -- conventionally a - * hidden directory located `.tmp/public`. - * - * #### Via the `build` tasklist (`sails www`) - * Copies all directories and files from the .tmp/public directory into a www directory. - * - * For usage docs see: - * https://github.com/gruntjs/grunt-contrib-copy - * - */ -module.exports = function(grunt) { - - grunt.config.set('copy', { - dev: { - files: [{ - expand: true, - cwd: './assets', - src: ['**/*.!(coffee|less)'], - dest: '.tmp/public' - }] - }, - build: { - files: [{ - expand: true, - cwd: '.tmp/public', - src: ['**/*'], - dest: 'www' - }] - } - }); - - grunt.loadNpmTasks('grunt-contrib-copy'); -}; diff --git a/tasks/config/cssmin.js b/tasks/config/cssmin.js deleted file mode 100644 index ed476f4..0000000 --- a/tasks/config/cssmin.js +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Compress CSS files. - * - * --------------------------------------------------------------- - * - * Minify the intermediate concatenated CSS stylesheet which was - * prepared by the `concat` task at `.tmp/public/concat/production.css`. - * - * Together with the `concat` task, this is the final step that minifies - * all CSS files from `assets/styles/` (and potentially your LESS importer - * file from `assets/styles/importer.less`) - * - * For usage docs see: - * https://github.com/gruntjs/grunt-contrib-cssmin - * - */ -module.exports = function(grunt) { - - grunt.config.set('cssmin', { - dist: { - src: ['.tmp/public/concat/production.css'], - dest: '.tmp/public/min/production.min.css' - } - }); - - grunt.loadNpmTasks('grunt-contrib-cssmin'); -}; diff --git a/tasks/config/jst.js b/tasks/config/jst.js deleted file mode 100644 index 518f277..0000000 --- a/tasks/config/jst.js +++ /dev/null @@ -1,48 +0,0 @@ -/** - * `jst` - * - * --------------------------------------------------------------- - * - * Precompile HTML templates using Underscore/Lodash notation into - * functions, creating a `.jst` file. This can be brought into your HTML - * via a ', - appRoot: '.tmp/public' - }, - files: { - '.tmp/public/**/*.html': require('../pipeline').jsFilesToInject, - 'views/**/*.html': require('../pipeline').jsFilesToInject, - 'views/**/*.ejs': require('../pipeline').jsFilesToInject - } - }, - - devJsRelative: { - options: { - startTag: '', - endTag: '', - fileTmpl: '', - appRoot: '.tmp/public', - relative: true - }, - files: { - '.tmp/public/**/*.html': require('../pipeline').jsFilesToInject, - 'views/**/*.html': require('../pipeline').jsFilesToInject, - 'views/**/*.ejs': require('../pipeline').jsFilesToInject - } - }, - - prodJs: { - options: { - startTag: '', - endTag: '', - fileTmpl: '', - appRoot: '.tmp/public' - }, - files: { - '.tmp/public/**/*.html': ['.tmp/public/min/production.min.js'], - 'views/**/*.html': ['.tmp/public/min/production.min.js'], - 'views/**/*.ejs': ['.tmp/public/min/production.min.js'] - } - }, - - prodJsRelative: { - options: { - startTag: '', - endTag: '', - fileTmpl: '', - appRoot: '.tmp/public', - relative: true - }, - files: { - '.tmp/public/**/*.html': ['.tmp/public/min/production.min.js'], - 'views/**/*.html': ['.tmp/public/min/production.min.js'], - 'views/**/*.ejs': ['.tmp/public/min/production.min.js'] - } - }, - - devStyles: { - options: { - startTag: '', - endTag: '', - fileTmpl: '', - appRoot: '.tmp/public' - }, - - files: { - '.tmp/public/**/*.html': require('../pipeline').cssFilesToInject, - 'views/**/*.html': require('../pipeline').cssFilesToInject, - 'views/**/*.ejs': require('../pipeline').cssFilesToInject - } - }, - - devStylesRelative: { - options: { - startTag: '', - endTag: '', - fileTmpl: '', - appRoot: '.tmp/public', - relative: true - }, - - files: { - '.tmp/public/**/*.html': require('../pipeline').cssFilesToInject, - 'views/**/*.html': require('../pipeline').cssFilesToInject, - 'views/**/*.ejs': require('../pipeline').cssFilesToInject - } - }, - - prodStyles: { - options: { - startTag: '', - endTag: '', - fileTmpl: '', - appRoot: '.tmp/public' - }, - files: { - '.tmp/public/index.html': ['.tmp/public/min/production.min.css'], - 'views/**/*.html': ['.tmp/public/min/production.min.css'], - 'views/**/*.ejs': ['.tmp/public/min/production.min.css'] - } - }, - - prodStylesRelative: { - options: { - startTag: '', - endTag: '', - fileTmpl: '', - appRoot: '.tmp/public', - relative: true - }, - files: { - '.tmp/public/index.html': ['.tmp/public/min/production.min.css'], - 'views/**/*.html': ['.tmp/public/min/production.min.css'], - 'views/**/*.ejs': ['.tmp/public/min/production.min.css'] - } - }, - - // Bring in JST template object - devTpl: { - options: { - startTag: '', - endTag: '', - fileTmpl: '', - appRoot: '.tmp/public' - }, - files: { - '.tmp/public/index.html': ['.tmp/public/jst.js'], - 'views/**/*.html': ['.tmp/public/jst.js'], - 'views/**/*.ejs': ['.tmp/public/jst.js'] - } - }, - - devJsJade: { - options: { - startTag: '// SCRIPTS', - endTag: '// SCRIPTS END', - fileTmpl: 'script(src="%s")', - appRoot: '.tmp/public' - }, - files: { - 'views/**/*.jade': require('../pipeline').jsFilesToInject - } - }, - - devJsRelativeJade: { - options: { - startTag: '// SCRIPTS', - endTag: '// SCRIPTS END', - fileTmpl: 'script(src="%s")', - appRoot: '.tmp/public', - relative: true - }, - files: { - 'views/**/*.jade': require('../pipeline').jsFilesToInject - } - }, - - prodJsJade: { - options: { - startTag: '// SCRIPTS', - endTag: '// SCRIPTS END', - fileTmpl: 'script(src="%s")', - appRoot: '.tmp/public' - }, - files: { - 'views/**/*.jade': ['.tmp/public/min/production.min.js'] - } - }, - - prodJsRelativeJade: { - options: { - startTag: '// SCRIPTS', - endTag: '// SCRIPTS END', - fileTmpl: 'script(src="%s")', - appRoot: '.tmp/public', - relative: true - }, - files: { - 'views/**/*.jade': ['.tmp/public/min/production.min.js'] - } - }, - - devStylesJade: { - options: { - startTag: '// STYLES', - endTag: '// STYLES END', - fileTmpl: 'link(rel="stylesheet", href="%s")', - appRoot: '.tmp/public' - }, - - files: { - 'views/**/*.jade': require('../pipeline').cssFilesToInject - } - }, - - devStylesRelativeJade: { - options: { - startTag: '// STYLES', - endTag: '// STYLES END', - fileTmpl: 'link(rel="stylesheet", href="%s")', - appRoot: '.tmp/public', - relative: true - }, - - files: { - 'views/**/*.jade': require('../pipeline').cssFilesToInject - } - }, - - prodStylesJade: { - options: { - startTag: '// STYLES', - endTag: '// STYLES END', - fileTmpl: 'link(rel="stylesheet", href="%s")', - appRoot: '.tmp/public' - }, - files: { - 'views/**/*.jade': ['.tmp/public/min/production.min.css'] - } - }, - - prodStylesRelativeJade: { - options: { - startTag: '// STYLES', - endTag: '// STYLES END', - fileTmpl: 'link(rel="stylesheet", href="%s")', - appRoot: '.tmp/public', - relative: true - }, - files: { - 'views/**/*.jade': ['.tmp/public/min/production.min.css'] - } - }, - - // Bring in JST template object - devTplJade: { - options: { - startTag: '// TEMPLATES', - endTag: '// TEMPLATES END', - fileTmpl: 'script(type="text/javascript", src="%s")', - appRoot: '.tmp/public' - }, - files: { - 'views/**/*.jade': ['.tmp/public/jst.js'] - } - } - }); - - grunt.loadNpmTasks('grunt-sails-linker'); -}; diff --git a/tasks/config/sync.js b/tasks/config/sync.js deleted file mode 100644 index e2cc89f..0000000 --- a/tasks/config/sync.js +++ /dev/null @@ -1,31 +0,0 @@ -/** - * `sync` - * - * --------------------------------------------------------------- - * - * Synchronize files from the `assets` folder to `.tmp/public`, - * smashing anything that's already there. - * - * This task synchronizes one directory with another (like rsync). - * In the default Sails asset pipeline, it plays very similar role - * to `grunt-contrib-copy`, but copies only those files that have - * actually changed since the last time the task was run. - * - * For usage docs see: - * https://github.com/tomusdrw/grunt-sync - * - */ -module.exports = function(grunt) { - - grunt.config.set('sync', { - dev: { - files: [{ - cwd: './assets', - src: ['**/*.!(coffee|less)'], - dest: '.tmp/public' - }] - } - }); - - grunt.loadNpmTasks('grunt-sync'); -}; diff --git a/tasks/config/uglify.js b/tasks/config/uglify.js deleted file mode 100644 index e522ae0..0000000 --- a/tasks/config/uglify.js +++ /dev/null @@ -1,22 +0,0 @@ -/** - * `uglify` - * - * --------------------------------------------------------------- - * - * Minify client-side JavaScript files using UglifyJS. - * - * For usage docs see: - * https://github.com/gruntjs/grunt-contrib-uglify - * - */ -module.exports = function(grunt) { - - grunt.config.set('uglify', { - dist: { - src: ['.tmp/public/concat/production.js'], - dest: '.tmp/public/min/production.min.js' - } - }); - - grunt.loadNpmTasks('grunt-contrib-uglify'); -}; diff --git a/tasks/config/watch.js b/tasks/config/watch.js deleted file mode 100644 index 460a353..0000000 --- a/tasks/config/watch.js +++ /dev/null @@ -1,31 +0,0 @@ -/** - * `watch` - * - * --------------------------------------------------------------- - * - * Run predefined tasks whenever watched file patterns are added, changed or deleted. - * - * Watch for changes on: - * - files in the `assets` folder - * - the `tasks/pipeline.js` file - * and re-run the appropriate tasks. - * - * For usage docs see: - * https://github.com/gruntjs/grunt-contrib-watch - * - */ -module.exports = function(grunt) { - - grunt.config.set('watch', { - assets: { - - // Assets to watch: - files: ['assets/**/*', 'tasks/pipeline.js', '!**/node_modules/**'], - - // When assets are changed: - tasks: ['syncAssets' , 'linkAssets' ] - } - }); - - grunt.loadNpmTasks('grunt-contrib-watch'); -}; diff --git a/tasks/pipeline.js b/tasks/pipeline.js deleted file mode 100644 index 44b8d5e..0000000 --- a/tasks/pipeline.js +++ /dev/null @@ -1,87 +0,0 @@ -/** - * grunt/pipeline.js - * - * The order in which your css, javascript, and template files should be - * compiled and linked from your views and static HTML files. - * - * (Note that you can take advantage of Grunt-style wildcard/glob/splat expressions - * for matching multiple files, and ! in front of an expression to ignore files.) - * - * For more information see: - * https://github.com/balderdashy/sails-docs/blob/master/anatomy/myApp/tasks/pipeline.js.md - */ - - -// CSS files to inject in order -// -// (if you're using LESS with the built-in default config, you'll want -// to change `assets/styles/importer.less` instead.) -var cssFilesToInject = [ - 'styles/**/*.css' -]; - - -// Client-side javascript files to inject in order -// (uses Grunt-style wildcard/glob/splat expressions) -var jsFilesToInject = [ - - // Load sails.io before everything else - 'js/dependencies/sails.io.js', - - // Dependencies like jQuery, or Angular are brought in here - 'js/dependencies/**/*.js', - - // All of the rest of your client-side js files - // will be injected here in no particular order. - 'js/**/*.js' -]; - - -// Client-side HTML templates are injected using the sources below -// The ordering of these templates shouldn't matter. -// (uses Grunt-style wildcard/glob/splat expressions) -// -// By default, Sails uses JST templates and precompiles them into -// functions for you. If you want to use jade, handlebars, dust, etc., -// with the linker, no problem-- you'll just want to make sure the precompiled -// templates get spit out to the same file. Be sure and check out `tasks/README.md` -// for information on customizing and installing new tasks. -var templateFilesToInject = [ - 'templates/**/*.html' -]; - - - - - - - -// Default path for public folder (see documentation for more information) -var tmpPath = '.tmp/public/'; - -// Prefix relative paths to source files so they point to the proper locations -// (i.e. where the other Grunt tasks spit them out, or in some cases, where -// they reside in the first place) -module.exports.cssFilesToInject = cssFilesToInject.map(function(cssPath) { - // If we're ignoring the file, make sure the ! is at the beginning of the path - if (cssPath[0] === '!') { - return require('path').join('!.tmp/public/', cssPath.substr(1)); - } - return require('path').join('.tmp/public/', cssPath); -}); -module.exports.jsFilesToInject = jsFilesToInject.map(function(jsPath) { - // If we're ignoring the file, make sure the ! is at the beginning of the path - if (jsPath[0] === '!') { - return require('path').join('!.tmp/public/', jsPath.substr(1)); - } - return require('path').join('.tmp/public/', jsPath); -}); -module.exports.templateFilesToInject = templateFilesToInject.map(function(tplPath) { - // If we're ignoring the file, make sure the ! is at the beginning of the path - if (tplPath[0] === '!') { - return require('path').join('!assets/', tplPath.substr(1)); - } - return require('path').join('assets/',tplPath); -}); - - diff --git a/tasks/register/build.js b/tasks/register/build.js deleted file mode 100644 index 704457a..0000000 --- a/tasks/register/build.js +++ /dev/null @@ -1,27 +0,0 @@ -/** - * `build` - * - * --------------------------------------------------------------- - * - * This Grunt tasklist will be executed if you run `sails www` or - * `grunt build` in a development environment. It generates a - * folder containing your compiled assets, e.g. for troubleshooting - * issues with other Grunt plugins, bundling assets for an Electron - * or PhoneGap app, or deploying your app's flat files to a CDN. - * - * Note that when running `sails www` in a production environment (with the - * `NODE_ENV` environment variable set to 'production') the `buildProd` task - * will be run instead of this one. - * - * For more information see: - * http://sailsjs.org/documentation/anatomy/my-app/tasks/register/build-js - * - */ -module.exports = function(grunt) { - grunt.registerTask('build', [ - 'compileAssets', - 'linkAssetsBuild', - 'clean:build', - 'copy:build' - ]); -}; diff --git a/tasks/register/buildProd.js b/tasks/register/buildProd.js deleted file mode 100644 index 786f8b2..0000000 --- a/tasks/register/buildProd.js +++ /dev/null @@ -1,29 +0,0 @@ -/** - * `buildProd` - * - * --------------------------------------------------------------- - * - * This Grunt tasklist will be executed instead of `build` if you - * run `sails www` in a production environment, e.g.: - * `NODE_ENV=production sails www` - * - * This generates a folder containing your compiled (and usually minified) - * assets. The most common use case for this is bundling up files to - * deploy to a CDN. - * - * For more information see: - * http://sailsjs.org/documentation/anatomy/my-app/tasks/register/build-prod-js - * - */ -module.exports = function(grunt) { - grunt.registerTask('buildProd', [ - 'compileAssets', - 'concat', - 'uglify', - 'cssmin', - 'linkAssetsBuildProd', - 'clean:build', - 'copy:build' - ]); -}; - diff --git a/tasks/register/compileAssets.js b/tasks/register/compileAssets.js deleted file mode 100644 index 1bd48e8..0000000 --- a/tasks/register/compileAssets.js +++ /dev/null @@ -1,22 +0,0 @@ -/** - * `compileAssets` - * - * --------------------------------------------------------------- - * - * This Grunt tasklist is not designed to be used directly-- rather - * it is a helper called by the `default`, `prod`, `build`, and - * `buildProd` tasklists. - * - * For more information see: - * http://sailsjs.org/documentation/anatomy/my-app/tasks/register/compile-assets-js - * - */ -module.exports = function(grunt) { - grunt.registerTask('compileAssets', [ - 'clean:dev', - 'jst:dev', - 'less:dev', - 'copy:dev', - 'coffee:dev' - ]); -}; diff --git a/tasks/register/default.js b/tasks/register/default.js deleted file mode 100644 index a981c52..0000000 --- a/tasks/register/default.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * `default` - * - * --------------------------------------------------------------- - * - * This is the default Grunt tasklist that will be executed if you - * run `grunt` in the top level directory of your app. It is also - * called automatically when you start Sails in development mode using - * `sails lift` or `node app`. - * - * Note that when lifting your app with a custom environment setting - * (i.e. `sails.config.environment`), Sails will look for a tasklist file - * with the same name and run that instead of this one. - * - * > Note that as a special case for compatibility/historial reasons, if - * > your environment is "production", and Sails cannot find a tasklist named - * > `production.js`, it will attempt to run the `prod.js` tasklist as well - * > before defaulting to `default.js`. - * - * For more information see: - * http://sailsjs.org/documentation/anatomy/my-app/tasks/register/default-js - * - */ -module.exports = function (grunt) { - grunt.registerTask('default', ['compileAssets', 'linkAssets', 'watch']); -}; diff --git a/tasks/register/linkAssets.js b/tasks/register/linkAssets.js deleted file mode 100644 index 4129455..0000000 --- a/tasks/register/linkAssets.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * `linkAssets` - * - * --------------------------------------------------------------- - * - * This Grunt tasklist is not designed to be used directly-- rather - * it is a helper called by the `default` tasklist and the `watch` task - * (but only if the `grunt-sails-linker` package is in use). - * - * For more information see: - * http://sailsjs.org/documentation/anatomy/my-app/tasks/register/link-assets-js - * - */ -module.exports = function(grunt) { - grunt.registerTask('linkAssets', [ - 'sails-linker:devJs', - 'sails-linker:devStyles', - 'sails-linker:devTpl', - 'sails-linker:devJsJade', - 'sails-linker:devStylesJade', - 'sails-linker:devTplJade' - ]); -}; diff --git a/tasks/register/linkAssetsBuild.js b/tasks/register/linkAssetsBuild.js deleted file mode 100644 index d2527bd..0000000 --- a/tasks/register/linkAssetsBuild.js +++ /dev/null @@ -1,22 +0,0 @@ -/** - * `linkAssetsBuild` - * - * --------------------------------------------------------------- - * - * This Grunt tasklist is not designed to be used directly-- rather - * it is a helper called by the `build` tasklist. - * - * For more information see: - * http://sailsjs.org/documentation/anatomy/my-app/tasks/register/link-assets-build-js - * - */ -module.exports = function(grunt) { - grunt.registerTask('linkAssetsBuild', [ - 'sails-linker:devJsRelative', - 'sails-linker:devStylesRelative', - 'sails-linker:devTpl', - 'sails-linker:devJsRelativeJade', - 'sails-linker:devStylesRelativeJade', - 'sails-linker:devTplJade' - ]); -}; diff --git a/tasks/register/linkAssetsBuildProd.js b/tasks/register/linkAssetsBuildProd.js deleted file mode 100644 index c1f4818..0000000 --- a/tasks/register/linkAssetsBuildProd.js +++ /dev/null @@ -1,22 +0,0 @@ -/** - * `linkAssetsBuildProd` - * - * --------------------------------------------------------------- - * - * This Grunt tasklist is not designed to be used directly-- rather - * it is a helper called by the `buildProd` tasklist. - * - * For more information see: - * http://sailsjs.org/documentation/anatomy/my-app/tasks/register/link-assets-build-prod-js - * - */ -module.exports = function(grunt) { - grunt.registerTask('linkAssetsBuildProd', [ - 'sails-linker:prodJsRelative', - 'sails-linker:prodStylesRelative', - 'sails-linker:devTpl', - 'sails-linker:prodJsRelativeJade', - 'sails-linker:prodStylesRelativeJade', - 'sails-linker:devTplJade' - ]); -}; diff --git a/tasks/register/prod.js b/tasks/register/prod.js deleted file mode 100644 index 379389d..0000000 --- a/tasks/register/prod.js +++ /dev/null @@ -1,27 +0,0 @@ -/** - * `prod` - * - * --------------------------------------------------------------- - * - * This Grunt tasklist will be executed instead of `default` when - * your Sails app is lifted in a production environment (e.g. using - * `NODE_ENV=production node app`). - * - * For more information see: - * http://sailsjs.org/documentation/anatomy/my-app/tasks/register/prod-js - * - */ -module.exports = function(grunt) { - grunt.registerTask('prod', [ - 'compileAssets', - 'concat', - 'uglify', - 'cssmin', - 'sails-linker:prodJs', - 'sails-linker:prodStyles', - 'sails-linker:devTpl', - 'sails-linker:prodJsJade', - 'sails-linker:prodStylesJade', - 'sails-linker:devTplJade' - ]); -}; diff --git a/tasks/register/syncAssets.js b/tasks/register/syncAssets.js deleted file mode 100644 index 72b7723..0000000 --- a/tasks/register/syncAssets.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * `syncAssets` - * - * --------------------------------------------------------------- - * - * This Grunt tasklist is not designed to be used directly-- rather - * it is a helper called by the `watch` task (`tasks/config/watch.js`). - * - * For more information see: - * http://sailsjs.org/documentation/anatomy/my-app/tasks/register/sync-assets-js - * - */ -module.exports = function(grunt) { - grunt.registerTask('syncAssets', [ - 'jst:dev', - 'less:dev', - 'sync:dev', - 'coffee:dev' - ]); -}; diff --git a/yarn.lock b/yarn.lock index 0ea237d..da964e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2506,9 +2506,9 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -"lodash-new@git://github.com/lodash/lodash.git#4.17.10": +"lodash-new@git://github.com/lodash/lodash#4.17.10": version "4.17.10" - resolved "git://github.com/lodash/lodash.git#67389a8c78975d97505fa15aa79bec6397749807" + resolved "git://github.com/lodash/lodash#67389a8c78975d97505fa15aa79bec6397749807" lodash._basecopy@^3.0.0: version "3.0.1"