Revert "Convert site to ESM (#6772)"

This reverts commit e45d180162.

site/package.json

@@ -2,7 +2,6 @@
   "name": "svelte.dev",
   "version": "1.0.0",
   "description": "Docs and examples for Svelte",
-  "type": "module",
   "scripts": {
     "dev": "node scripts/update.js && npm run copy-workers && sapper dev",
     "copy-workers": "node scripts/copy-workers.js",
@@ -23,7 +22,7 @@
     "httpie": "^1.1.2",
     "jsonwebtoken": "^8.5.1",
     "marked": "^1.0.0",
-    "pg": "^8.7.1",
+    "pg": "^7.12.1",
     "polka": "^1.0.0-next.9",
     "prism-svelte": "^0.4.3",
     "prismjs": "^1.25.0",
@@ -45,7 +44,7 @@
     "@sveltejs/site-kit": "^1.4.0",
     "@sveltejs/svelte-repl": "^0.2.1",
     "degit": "^2.1.4",
-    "dotenv": "^10.0.0",
+    "dotenv": "^8.1.0",
     "esm": "^3.2.25",
     "jimp": "^0.8.0",
     "mocha": "^6.2.0",

site/rollup.config.js

@@ -20,9 +20,6 @@ if (!dev && !process.env.MAPBOX_ACCESS_TOKEN) {
 const onwarn = (warning, onwarn) => (warning.code === 'CIRCULAR_DEPENDENCY' && /[/\\]@sapper[/\\]/.test(warning.message)) || onwarn(warning);
 const dedupe = importee => importee === 'svelte' || importee.startsWith('svelte/');
 
-const serverOutput = config.server.output();
-serverOutput.format = 'esm';
-
 export default {
 	client: {
 		input: config.client.input(),
@@ -74,7 +71,7 @@ export default {
 
 	server: {
 		input: config.server.input(),
-		output: serverOutput,
+		output: config.server.output(),
 		plugins: [
 			replace({
 				'process.browser': false,

site/scripts/copy-workers.js

@@ -1,4 +1,4 @@
-import sh from 'shelljs';
+const sh = require('shelljs');
 
 sh.rm('-rf', 'static/workers');
 sh.cp('-r', 'node_modules/@sveltejs/svelte-repl/workers', 'static');

site/scripts/get-example-thumbnails/index.js

@@ -1,7 +1,7 @@
-import fs from 'fs';
+const fs = require('fs');
-import puppeteer from 'puppeteer';
+const puppeteer = require('puppeteer');
-import Jimp from 'jimp';
+const Jimp = require('jimp');
-import c from 'kleur';
+const c = require('kleur');
 
 const slugs = [];
 

site/scripts/get-examples-from-tutorials/index.js

@@ -1,8 +1,5 @@
-import sander from 'sander';
+const sander = require('sander');
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
 process.chdir(`${__dirname}/../..`);
 
 function extract_frontmatter(markdown) {

site/scripts/get_contributors.js

@@ -1,14 +1,10 @@
-import 'dotenv/config';
+require('dotenv/config');
-import fs from 'fs';
+const fs = require('fs');
-import fetch from 'node-fetch';
+const fetch = require('node-fetch');
-import Jimp from 'jimp';
+const Jimp = require('jimp');
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
-
 
 const force = process.env.FORCE_UPDATE === 'true';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
 process.chdir(__dirname);
 
 const outputFile = `../src/routes/_contributors.js`;

site/scripts/update.js

@@ -1,4 +1,4 @@
-import sh from 'shelljs';
+const sh = require('shelljs');
 
 sh.env['FORCE_UPDATE'] = process.argv.includes('--force=true');
 

site/scripts/update_template.js

@@ -1,11 +1,9 @@
-import sh from 'shelljs';
+const sh = require('shelljs');
-import fs from 'fs';
+const fs = require('fs');
-import path, { dirname }  from 'path';
+const path = require('path');
-import { fileURLToPath } from 'url';
 
 const force = process.env.FORCE_UPDATE === 'true';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
 sh.cd(path.join(__dirname, '..'));
 
 const outputFile = 'static/svelte-app.json';

site/src/utils/db.js

@@ -1,7 +1,7 @@
-import pg from 'pg';
+import { Pool } from 'pg';
 
 // Uses `PG*` ENV vars
-export const DB = process.env.PGHOST ? new pg.Pool() : null;
+export const DB = process.env.PGHOST ? new Pool() : null;
 
 export function query(text, values=[]) {
 	return DB.query(text, values).then(r => r.rows);