cha0s/flecks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: runtime HMR

Browse Source
This commit is contained in:
cha0s 2024-02-14 03:14:02 -06:00
parent f3e85ee8fb
commit 389316195e
3 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/build/flecks.js
View File

@ -964,6 +964,8 @@ class Flecks {
*/ */
refresh(fleck, M) { refresh(fleck, M) {
this.constructor.debug('refreshing %s...', fleck); this.constructor.debug('refreshing %s...', fleck);
// Notify about fleck updates.
this.invokeSequential('@flecks/core.hmr', fleck, M);
// Notify about hook implementation updates. // Notify about hook implementation updates.
const previousM = this.fleck(fleck); const previousM = this.fleck(fleck);
[...new Set([ [...new Set([

92
packages/server/build/runtime.js
View File

@ -33,7 +33,22 @@ async function runtimeModule(compilation, flecks) {
...resolvedPaths.map((path) => [ ...resolvedPaths.map((path) => [
' (async () => {', ' (async () => {',
' try {', ' try {',
` return ['${path}', await import('${path}')];`, ` const M = await import('${path}');`,
' if (module.hot) {',
// Hooks for each fleck.
` module.hot.accept('${path}', async () => {`,
` const M = require('${path}')`,
' try {',
` global.flecks.refresh('${path}', M);`,
' }',
' catch (error) {',
// eslint-disable-next-line no-template-curly-in-string
' console.error(`HMR failed for fleck: ${error.message}`);',
' module.hot.invalidate();',
' }',
' });',
` return ['${path}', M];`,
' }',
' }', ' }',
' catch (error) {', ' catch (error) {',
' if (!error.message.startsWith("Cannot find module")) {', ' if (!error.message.startsWith("Cannot find module")) {',
@ -51,58 +66,43 @@ async function runtimeModule(compilation, flecks) {
version: JSON.stringify(version), version: JSON.stringify(version),
...await flecks.invokeAsync('@flecks/server.runtime'), ...await flecks.invokeAsync('@flecks/server.runtime'),
}; };
const runtimeString = `{${ const renderedRuntime = `{${
Object.entries(runtime) Object.entries(runtime)
.map(([key, value]) => `"${key}": ${value}`).join(', ') .map(([key, value]) => `"${key}": ${value}`).join(', ')
}}`; }}`;
const source = [ const source = [
"const {Flecks} = require('@flecks/core');", "const {Flecks} = require('@flecks/core');",
"process.env.FLECKS_CORE_BUILD_TARGET = 'server';", "process.env.FLECKS_CORE_BUILD_TARGET = 'server';",
`module.exports = (async () => (${runtimeString}))();`, `module.exports = (async () => (${renderedRuntime}))();`,
]; // HMR.
// HMR. 'if (module.hot) {',
source.push('if (module.hot) {'); ` module.hot.accept('${ymlPath}', () => {`,
source.push(` module.hot.accept('${ymlPath}', async () => {`); ` const M = require('${ymlPath}').default;`,
source.push(` const M = require('${ymlPath}').default;`); ' try {',
source.push(' try {'); ` global.flecks.invokeSequential('@flecks/core.hmr', '${ymlPath}', M);`,
source.push(` global.flecks.invokeSequential('@flecks/core.hmr', '${ymlPath}', M);`); ' }',
source.push(' }'); ' catch (error) {',
source.push(' catch (error) {');
// eslint-disable-next-line no-template-curly-in-string
source.push(' console.error(`flecks.reload() failed: ${error.message}`);');
source.push(' module.hot.invalidate();');
source.push(' }');
source.push(' });');
// Keep HMR junk out of our output path.
source.push(' const {glob} = require("glob");');
source.push(' const {join} = require("path");');
source.push(' const {unlink} = require("fs/promises");');
source.push(' let previousHash = __webpack_hash__;');
source.push(' module.hot.addStatusHandler(async (status) => {');
source.push(' if ("idle" === status) {');
source.push(' const disposing = await glob(');
source.push(` join('${compiler.options.output.path}', \`*\${previousHash}.hot-update.*\`),`);
source.push(' );');
source.push(' await Promise.all(disposing.map((filename) => unlink(filename)));');
source.push(' previousHash = __webpack_hash__;');
source.push(' }');
source.push(' });');
// Hooks for each fleck.
resolvedPaths.forEach((path) => {
source.push(` module.hot.accept('${path}', async () => {`);
source.push(` const M = require('${path}')`);
source.push(' try {');
source.push(` global.flecks.invokeSequential('@flecks/core.hmr', '${path}', M);`);
source.push(` global.flecks.refresh('${path}', M);`);
source.push(' }');
source.push(' catch (error) {');
// eslint-disable-next-line no-template-curly-in-string // eslint-disable-next-line no-template-curly-in-string
source.push(' console.error(`HMR failed for fleck: ${error.message}`);'); ' console.error(`flecks.reload() failed: ${error.message}`);',
source.push(' module.hot.invalidate();'); ' module.hot.invalidate();',
source.push(' }'); ' }',
source.push(' });'); ' });',
}); // Keep HMR junk out of our output path.
source.push('}'); ' const {glob} = require("glob");',
' const {join} = require("path");',
' const {unlink} = require("fs/promises");',
' let previousHash = __webpack_hash__;',
' module.hot.addStatusHandler(async (status) => {',
' if ("idle" === status) {',
' const disposing = await glob(',
` join('${compiler.options.output.path}', \`*\${previousHash}.hot-update.*\`),`,
' );',
' await Promise.all(disposing.map((filename) => unlink(filename)));',
' previousHash = __webpack_hash__;',
' }',
' });',
'}',
];
// Create asset. // Create asset.
return source.join('\n'); return source.join('\n');
} }

3
packages/web/build/runtime.js
View File

@ -67,10 +67,9 @@ module.exports = async (config, env, argv, flecks) => {
// HMrequire. // HMrequire.
source.push('if (module.hot) {'); source.push('if (module.hot) {');
resolvedPaths.forEach((path) => { resolvedPaths.forEach((path) => {
source.push(` module.hot.accept('${path}', async () => {`); source.push(` module.hot.accept('${path}', () => {`);
source.push(` const M = require('${path}')`); source.push(` const M = require('${path}')`);
source.push(' try {'); source.push(' try {');
source.push(` global.flecks.invokeSequential('@flecks/core.hmr', '${path}', M);`);
source.push(` global.flecks.refresh('${path}', M);`); source.push(` global.flecks.refresh('${path}', M);`);
source.push(' }'); source.push(' }');
source.push(' catch (error) {'); source.push(' catch (error) {');