Split GP and JSD

CONTRIBUTING.md

@@ -1,6 +1,6 @@
-# www.jsdelivr.com Contributing Guide
+# www.jsdelivr.com & globalping.io Contributing Guide
 
-Hi! We're really excited that you're interested in contributing to www.jsdelivr.com! Before submitting your contribution, please read through the following guide.
+Hi! We're really excited that you're interested in contributing! Before submitting your contribution, please read through the following guide.
 
 ## Overview
 
@@ -18,7 +18,12 @@ To get started, you need to have Node.js with NPM installed. Then run the follow
 
 ```bash
 npm install
+
+# to start the jsDelivr site
 npm start
+
+# to start the Globalping site
+npm run start:gp
 ```
 
 Configuration for IntelliJ based IDEs is also available in this repository. If you use one, it is a good idea to add https://github.com/MartinKolarik/idea-config as a [read-only settings repository](https://www.jetbrains.com/help/idea/sharing-your-ide-settings.html#share-more-settings-through-read-only-repo). It contains code style and inspection profiles used by this project.
@@ -52,4 +57,4 @@ module.exports = {
 };
 ```
 
-Additionally, `ELASTIC_APM_SERVER_URL`, `ELASTIC_APM_SECRET_TOKEN`, `ELASTIC_SEARCH_URL` (including user + pass), and `NODE_ENV=production` should be set.
+Additionally, `ELASTIC_APM_SERVER_URL`, `ELASTIC_APM_SECRET_TOKEN`, `ELASTIC_SEARCH_URL` (including user + pass), and `NODE_ENV=production` should be set.

README.md

@@ -1,10 +1,12 @@
 # www.jsdelivr.com
 
-This repository is used to host the source code for the [jsDelivr website](https://www.jsdelivr.com).
+This repository is used to host the source code for the [jsDelivr website](https://www.jsdelivr.com)
+and the [Globalping website](https://globalping.io).
 
 Related projects:
  - [jsDelivr CDN](https://github.com/jsdelivr/jsdelivr)
  - [jsDelivr API](https://github.com/jsdelivr/data.jsdelivr.com)
+ - [Globalping](https://github.com/jsdelivr/globalping)
 
 ## Web performance
 

config/default.js

@@ -32,4 +32,21 @@ module.exports = {
 			'/2013/01/nginx-load-balancing-basics.html': '/blog/nginx-load-balancing-basics/',
 		},
 	},
+	globalping: {
+		server: {
+			port: 13000,
+			host: 'https://globalping.io',
+			blogHost: 'https://jsdelivr-blog.ghost.io',
+			assetsHost: `/assets/${assetsVersion}`,
+			apiDocsHost: 'https://data.jsdelivr.com',
+			globalpingApiDocsHost: 'https://api.globalping.io',
+			userAgent: `globalping.io/${version} (https://github.com/jsdelivr/www.jsdelivr.com)`,
+			headers: {
+				'Cache-Control': 'no-cache, no-store, must-revalidate',
+				'Vary': 'Accept-Encoding',
+				'Strict-Transport-Security': 'max-age=31536000; includeSubDomains; preload',
+			},
+			blogRewrite: {},
+		},
+	},
 };

elastic-apm-node.js

@@ -1,6 +1,6 @@
 module.exports = {
 	active: process.env.NODE_ENV === 'production',
-	serviceName: 'jsdelivr-website',
+	serviceName: process.env.SITE === 'globalping' ? 'globalping-website' : 'jsdelivr-website',
 	serviceVersion: require('./package.json').version,
 	logLevel: 'fatal',
 	centralConfig: false,

gulpfile.js

@@ -1,5 +1,6 @@
 const gulp = require('gulp');
 const less = require('gulp-less');
+const rename = require('gulp-rename');
 const livereload = require('gulp-livereload');
 const sourcemaps = require('gulp-sourcemaps');
 const autoprefixer = require('gulp-autoprefixer');
@@ -17,11 +18,14 @@ const rollupJson = require('rollup-plugin-json');
 const buffer = require('vinyl-buffer');
 const source = require('vinyl-source-stream');
 
+const site = process.env.SITE === 'globalping' ? 'globalping' : 'jsdelivr';
+const liveReloadOptions = { port: site === 'globalping' ? 35730 : 35729 };
+
 const srcDir = './src';
 const srcAssetsDir = `${srcDir}/assets`;
-const srcPublicDir = `${srcDir}/public`;
-const dstAssetsDir = './dist/assets';
-const dstPublicDir = './dist';
+const srcPublicDir = `${srcDir}/public${site === 'globalping' ? '/globalping' : ''}`;
+const dstAssetsDir = `./dist${site === 'globalping' ? '/globalping' : '/jsdelivr'}/assets`;
+const dstPublicDir = `./dist${site === 'globalping' ? '/globalping' : '/jsdelivr'}`;
 let cache;
 
 const getRollupStream = file => rollupStream({
@@ -64,68 +68,68 @@ gulp.task('clean', () => {
 gulp.task('copy', gulp.parallel(
 	() => gulp.src(`${srcAssetsDir}/**/*.!(js|less)`, { base: srcAssetsDir, since: gulp.lastRun('copy') })
 		.pipe(gulp.dest(dstAssetsDir))
-		.pipe(livereload()),
+		.pipe(livereload(liveReloadOptions)),
 	() => gulp.src(`${srcPublicDir}/**/*`, { base: srcPublicDir, since: gulp.lastRun('copy') })
 		.pipe(gulp.dest(dstPublicDir))
-		.pipe(livereload()),
+		.pipe(livereload(liveReloadOptions)),
 ));
 
 gulp.task('less', () => {
-	return gulp.src([
-		`${srcAssetsDir}/less/app.less`,
-		`${srcAssetsDir}/less/app-globalping.less`,
-	])
+	return gulp.src(site === 'globalping'
+		? [
+			`${srcAssetsDir}/less/app-globalping.less`,
+		]
+		: [
+			`${srcAssetsDir}/less/app.less`,
+		])
 		.pipe(plumber())
 		.pipe(sourcemaps.init())
 		.pipe(less({ relativeUrls: true, strictMath: true }))
+		.pipe(rename('app.css'))
 		.pipe(sourcemaps.write('.'))
 		.pipe(gulp.dest(`${dstAssetsDir}/css`))
-		.pipe(livereload());
+		.pipe(livereload(liveReloadOptions));
 });
 
 gulp.task('less:prod', () => {
-	return gulp.src([
-		`${srcAssetsDir}/less/app.less`,
-		`${srcAssetsDir}/less/app-globalping.less`,
-	])
+	return gulp.src(site === 'globalping'
+		? [
+			`${srcAssetsDir}/less/app-globalping.less`,
+		]
+		: [
+			`${srcAssetsDir}/less/app.less`,
+		])
 		.pipe(sourcemaps.init())
 		.pipe(less({ relativeUrls: true, strictMath: true }))
 		.pipe(autoprefixer())
 		.pipe(minifyCss())
+		.pipe(rename('app.css'))
 		.pipe(sourcemaps.write('.'))
 		.pipe(gulp.dest(`${dstAssetsDir}/css`));
 });
 
 gulp.task('js', gulp.parallel(
-	() => getRollupStream('app.js')
+	() => getRollupStream(site === 'globalping' ? 'app-globalping.js' : 'app.js')
 		.pipe(plumber())
-		.pipe(source(`app.js`, srcAssetsDir))
+		.pipe(source(site === 'globalping' ? 'app-globalping.js' : 'app.js', srcAssetsDir))
 		.pipe(buffer())
 		.pipe(sourcemaps.init({ loadMaps: true }))
 		.pipe(sourcemaps.write('.'))
 		.pipe(gulp.dest(`${dstAssetsDir}/js`))
-		.pipe(livereload()),
+		.pipe(livereload(liveReloadOptions)),
 	() => getRollupStream('app-docs.js')
 		.pipe(plumber())
 		.pipe(source(`app-docs.js`, srcAssetsDir))
 		.pipe(buffer())
 		.pipe(sourcemaps.init({ loadMaps: true }))
 		.pipe(sourcemaps.write('.'))
 		.pipe(gulp.dest(`${dstAssetsDir}/js`))
-		.pipe(livereload()),
-	() => getRollupStream('app-globalping.js')
-		.pipe(plumber())
-		.pipe(source(`app-globalping.js`, srcAssetsDir))
-		.pipe(buffer())
-		.pipe(sourcemaps.init({ loadMaps: true }))
-		.pipe(sourcemaps.write('.'))
-		.pipe(gulp.dest(`${dstAssetsDir}/js`))
-		.pipe(livereload()),
+		.pipe(livereload(liveReloadOptions)),
 ));
 
 gulp.task('js:prod', gulp.parallel(
-	() => getRollupStream('app.js')
-		.pipe(source(`app.js`, srcAssetsDir))
+	() => getRollupStream(site === 'globalping' ? 'app-globalping.js' : 'app.js')
+		.pipe(source(site === 'globalping' ? 'app-globalping.js' : 'app.js', srcAssetsDir))
 		.pipe(buffer())
 		.pipe(sourcemaps.init({ loadMaps: true }))
 		.pipe(terser({ sourceMap: { includeSources: true } }))
@@ -138,13 +142,6 @@ gulp.task('js:prod', gulp.parallel(
 		.pipe(terser({ sourceMap: { includeSources: true } }))
 		.pipe(sourcemaps.write('.'))
 		.pipe(gulp.dest(`${dstAssetsDir}/js`)),
-	() => getRollupStream('app-globalping.js')
-		.pipe(source(`app-globalping.js`, srcAssetsDir))
-		.pipe(buffer())
-		.pipe(sourcemaps.init({ loadMaps: true }))
-		.pipe(terser({ sourceMap: { includeSources: true } }))
-		.pipe(sourcemaps.write('.'))
-		.pipe(gulp.dest(`${dstAssetsDir}/js`)),
 ));
 
 gulp.task('build', gulp.series('clean', 'copy', 'less:prod', 'js:prod'));
@@ -156,7 +153,7 @@ gulp.task('serve', () => {
 });
 
 gulp.task('watch', () => {
-	livereload.listen();
+	livereload.listen(liveReloadOptions);
 
 	gulp.watch([
 		`${srcAssetsDir}/**/*.!(html|js|less)`,

package.json

@@ -125,6 +125,7 @@
 		"gulp-less": "^5.0.0",
 		"gulp-livereload": "^4.0.2",
 		"gulp-plumber": "^1.2.1",
+		"gulp-rename": "^2.0.0",
 		"gulp-sourcemaps": "^3.0.0",
 		"gulp-terser": "^2.1.0",
 		"koa-livereload": "^0.2.0",
@@ -138,6 +139,7 @@
 	},
 	"scripts": {
 		"build": "gulp build",
+		"build:gp": "cross-env SITE=globalping gulp build",
 		"heroku-postbuild": "echo \"$SOURCE_VERSION\" > sha.txt",
 		"lint": "npm run lint:css && npm run lint:html && npm run lint:js",
 		"lint:fix": "npm run lint:css:fix && npm run lint:html:fix && npm run lint:js:fix",
@@ -150,6 +152,7 @@
 		"mocha": "mocha --exit test/tests.js",
 		"prepare": "husky install",
 		"start": "cross-env NODE_ENV=development gulp",
+		"start:gp": "cross-env NODE_ENV=development SITE=globalping gulp",
 		"test": "npm run lint && npm run mocha"
 	},
 	"lint-staged": {