Remove basic-ftp and other Amazon S3 deployment related build dependencies
Some checks are pending
build-docker / Build Image (push) Waiting to run

This commit is contained in:
mrkmntal 2026-04-11 18:33:00 -04:00
commit a5827601c9
4 changed files with 4 additions and 715 deletions

View file

@ -8,13 +8,10 @@ import ejs from 'gulp-ejs';
import rename from 'gulp-rename';
import htmlmin from 'gulp-html-minifier-terser';
import { deleteAsync } from 'del';
import s3Upload from 'gulp-s3-uploader';
import webpack from 'webpack-stream';
import TerserPlugin from 'terser-webpack-plugin';
import { readFile } from 'fs/promises';
import file from 'gulp-file';
import { CloudFrontClient, CreateInvalidationCommand } from '@aws-sdk/client-cloudfront';
import log from 'fancy-log';
import dartSass from 'sass';
import gulpSass from 'gulp-sass';
import OVERRIDES from '../src/overrides.mjs';
@ -27,8 +24,6 @@ const sass = gulpSass(dartSass);
const clean = () => deleteAsync(['./dist/**/*', '!./dist/readme.txt']);
const cloudfront = new CloudFrontClient({ region: 'us-east-1' });
const RESOURCES_PATH = './dist/resources';
// Data is now served as JSON files to avoid redundancy
@ -108,14 +103,8 @@ const htmlSources = [
'views/*.ejs',
];
const packageJson = await readFile('package.json');
let { version } = JSON.parse(packageJson);
const { version } = JSON.parse(packageJson);
const { themes, themeAssets } = await discoverThemes();
const previewVersion = async () => {
// generate a relatively unique timestamp for cache invalidation of the preview site
const now = new Date();
const msNow = now.getTime() % 1_000_000;
version = msNow.toString();
};
const compressHtml = async () => src(htmlSources)
.pipe(ejs({
@ -151,92 +140,26 @@ const copyDataFiles = () => src([
'datagenerators/output/radarcities.json',
]).pipe(dest('./dist/data'));
const s3 = s3Upload({
useIAM: true,
}, {
region: 'us-east-1',
});
const uploadSources = [
'dist/**',
'!dist/images/**/*',
'!dist/fonts/**/*',
];
const uploadCreator = (bucket) => () => src(uploadSources, { base: './dist', encoding: false })
.pipe(s3({
Bucket: bucket,
StorageClass: 'STANDARD',
maps: {
CacheControl: (keyname) => {
if (keyname.indexOf('index.html') > -1) return 'max-age=300'; // 10 minutes
if (keyname.indexOf('.mp3') > -1) return 'max-age=31536000'; // 1 year for mp3 files
return 'max-age=2592000'; // 1 month
},
},
}));
const imageSources = [
'server/fonts/**',
'server/images/**',
'!server/images/gimp/**',
];
const upload = uploadCreator(process.env.BUCKET);
const uploadPreview = uploadCreator(process.env.BUCKET_PREVIEW);
const uploadImagesCreator = (bucket) => () => src(imageSources, { base: './server', encoding: false })
.pipe(
s3({
Bucket: bucket,
StorageClass: 'STANDARD',
maps: {
CacheControl: () => 'max-age=31536000',
},
}),
);
const uploadImages = uploadImagesCreator(process.env.BUCKET);
const uploadImagesPreview = uploadImagesCreator(process.env.BUCKET_PREVIEW);
const copyImageSources = () => src(imageSources, { base: './server', encoding: false })
.pipe(dest('./dist'));
const invalidateCreator = (distributionId) => () => cloudfront.send(new CreateInvalidationCommand({
DistributionId: distributionId,
InvalidationBatch: {
CallerReference: (new Date()).toLocaleString(),
Paths: {
Quantity: 1,
Items: ['/*'],
},
},
}));
const invalidate = invalidateCreator(process.env.DISTRIBUTION_ID);
const invalidatePreview = invalidateCreator(process.env.DISTRIBUTION_ID_PREVIEW);
const buildPlaylist = async () => {
const availableFiles = await reader();
const playlist = { availableFiles };
return file('playlist.json', JSON.stringify(playlist)).pipe(dest('./dist'));
};
const logVersion = async () => {
log(`Version Published: ${version}`);
};
const buildDist = series(clean, parallel(buildJs, compressJsVendor, buildCss, compressHtml, copyOtherFiles, copyThemes, copyDataFiles, copyImageSources, buildPlaylist));
// upload_images could be in parallel with upload, but _images logs a lot and has little changes
// by running upload last the majority of the changes will be at the bottom of the log for easy viewing
const publishFrontend = series(buildDist, uploadImages, upload, invalidate, logVersion);
const stageFrontend = series(previewVersion, buildDist, uploadImagesPreview, uploadPreview, invalidatePreview);
export default publishFrontend;
export default buildDist;
export {
buildDist,
copyThemes,
invalidate,
stageFrontend,
};