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
8 changes: 1 addition & 7 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- name: Generate pot files
run: bin/update-pot.sh

- name: Commit changes
uses: elstudio/actions-js-build/commit@v4
with:
Expand Down Expand Up @@ -65,13 +65,7 @@ jobs:
- name: Validate composer.json and composer.lock
run: composer validate


- name: Compile with Grunt
uses: elstudio/actions-js-build/build@v4
with:
args: build

- name: Commit changes
uses: elstudio/actions-js-build/commit@v4
with:
commitMessage: Ran grunt
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
**/.DS_Store
.sass-cache
.DS_Store
.nova
Expand Down Expand Up @@ -30,3 +31,14 @@ tests/cypress/screenshots
docs/.vitepress/dist
/vendor-prefixed
/bin/strauss.phar

# Pre-Built dist only sources
assets/admin/js/admin.js
assets/admin/js/admin.min.js
assets/admin/css/admin.css
assets/global/js/vendor.js
assets/global/js/vendor.js.map
assets/global/js/vendor.min.js
assets/public/js/public.js
assets/public/js/public.min.js
assets/public/css/**
67 changes: 63 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ module.exports = function (grunt) {
dest: 'assets/public/css',
}],
},
global: {
files: [{
expand: true,
src: ['*.scss'],
ext: '.css',
cwd: 'assets/global/sass',
dest: 'assets/global/css'
}]
},
adminDev: {
options: {
outputStyle: 'expanded',
Expand All @@ -57,6 +66,19 @@ module.exports = function (grunt) {
dest: 'assets/public/css',
}],
},
globalDev: {
options: {
outputStyle: 'expanded',
sourceMap: true,
},
files: [{
expand: true,
src: ['*.scss'],
ext: '.css',
cwd: 'assets/global/sass',
dest: 'assets/global/css'
}]
}
},
// concat and minify our JS
uglify: {
Expand Down Expand Up @@ -84,6 +106,15 @@ module.exports = function (grunt) {
compress: true
},
files: {
'assets/public/js/public.js': [
/* add path to js dependencies (ie in node_modules) here */
'assets/public/js/src/**/*.js',
],
'assets/admin/js/admin.js': [
/* add path to js dependencies (ie in node_modules) here */
'assets/admin/js/src/*.js',
'node_modules/feiertagejs/build/feiertage.umd.cjs'
],
'assets/public/js/public.min.js': [
'assets/public/js/public.js'
],
Expand Down Expand Up @@ -146,10 +177,33 @@ module.exports = function (grunt) {
expand: true,
cwd: 'node_modules/commons-api/',
src: '**schema.json',
}
},
{
dest: nodePackagesDestDir + 'select2/',
expand: true,
cwd: 'node_modules/select2/dist/',
src: ['**/select2.min.js', '**/select2.min.css']
},
{
dest: nodePackagesDestDir + 'moment/',
expand: true,
cwd: 'node_modules/moment/min/',
src: ['moment.min.js']
},
],
},
},
clean: {
dist: [
'assets/packaged/*',
'assets/admin/css/*',
'assets/public/css/*',
'assets/public/js/public.*',
'assets/global/js/vendor.*',
'assets/admin/js/admin.*'
]

},
babel: {
options: {
sourceMap: true,
Expand All @@ -169,7 +223,7 @@ module.exports = function (grunt) {
'assets/public/sass/**/*.scss'
],
tasks: [
'dart-sass:adminDev', 'dart-sass:publicDev'
'dart-sass:adminDev', 'dart-sass:publicDev', 'dart-sass:globalDev'
],
options: {
livereload: true
Expand All @@ -192,6 +246,7 @@ module.exports = function (grunt) {
});

// Load tasks
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-dart-sass');
Expand All @@ -212,6 +267,7 @@ module.exports = function (grunt) {
grunt.registerTask('default', [
'dart-sass:adminDev',
'dart-sass:publicDev',
'dart-sass:globalDev',
'dart-sass:themes',
'uglify:dev',
'uglify:dist',
Expand All @@ -222,6 +278,7 @@ module.exports = function (grunt) {
grunt.registerTask('dev', [
'dart-sass:adminDev',
'dart-sass:publicDev',
'dart-sass:globalDev',
'dart-sass:themes',
'uglify:dev',
'babel',
Expand All @@ -230,12 +287,14 @@ module.exports = function (grunt) {
'watch',
]);
grunt.registerTask('dist', [
'clean',
'dart-sass:admin',
'dart-sass:public',
'dart-sass:global',
'dart-sass:themes',
'uglify:dist',
'babel',
'uglify:dist',
'copy',
'node_versions',
]);
};
};
Loading