Convert site to ESM

site/package.json

@@ -2,6 +2,7 @@
   "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",
@@ -22,7 +23,7 @@
     "httpie": "^1.1.2",
     "jsonwebtoken": "^8.5.1",
     "marked": "^1.0.0",
-    "pg": "^7.12.1",
+    "pg": "^8.7.1",
     "polka": "^1.0.0-next.9",
     "prism-svelte": "^0.4.3",
     "prismjs": "^1.25.0",
@@ -44,7 +45,7 @@
     "@sveltejs/site-kit": "^1.4.0",
     "@sveltejs/svelte-repl": "^0.2.1",
     "degit": "^2.1.4",
-    "dotenv": "^8.1.0",
+    "dotenv": "^10.0.0",
     "esm": "^3.2.25",
     "jimp": "^0.8.0",
     "mocha": "^6.2.0",

site/rollup.config.js

@@ -20,6 +20,9 @@ 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(),
@@ -71,7 +74,7 @@ export default {
 
 	server: {
 		input: config.server.input(),
-		output: config.server.output(),
+		output: serverOutput,
 		plugins: [
 			replace({
 				'process.browser': false,

site/scripts/copy-workers.js

@@ -1,4 +1,4 @@
-const sh = require('shelljs');
+import sh from '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 @@
-const fs = require('fs');
+import fs from 'fs';
-const puppeteer = require('puppeteer');
+import puppeteer from 'puppeteer';
-const Jimp = require('jimp');
+import Jimp from 'jimp';
-const c = require('kleur');
+import c from 'kleur';
 
 const slugs = [];
 

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

@@ -1,5 +1,8 @@
-const sander = require('sander');
+import sander from '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,10 +1,14 @@
-require('dotenv/config');
+import 'dotenv/config';
-const fs = require('fs');
+import fs from 'fs';
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
-const Jimp = require('jimp');
+import Jimp from '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 @@
-const sh = require('shelljs');
+import sh from 'shelljs';
 
 sh.env['FORCE_UPDATE'] = process.argv.includes('--force=true');
 

site/scripts/update_template.js

@@ -1,9 +1,11 @@
-const sh = require('shelljs');
+import sh from 'shelljs';
-const fs = require('fs');
+import fs from 'fs';
-const path = require('path');
+import path, { dirname }  from '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 { Pool } from 'pg';
+import pg from 'pg';
 
 // Uses `PG*` ENV vars
-export const DB = process.env.PGHOST ? new Pool() : null;
+export const DB = process.env.PGHOST ? new pg.Pool() : null;
 
 export function query(text, values=[]) {
 	return DB.query(text, values).then(r => r.rows);