Skip to content

Visualize Your Ideas With Code

fix: previous scenes not getting disposed

aarthificialbf3a1fcf5fc2
diff --git a/src/Project.ts b/src/Project.ts
index e4c206e0..9552d472 100644
--- a/src/Project.ts
+++ b/src/Project.ts
@@ -83,10 +83,7 @@ export class Project extends Stage {
public async next(speed: number = 1): Promise<boolean> {
if (this.previousScene) {
await this.previousScene.next();
- if (
- this.previousScene.isFinished() &&
- (!this.currentScene || this.currentScene.isAfterTransitionIn())
- ) {
+ if (!this.currentScene || this.currentScene.isAfterTransitionIn()) {
this.previousScene.remove();
this.previousScene.lastFrame = this.frame;
this.previousScene = null;
diff --git a/src/hot.ts b/src/hot.ts
index 7ad414b9..060dd0f8 100644
--- a/src/hot.ts
+++ b/src/hot.ts
@@ -1,11 +1,23 @@
import {Player} from './player/Player';
export function hot(player: Player, root: typeof module) {
- const update = (modules: string[]) => {
- player.project.reload(
+ const update = async (modules: string[]) => {
+ const runners = [];
+ for (const module of modules) {
// @ts-ignore
- modules.map(id => __webpack_require__(id).default),
- );
+ const runner = __webpack_require__(module).default;
+ if (
+ // FIXME Find out a better way to detect runner factories.
+ runner.name === '__WEBPACK_DEFAULT_EXPORT__' &&
+ typeof runner === 'function'
+ ) {
+ runners.push(await runner());
+ } else {
+ runners.push(runner);
+ }
+ }
+
+ player.project.reload(runners);
player.requestSeek(player.project.frame);
};
diff --git a/tools/serve.mjs b/tools/serve.mjs
index 076becee..29a2034a 100644
--- a/tools/serve.mjs
+++ b/tools/serve.mjs
@@ -74,6 +74,9 @@ const compiler = webpack({
compress: true,
port: 9000,
},
+ experiments: {
+ topLevelAwait: true,
+ }
});
const server = new WebpackDevServer(
{
diff --git a/tsconfig.json b/tsconfig.json
index bff8cd13..e9d95088 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,7 @@
"sourceMap": true,
"noImplicitAny": true,
"module": "esnext",
- "target": "es6",
+ "target": "es2017",
"moduleResolution": "node",
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true,