Compare commits

..

No commits in common. "139568415e9ef9b06f5f1c4ad4f47d1e638e3bb3" and "07fbd43cbeea131804eef37e4efa2afc5a149a45" have entirely different histories.

4 changed files with 204 additions and 502 deletions

View File

@ -6,6 +6,7 @@ pipeline:
build: build:
image: node:16 image: node:16
commands: commands:
- apt update && apt install -y ruby ruby-dev && gem install sass
- npm install - npm install
- npm run grunt - npm run grunt

View File

@ -4,7 +4,7 @@ module.exports = function(grunt) {
// Project configuration. // Project configuration.
grunt.initConfig({ grunt.initConfig({
'dart-sass': { sass: {
dist: { dist: {
options: { options: {
style: 'compressed' style: 'compressed'
@ -69,7 +69,7 @@ module.exports = function(grunt) {
}, },
css: { css: {
files: ['assets/sass/*.sass'], files: ['assets/sass/*.sass'],
tasks: ['dart-sass'], tasks: ['sass'],
options: { options: {
atBegin: true, atBegin: true,
spawn: false spawn: false
@ -96,12 +96,12 @@ module.exports = function(grunt) {
// Load task plugins // Load task plugins
grunt.loadNpmTasks('grunt-twig-render'); grunt.loadNpmTasks('grunt-twig-render');
grunt.loadNpmTasks('grunt-dart-sass'); grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-coffee'); grunt.loadNpmTasks('grunt-contrib-coffee');
grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
// Default task(s). // Default task(s).
grunt.registerTask('default', ['twigRender', 'dart-sass', 'coffee', 'copy']); grunt.registerTask('default', ['twigRender', 'sass', 'coffee', 'copy']);
}; };

695
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -25,8 +25,8 @@
"grunt": "^1.5.3", "grunt": "^1.5.3",
"grunt-contrib-coffee": "^2.1.0", "grunt-contrib-coffee": "^2.1.0",
"grunt-contrib-copy": "^1.0.0", "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-sass": "^2.0.0",
"grunt-contrib-watch": "^1.1.0", "grunt-contrib-watch": "^1.1.0",
"grunt-dart-sass": "^2.0.1",
"grunt-twig-render": "^1.8.3" "grunt-twig-render": "^1.8.3"
}, },
"dependencies": { "dependencies": {