Update for latest changes in Superpowers Core, upgrade from Jade to Pug

Author: elisee

README.md

@@ -4,7 +4,7 @@
 
 Make static websites in live collaboration with [Superpowers](http://superpowers-html5.com/).
 
-The Superpowers Web system uses [Jade](http://jade-lang.com/) for HTML and [Stylus](http://stylus-lang.com/) for stylesheets.
+The Superpowers Web system uses [Pug](https://pugjs.org/) for HTML and [Stylus](http://stylus-lang.com/) for stylesheets.
 
 ## How to install
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "superpowers-web",
   "description": "Static website system for Superpowers, the HTML5 app for real-time collaborative projects",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "license": "ISC",
   "repository": {
     "type": "git",
@@ -11,4 +11,4 @@
     "systemId": "web",
     "publishedPluginBundles": []
   }
-}
+}

player/gulpfile.js

@@ -1,15 +1,17 @@
-var gulp = require("gulp");
+"use strict";
+
+const gulp = require("gulp");
 
 // TypeScript
-var ts = require("gulp-typescript");
-var tsProject = ts.createProject("tsconfig.json");
-var tslint = require("gulp-tslint");
+const ts = require("gulp-typescript");
+const tsProject = ts.createProject("./tsconfig.json");
+const tslint = require("gulp-tslint");
 
-gulp.task("typescript", function() {
-  var failed = false;
-  var tsResult = tsProject.src()
-    .pipe(tslint())
-    .pipe(tslint.report("prose", { emitError: true }))
+gulp.task("typescript", () => {
+  let failed = false;
+  const tsResult = tsProject.src()
+    .pipe(tslint({ formatter: "prose" }))
+    .pipe(tslint.report({ emitError: true }))
     .on("error", (err) => { throw err; })
     .pipe(tsProject())
     .on("error", () => { failed = true; })
@@ -18,13 +20,13 @@ gulp.task("typescript", function() {
 });
 
 // Browserify
-var browserify = require("browserify");
-var source = require("vinyl-source-stream");
-gulp.task("browserify", [ "typescript" ],function() {
-  var bundler = browserify("./index.js");
+const browserify = require("browserify");
+const source = require("vinyl-source-stream");
+gulp.task("browserify", () => {
+  const bundler = browserify("./index.js");
   function bundle() { return bundler.bundle().pipe(source("index.js")).pipe(gulp.dest("../public")); }
   return bundle();
 });
 
 // All
-gulp.task("default", [ "typescript", "browserify" ]);
+gulp.task("default", gulp.series("typescript", "browserify"));

player/index.ts

@@ -1,7 +1,7 @@
 /// <reference path="../../../SupClient/typings/SupApp.d.ts" />
 
 import * as querystring from "querystring";
-const qs: { project: string; build: string; } = querystring.parse(window.location.search.slice(1));
+const qs: { project: string; build: string; } = querystring.parse(window.location.search.slice(1)) as any;
 
 const indexPath = `/builds/${qs.project}/${qs.build}/files/index.html`;
 

player/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5",
+    "target": "es6",
     "noImplicitAny": true,
     "typeRoots": [ "../../../node_modules/@types" ]
   }

plugins/common

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5",
+    "target": "es6",
     "noImplicitAny": true,
     "rootDir": "./",
     "typeRoots": [ "../../../../../node_modules/@types" ]

…ins/default/blob/editors/blob/index.jade …gins/default/blob/editors/blob/index.pugplugins/default/blob/editors/blob/index.jade renamed to plugins/default/blob/editors/blob/index.pug plugins/default/blob/editors/blob/index.jade renamed to plugins/default/blob/editors/blob/index.pug

@@ -6,14 +6,16 @@ import * as path from "path";
 const qs = querystring.parse(window.location.search.slice(1));
 
 let settings: WebBuildSettings;
+let projectWindowId: number;
 
 const progress = { index: 0, total: 0, errors: 0 };
 const statusElt = document.querySelector(".status");
 const progressElt = document.querySelector("progress") as HTMLProgressElement;
 const detailsListElt = document.querySelector(".details ol") as HTMLOListElement;
 
-export default function build(socket: SocketIOClient.Socket, theSettings: WebBuildSettings, buildPort: number) {
+export default function build(socket: SocketIOClient.Socket, theSettings: WebBuildSettings, theProjectWindowId: number, buildPort: number) {
   settings = theSettings;
+  projectWindowId = theProjectWindowId;
 
   socket.emit("build:project", (err: string, buildId: string) => {
     const buildPath = `${window.location.protocol}//${window.location.hostname}:${buildPort}/builds/${qs.project}/${buildId}/`;
@@ -51,14 +53,16 @@ function updateProgress() {
 
   if (progress.index < progress.total) {
     statusElt.textContent = SupClient.i18n.t("builds:web.progress", { path: settings.outputFolder, index: progress.index, total: progress.total });
-  } else if (progress.errors > 0) {
-    statusElt.textContent = SupClient.i18n.t("builds:web.doneWithErrors", { path: settings.outputFolder, total: progress.total, errors: progress.errors });
   } else {
-    statusElt.textContent = SupClient.i18n.t("builds:web.done", { path: settings.outputFolder, total: progress.total });
+    statusElt.textContent = progress.errors > 0 ?
+      SupClient.i18n.t("builds:web.doneWithErrors", { path: settings.outputFolder, total: progress.total, errors: progress.errors }) :
+      SupClient.i18n.t("builds:web.done", { path: settings.outputFolder, total: progress.total });
+
+      SupApp.sendMessage(projectWindowId, "build-finished");
   }
 }
 
-function downloadFile(buildPath: string, filePath: string, callback: ErrorCallback) {
+function downloadFile(buildPath: string, filePath: string, callback: (err: Error) => void) {
   const inputPath = `${buildPath}files/${filePath}`;
   const outputPath = path.join(settings.outputFolder, filePath);
 

plugins/default/blob/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5",
+    "target": "es6",
     "noImplicitAny": true,
     "rootDir": "./",
     "typeRoots": [ "../../../../../node_modules/@types" ]