diff --git a/package-lock.json b/package-lock.json index 6e58a45..414c551 100644 --- a/package-lock.json +++ b/package-lock.json @@ -948,9 +948,9 @@ } }, "@marko/babel-utils": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-5.7.0.tgz", - "integrity": "sha512-VG5VqBasr5s2R7wARmIBpQYZoLytSoBL2YwQGOiSbGatxHh3rT2ZDTSP/EQ7Ue3Evjnr/T33+gi5jFdIPXbDxg==", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-5.8.1.tgz", + "integrity": "sha512-mBAphT7B1GUANKM3wVvbwnnrqcleYhbnso7OTcXm/8q1vx5rgE5l/EBtqbQohsndWDEW+yyU659Ur1JjbbJ/9w==", "dev": true, "requires": { "@babel/runtime": "^7.13.10", @@ -958,9 +958,9 @@ } }, "@marko/compiler": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.7.0.tgz", - "integrity": "sha512-TvrDbhds8/GkfgkjmXHnJbmAVM082IuFEy3CF0QekNDU2q/9XWwu6rMje5s2HBlt32e7LuYcaJqdSKY1I9389Q==", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.8.1.tgz", + "integrity": "sha512-23krypN/9BjBynvYmfwR0XM9SMKyLSx8DNU1kEBpMPq6SZN5j0M//e9gkJNENiItVuJH3ed/DQv6F0L9wlzY8g==", "dev": true, "requires": { "@babel/code-frame": "^7.12.13", @@ -971,7 +971,7 @@ "@babel/runtime": "^7.13.10", "@babel/traverse": "^7.13.0", "@babel/types": "^7.13.0", - "@marko/babel-utils": "^5.7.0", + "@marko/babel-utils": "^5.8.1", "complain": "^1.6.0", "enhanced-resolve": "5.7.0", "he": "^1.2.0", @@ -988,13 +988,13 @@ } }, "@marko/translator-default": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@marko/translator-default/-/translator-default-5.7.0.tgz", - "integrity": "sha512-MenCFO9oduc8HpB9D9F7BHHXxfhTPUvw6AfBJtbMetcPYhCv76Lc/UACGUOx1nc5NI5FDs09uny/nymrhN+fSw==", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@marko/translator-default/-/translator-default-5.8.1.tgz", + "integrity": "sha512-jtbhFjRjPcQmEI2hnz6Sn6Z7boIzwT+tHEJuFR3Q0vpiO7dC0yDf3gQiTDaPe35b8GUuJ7YCI0dlliN4goGxFw==", "dev": true, "requires": { "@babel/runtime": "^7.13.10", - "@marko/babel-utils": "^5.7.0", + "@marko/babel-utils": "^5.8.1", "escape-string-regexp": "^4.0.0", "magic-string": "^0.25.7", "self-closing-tags": "^1.0.1" @@ -6971,13 +6971,13 @@ } }, "marko": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/marko/-/marko-5.7.0.tgz", - "integrity": "sha512-jjarM46SHNKefyV3A71kcyL3DxY5HLiGmr3EZyv6KiMksxu4jP0s2HmizPBaMgHrMwAXF2iS3aVj/82Znw4zHA==", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/marko/-/marko-5.8.1.tgz", + "integrity": "sha512-jdJMV4O3U0l1bVz8FhZATrkmnDA2JZvh2SHmVudXRtQqIjViryKzM7r7BjHB0hkSDeU/yZaW47oYb9Bbf3julg==", "dev": true, "requires": { - "@marko/compiler": "^5.7.0", - "@marko/translator-default": "^5.7.0", + "@marko/compiler": "^5.8.1", + "@marko/translator-default": "^5.8.1", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", diff --git a/package.json b/package.json index 53eb9b8..f89ed97 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "devDependencies": { "@commitlint/cli": "^11.0.0", "@commitlint/config-conventional": "^11.0.0", - "@marko/compiler": "^5.7.0", + "@marko/compiler": "^5.8.1", "@types/jest": "^26.0.20", "@types/loader-utils": "^2.0.1", "@types/node": "^14.14.22", @@ -28,7 +28,7 @@ "jest": "^26.6.3", "jest-file-snapshot": "0.3.8", "lint-staged": "^10.5.3", - "marko": "^5.7.0", + "marko": "^5.8.1", "memory-fs": "^0.5.0", "mini-css-extract-plugin": "^1.3.5", "prettier": "^2.2.1", diff --git a/src/loader/index.ts b/src/loader/index.ts index 81edc7d..ebe6197 100644 --- a/src/loader/index.ts +++ b/src/loader/index.ts @@ -20,6 +20,7 @@ type LoaderOptions = loaderUtils.OptionObject & Config & { target?: webpack.loader.LoaderContext["target"]; compiler?: string; + hydrateIncludeImports?: string | Config["hydrateIncludeImports"]; }; const WATCH_MISSING_FILES = [ @@ -136,6 +137,10 @@ export default async function ( } } as Config; + if (loaderOptions.hydrateIncludeImports) { + baseConfig.hydrateIncludeImports = loaderOptions.hydrateIncludeImports; + } + if (resourceQuery === "?server-entry") { const { code, map } = await markoCompiler.compile( getAssetCode(