fix: issue with SSR hot reloading

marko-js · Oct 28, 2021 · 0bc4321 · 0bc4321
1 parent 36b8f47
commit 0bc4321
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 22 deletions.
diff --git a/src/__tests__/fixtures/asset-tag/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/asset-tag/__snapshots__/webpack4/server--main.js
@@ -299,7 +299,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "wUwFs+xe",
+const _marko_componentType = "l8KG0xVe",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.___renderAssets = renderAssets;

diff --git a/src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js
@@ -201,7 +201,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "wUwFs+xe",
+const _marko_componentType = "l8KG0xVe",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "_marko_webpack";

diff --git a/..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js b/..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js
@@ -211,7 +211,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "8XgZ/c27",
+const _marko_componentType = "6kM99PmO",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "testruntime";

diff --git a/..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js b/..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js
@@ -111,7 +111,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "8XgZ/c27",
+const _marko_componentType = "6kM99PmO",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "testruntime";

diff --git a/..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js b/..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js
diff --git a/..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js b/..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js
diff --git a/src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack4/server--main.js
@@ -211,7 +211,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "r9oeuJMR",
+const _marko_componentType = "eUlE9/XD",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.___renderAssets = renderAssets;

diff --git a/src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack5/server--main.js
@@ -111,7 +111,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "r9oeuJMR",
+const _marko_componentType = "eUlE9/XD",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "_marko_webpack";

diff --git a/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack4/server--main.js
@@ -199,7 +199,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "qMMCl8/W",
+const _marko_componentType = "5odrrw/E",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.___renderAssets = renderAssets;
@@ -366,7 +366,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "FRgaW2aC",
+const _marko_componentType = "bXcWU3T1",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.___renderAssets = renderAssets;
@@ -503,7 +503,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "vyXF8r3F",
+const _marko_componentType = "LMt52weS",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.___renderAssets = renderAssets;

diff --git a/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack5/server--main.js
@@ -118,7 +118,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "qMMCl8/W",
+const _marko_componentType = "5odrrw/E",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "_marko_webpack";
@@ -292,7 +292,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "FRgaW2aC",
+const _marko_componentType = "bXcWU3T1",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "_marko_webpack";
@@ -434,7 +434,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "vyXF8r3F",
+const _marko_componentType = "LMt52weS",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "_marko_webpack";

diff --git a/...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack4/server--main.js b/...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack4/server--main.js
@@ -252,7 +252,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "xbStr3Q2",
+const _marko_componentType = "davWuRny",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.___renderAssets = renderAssets;

diff --git a/...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack5/server--main.js b/...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack5/server--main.js
@@ -154,7 +154,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "xbStr3Q2",
+const _marko_componentType = "davWuRny",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "_marko_webpack";

diff --git a/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/webpack4/server--main.js
@@ -250,7 +250,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "ntnz89r6",
+const _marko_componentType = "m9fvJeia",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.___renderAssets = renderAssets;

diff --git a/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/webpack5/server--main.js
@@ -152,7 +152,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "ntnz89r6",
+const _marko_componentType = "m9fvJeia",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "_marko_webpack";

diff --git a/src/__tests__/fixtures/with-public-path/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/with-public-path/__snapshots__/webpack4/server--main.js
@@ -210,7 +210,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "xGHmCIBi",
+const _marko_componentType = "xfzq196l",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.___renderAssets = renderAssets;

diff --git a/src/__tests__/fixtures/with-public-path/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/with-public-path/__snapshots__/webpack5/server--main.js
@@ -110,7 +110,7 @@ function renderAssets(out) {
 
 
 
-const _marko_componentType = "xGHmCIBi",
+const _marko_componentType = "xfzq196l",
       _marko_component = {};
 _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
   out.global.runtimeId = "_marko_webpack";

diff --git a/src/__tests__/main.ts b/src/__tests__/main.ts
@@ -32,6 +32,7 @@ for (const [version, webpack] of Object.entries({ webpack4, webpack5 })) {
       test(`${name}`, async () => {
         const fixtureDir = path.join(fixturesDir, name);
         const snapshotDir = path.join(fixtureDir, "__snapshots__", version);
+        await fs.promises.mkdir(snapshotDir, { recursive: true });
         const remainingSnapshots = fs.readdirSync(snapshotDir);
         const configPath = path.join(fixtureDir, "webpack.config.ts");
         const { outputPath, outputFS, stats } = await compilation(

diff --git a/src/loader/index.ts b/src/loader/index.ts
@@ -150,7 +150,7 @@ export default async function (
           pluginOptions.runtimeId,
           compiler.options.output.publicPath
         ),
-        resourcePath,
+        resourcePath.replace(/\.marko$/, "-server-entry.marko"),
         baseConfig
       );
 
@@ -242,7 +242,7 @@ function getTrailingContent(
     }
   }
 
-  if (ctx.hot) {
+  if (ctx.hot && ctx.resourceQuery !== "?browser-entry") {
     result += "\nif (import.meta.webpackHot) import.meta.webpackHot.accept()";
   }