Merge branch 'TryGhost:main' into main

This commit is contained in:
Cathy Sarisky 2024-09-19 14:00:55 -04:00 committed by GitHub
commit e706ce469c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 30 additions and 19 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,7 @@
const {series, parallel, watch, src, dest} = require('gulp');
const pump = require('pump');
const fs = require('fs');
const order = require('ordered-read-streams');
// gulp plugins and utils
const livereload = require('gulp-livereload');
@ -48,14 +50,24 @@ function css(done) {
], handleError(done));
}
function getJsFiles(version) {
const jsFiles = [
src(`node_modules/@tryghost/shared-theme-assets/assets/js/${version}/lib/**/*.js`),
src(`node_modules/@tryghost/shared-theme-assets/assets/js/${version}/main.js`),
];
if (fs.existsSync(`assets/js/lib`)) {
jsFiles.push(src(`assets/js/lib/*.js`));
}
jsFiles.push(src(`assets/js/main.js`));
return jsFiles;
}
function js(done) {
pump([
src([
'node_modules/@tryghost/shared-theme-assets/assets/js/v1/lib/**/*.js',
'node_modules/@tryghost/shared-theme-assets/assets/js/v1/main.js',
'assets/js/lib/*.js',
'assets/js/main.js'
], {sourcemaps: true}),
order(getJsFiles('v1'), {sourcemaps: true}),
concat('main.min.js'),
uglify(),
dest('assets/built/', {sourcemaps: '.'}),

View File

@ -89,19 +89,20 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"autoprefixer": "10.4.19",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.20",
"beeper": "2.1.0",
"cssnano": "6.1.2",
"gscan": "4.42.0",
"gulp": "4.0.2",
"cssnano": "7.0.6",
"gscan": "4.43.5",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"postcss": "8.4.38",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.47",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
"pump": "3.0.2"
}
}