Skip to content

Target Joomla 6 compatibility #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ronnikc wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Target Joomla 6 compatibility #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions build/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
"joomla/coding-standards": "v1.1"
},
"require-dev": {
"joomla/joomla-cms": "3.7.5"
"joomla/joomla-cms": "dev-6.0-dev"
},
"repositories": [
{
"type": "package",
"package": {
"name": "joomla/joomla-cms",
"version": "3.7.5",
"version": "dev-6.0-dev",
"source": {
"url": "https://github.com/joomla/joomla-cms.git",
"type": "git",
"reference": "3.7.5"
"reference": "6.0-dev"
}
}
},
Expand All @@ -33,4 +33,4 @@
}
}
]
}
}
34 changes: 25 additions & 9 deletions build/composer.lock
View file
Open in desktop

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

7 changes: 4 additions & 3 deletions build/gulp-redcore/cli/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var gulp = require('gulp');

var config = require('../config.js');
var task = require('../task-helper')(gulp);

/**
* Get the list of the cli from paths
Expand Down Expand Up @@ -40,21 +41,21 @@ function getCliTasks(baseTask) {
}

// Clean
gulp.task('clean:cli',
task('clean:cli',
getCliTasks('clean:cli'),
function() {
return true
});

// Copy
gulp.task('copy:cli',
task('copy:cli',
getCliTasks('copy:cli'),
function() {
return true;
});

// Watch
gulp.task('watch:cli',
task('watch:cli',
getCliTasks('watch:cli'),
function() {
return true;
Expand Down
21 changes: 12 additions & 9 deletions build/gulp-redcore/cli/redcore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ var gulp = require('gulp');
var fs = require('fs');

var config = require('../config.js');
var task = require('../task-helper')(gulp);

// Dependencies
var browserSync = require('browser-sync');
Expand All @@ -15,7 +16,7 @@ var directPath = '../extensions/cli';
var extPath = fs.existsSync(subextensionPath) ? subextensionPath : directPath;

// Clean
gulp.task('clean:' + baseTask,
task('clean:' + baseTask,
[
'clean:' + baseTask + ':cli'
],
Expand All @@ -24,12 +25,12 @@ gulp.task('clean:' + baseTask,
});

// Clean cli
gulp.task('clean:' + baseTask + ':cli', function() {
task('clean:' + baseTask + ':cli', function() {
return del(config.wwwDir + '/cli/com_redcore', {force : true});
});

// Copy
gulp.task('copy:' + baseTask,
task('copy:' + baseTask,
[
'copy:' + baseTask + ':cli'
],
Expand All @@ -38,13 +39,13 @@ gulp.task('copy:' + baseTask,
});

// Copy cli
gulp.task('copy:' + baseTask + ':cli', ['clean:' + baseTask + ':cli'], function(cb) {
task('copy:' + baseTask + ':cli', ['clean:' + baseTask + ':cli'], function(cb) {
return gulp.src(extPath + '/**')
.pipe(gulp.dest(config.wwwDir + '/cli'));
});

// Watch
gulp.task('watch:' + baseTask,
task('watch:' + baseTask,
[
'watch:' + baseTask + ':cli'
],
Expand All @@ -53,8 +54,10 @@ gulp.task('watch:' + baseTask,
});

// Watch cli
gulp.task('watch:' + baseTask + ':cli', function() {
gulp.watch(extPath + '/**/*',
{ interval: config.watchInterval },
['copy:' + baseTask + ':cli', browserSync.reload]);
task('watch:' + baseTask + ':cli', function() {
gulp.watch(
extPath + '/**/*',
{ interval: config.watchInterval },
gulp.series('copy:' + baseTask + ':cli', browserSync.reload)
);
});
23 changes: 12 additions & 11 deletions build/gulp-redcore/components/redcore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var gulp = require('gulp');

var config = require('../config.js');
var task = require('../task-helper')(gulp);

// Dependencies
var browserSync = require('browser-sync');
Expand All @@ -16,7 +17,7 @@ var directPath = '../extensions/components/com_redcore';
var extPath = fs.existsSync(subextensionPath) ? subextensionPath : directPath;

// Clean
gulp.task('clean:' + baseTask,
task('clean:' + baseTask,
[
'clean:' + baseTask + ':backend'
],
Expand All @@ -25,17 +26,17 @@ gulp.task('clean:' + baseTask,
});

// Clean backend
gulp.task('clean:' + baseTask + ':backend', function() {
task('clean:' + baseTask + ':backend', function() {
return del(config.wwwDir + '/administrator/components/com_redcore', {force : true});
});

// Clean frontend
gulp.task('clean:' + baseTask + ':frontend', function() {
task('clean:' + baseTask + ':frontend', function() {
return del(config.wwwDir + '/components/com_redcore', {force : true});
});

// Copy
gulp.task('copy:' + baseTask,
task('copy:' + baseTask,
[
'copy:' + baseTask + ':backend'
],
Expand All @@ -44,7 +45,7 @@ gulp.task('copy:' + baseTask,
});

// Copy backend
gulp.task('copy:' + baseTask + ':backend', ['clean:' + baseTask + ':backend'], function(cb) {
task('copy:' + baseTask + ':backend', ['clean:' + baseTask + ':backend'], function(cb) {
var admin = gulp.src(extPath + '/admin/**')
.pipe(gulp.dest(config.wwwDir + '/administrator/components/com_redcore'));

Expand All @@ -55,15 +56,15 @@ gulp.task('copy:' + baseTask + ':backend', ['clean:' + baseTask + ':backend'], f
});

// Copy frontend
gulp.task('copy:' + baseTask + ':frontend', ['clean:' + baseTask + ':frontend'], function(cb) {
task('copy:' + baseTask + ':frontend', ['clean:' + baseTask + ':frontend'], function(cb) {
return (
gulp.src(extPath + '/site/**')
.pipe(gulp.dest(config.wwwDir + '/components/com_redcore'))
);
});

// Watch
gulp.task('watch:' + baseTask,
task('watch:' + baseTask,
[
'watch:' + baseTask + ':backend',
'watch:' + baseTask + ':frontend'
Expand All @@ -73,21 +74,21 @@ gulp.task('watch:' + baseTask,
});

// Watch backend
gulp.task('watch:' + baseTask + ':backend', function() {
task('watch:' + baseTask + ':backend', function() {
gulp.watch([
extPath + '/admin/**/*',
extPath + '/../redcore.xml',
extPath + '/../install.php'
],
{ interval: config.watchInterval },
['copy:' + baseTask + ':backend', browserSync.reload]);
gulp.series('copy:' + baseTask + ':backend', browserSync.reload));
});

// Watch frontend
gulp.task('watch:' + baseTask + ':frontend', function() {
task('watch:' + baseTask + ':frontend', function() {
gulp.watch([
extPath + '/site/**/*'
],
{ interval: config.watchInterval },
['copy:' + baseTask + ':frontend', browserSync.reload]);
gulp.series('copy:' + baseTask + ':frontend', browserSync.reload));
});
29 changes: 15 additions & 14 deletions build/gulp-redcore/libraries/redcore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ var gulp = require('gulp');
var fs = require('fs');

var config = require('../config.js');
var task = require('../task-helper')(gulp);

// Dependencies
var browserSync = require('browser-sync');
Expand All @@ -18,7 +19,7 @@ var mediaPath = extPath + '/' + mediaSubPath;
var buildPathMedia = baseFolder + '/build/media/' + extSubPath + '/' + mediaSubPath;

// Clean
gulp.task('clean:' + baseTask,
task('clean:' + baseTask,
[
'clean:' + baseTask + ':library',
'clean:' + baseTask + ':manifest'
Expand All @@ -28,17 +29,17 @@ gulp.task('clean:' + baseTask,
});

// Clean: library
gulp.task('clean:' + baseTask + ':library', function() {
task('clean:' + baseTask + ':library', function() {
return del(config.wwwDir + '/libraries/redcore', {force : true});
});

// Clean: manifest
gulp.task('clean:' + baseTask + ':manifest', function() {
task('clean:' + baseTask + ':manifest', function() {
return del(config.wwwDir + '/administrator/manifests/libraries/redcore.xml', {force : true});
});

// Copy
gulp.task('copy:' + baseTask,
task('copy:' + baseTask,
[
'copy:' + baseTask + ':library',
'copy:' + baseTask + ':manifest',
Expand All @@ -49,7 +50,7 @@ gulp.task('copy:' + baseTask,
});

// Copy: library
gulp.task('copy:' + baseTask + ':library',
task('copy:' + baseTask + ':library',
['clean:' + baseTask + ':library', 'copy:' + baseTask + ':manifest'], function() {
return gulp.src([
extPath + '/**',
Expand All @@ -61,13 +62,13 @@ gulp.task('copy:' + baseTask + ':library',
});

// Copy: manifest
gulp.task('copy:' + baseTask + ':manifest', ['clean:' + baseTask + ':manifest'], function() {
task('copy:' + baseTask + ':manifest', ['clean:' + baseTask + ':manifest'], function() {
return gulp.src(extPath + '/redcore.xml')
.pipe(gulp.dest(config.wwwDir + '/administrator/manifests/libraries'));
});

// Copy: media
gulp.task('copy:' + baseTask + ':media', function() {
task('copy:' + baseTask + ':media', function() {
// Delete all except for webservices folder
del.sync([
config.wwwDir + '/media/redcore/css',
Expand Down Expand Up @@ -95,7 +96,7 @@ gulp.task('copy:' + baseTask + ':media', function() {
});

// Watch
gulp.task('watch:' + baseTask,
task('watch:' + baseTask,
[
'watch:' + baseTask + ':library',
'watch:' + baseTask + ':manifest',
Expand All @@ -105,29 +106,29 @@ gulp.task('watch:' + baseTask,
});

// Watch: library
gulp.task('watch:' + baseTask + ':library', function() {
task('watch:' + baseTask + ':library', function() {
gulp.watch([
extPath + '/**/*',
'!' + extPath + '/redcore.xml',
'!' + extPath + '/media',
'!' + extPath + '/media/**'
],
{ interval: config.watchInterval },
['copy:' + baseTask + ':library', browserSync.reload]);
gulp.series('copy:' + baseTask + ':library', browserSync.reload));
});

// Watch: manifest
gulp.task('watch:' + baseTask + ':manifest', function() {
task('watch:' + baseTask + ':manifest', function() {
gulp.watch(extPath + '/redcore.xml',
{ interval: config.watchInterval },
['copy:' + baseTask + ':manifest',browserSync.reload]);
gulp.series('copy:' + baseTask + ':manifest', browserSync.reload));
});

// Watch: media
gulp.task('watch:' + baseTask + ':media', function() {
task('watch:' + baseTask + ':media', function() {
gulp.watch([
extPath + '/media/redcore/**'
],
{ interval: config.watchInterval },
['copy:' + baseTask + ':media', browserSync.reload]);
gulp.series('copy:' + baseTask + ':media', browserSync.reload));
});
Loading