Skip to content

Commit

Permalink
90 packs (#353)
Browse files Browse the repository at this point in the history
* src & dist directory
* Working watch on all JS, SASS, Twig, and JSON
* Adds working map files
* Restores some Grunt tasks and replaces what now has npm scripts with a grunt run npm script instead.
* Moved assets to kss-assets where they should have been in the first place
* Changed up the npm scripts so they don't call everything all the time. Added a new dev function to do that.
* Compiles the KSS theme as well.
  • Loading branch information
sherakama authored Mar 22, 2019
1 parent 75610d8 commit 9733779
Show file tree
Hide file tree
Showing 591 changed files with 7,923 additions and 1,825 deletions.
4 changes: 2 additions & 2 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ exclude_patterns:
- "node_modules"
- "styleguide"
- "kss/**/*"
- "core/dist/**/*"
- "core/scss/core/_normalize.scss"
- "dist/**/*"
- "src/scss/core/_normalize.scss"
- "Gruntfile*.js"
- "composer.json"
- "package.json"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ config.rb
cgi-bin
node_modules
styleguide
kss/builder/decanter/kss-assets/dist

# Ignore as they are customized on the user end.
.lando.yml
151 changes: 0 additions & 151 deletions Gruntfile-HIDE.js

This file was deleted.

96 changes: 96 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/**
* Gruntfile.
* @type {[type]}
*/
module.exports = function(grunt) {

/**
* [pkg description]
* @type {[type]}
*/
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
browserSync: {
dev: {
bsFiles: {
src : [
'styleguide/css/decanter.css',
'styleguide/**/*.html'
]
},
options: {
watchTask: true,
server: './styleguide'
}
}
},
clean: {
postdeploy: {
src: [
'.styleguide_site'
]
}
},
run: {
options: {
wait: 0
},
webpack: {
"cmd": "npm",
'args': ['run-script', 'build']
},
styleguide: {
"cmd": "npm",
"args": ['run-script', 'styleguide']
},
watch: {
"cmd": "npm",
"args": ['run-script', 'watch']
},
},
deploy_site: {
styleguide: {
options: {
branch: 'master',
commit_msg: 'autocommit',
deploy_url: 'http://decanter.stanford.edu'
},
base_path: 'styleguide',
remote_url: '[email protected]:SU-SWS/decanter.github.io'
}
},
deprecated_notice: {
styleguide: "This function has been deprecated in favor of `npm run-script styleguide` and will be removed in future versions. Executing now.",
compile: "This function has been deprecated in favor of `npm run-script build` and will be removed in future versions. Executing now.",
sasslint: "This function has been deprecated in favor of `npm run-script lint` and will be removed in future versions.",
sass: "This function has been deprecated in favor of `npm run-script build` and will be removed in future versions.",
watch: "This function has been deprecated in favor of `npm run-script watch` and will be removed in future versions."
}
});

// Create a Deprecated notice task.
grunt.task.registerTask('deprecated_notice', 'Logs a deprecated message.', function(arg1) {
grunt.log.write(grunt.config.data.deprecated_notice[arg1]);
});

// Load up tasks.
grunt.loadNpmTasks('grunt-run');
grunt.loadNpmTasks('grunt-browser-sync');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-deploy-site');

// Register some new ones.
grunt.registerTask('deploy', ['styleguide', 'deploy_site:styleguide', 'clean:postdeploy']);
grunt.registerTask('webpack', ['run:webpack']);
grunt.registerTask('dev', ['styleguide', 'browserSync', 'run:watch']);
grunt.registerTask('default', ['dev']);

// Deprecated tasks.
grunt.registerTask('styleguide', ['run:webpack', 'run:styleguide', 'deprecated_notice:styleguide']);
grunt.registerTask('compile', ['deprecated_notice:compile', 'run:webpack']);
grunt.registerTask('sass', ['deprecated_notice:sass']);
grunt.registerTask('sasslint', ['deprecated_notice:sasslint']);
grunt.registerTask('watch', ['deprecated_notice:watch']);

}
1 change: 0 additions & 1 deletion core/dist/css/decanter-no-markup.css

This file was deleted.

8 changes: 0 additions & 8 deletions core/dist/js/assets.json

This file was deleted.

195 changes: 0 additions & 195 deletions core/dist/js/decanter.js

This file was deleted.

71 changes: 0 additions & 71 deletions core/scss/components/card/_card.scss

This file was deleted.

10 changes: 0 additions & 10 deletions core/templates/layout/flex/three-column/battleship/battleship.json

This file was deleted.

10 changes: 0 additions & 10 deletions core/templates/layout/grid/three-column/battleship/battleship.json

This file was deleted.

Loading

0 comments on commit 9733779

Please sign in to comment.