html-render-webpack-plugin 3.0.1 → 3.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/test.yml +5 -8
- package/dist/evaluateFromFileSystem.js +3 -1
- package/dist/evaluateFromFileSystem.js.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/renderRoutes.d.ts +2 -2
- package/dist/renderRoutes.js +1 -1
- package/dist/renderRoutes.js.map +1 -1
- package/package.json +1 -1
- package/src/evaluateFromFileSystem.ts +3 -1
- package/src/index.ts +6 -2
- package/src/renderRoutes.ts +5 -2
- package/tests/test-cases/render-when-ready/render-when-ready.test.ts +4 -1
|
@@ -1,20 +1,17 @@
|
|
|
1
1
|
name: Test
|
|
2
2
|
|
|
3
|
-
on: [push]
|
|
3
|
+
on: [push, pull_request]
|
|
4
4
|
|
|
5
5
|
jobs:
|
|
6
6
|
test:
|
|
7
7
|
name: Test
|
|
8
8
|
runs-on: ubuntu-18.04
|
|
9
9
|
steps:
|
|
10
|
-
-
|
|
11
|
-
|
|
10
|
+
- uses: actions/checkout@v3
|
|
11
|
+
- uses: actions/setup-node@v3
|
|
12
12
|
with:
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
uses: actions/setup-node@v1
|
|
16
|
-
with:
|
|
17
|
-
node-version: 12
|
|
13
|
+
node-version-file: ".nvmrc"
|
|
14
|
+
cache: "yarn"
|
|
18
15
|
- name: Install dependencies
|
|
19
16
|
run: yarn install --frozen-lockfile
|
|
20
17
|
- name: Lint
|
|
@@ -33,7 +33,9 @@ function createLinker(parentModulePath, fsModule, rootDir, extraGlobals) {
|
|
|
33
33
|
const absPath = path_1.default.join(path_1.default.dirname(parentModulePath), specifier);
|
|
34
34
|
if (!getFromSourceModules(specifier, fsModule, rootDir)) {
|
|
35
35
|
logging_1.log(`Using external require for ${specifier} from ${parentModulePath}`);
|
|
36
|
-
|
|
36
|
+
const resolvedPath = require.resolve(specifier, { paths: [rootDir] });
|
|
37
|
+
logging_1.log(`Resolved ${specifier} as external package to ${resolvedPath}`);
|
|
38
|
+
return require(resolvedPath);
|
|
37
39
|
}
|
|
38
40
|
logging_1.log(`Linking ${parentModulePath} to asset ${specifier}`);
|
|
39
41
|
return evaluateFromFileSystem(absPath, fsModule, rootDir, extraGlobals);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluateFromFileSystem.js","sourceRoot":"","sources":["../src/evaluateFromFileSystem.ts"],"names":[],"mappings":";;;;AAAA,gDAAwB;AACxB,gDAA4B;AAG5B,uCAAgC;AAEhC,SAAS,oBAAoB,CAC3B,SAAiB,EACjB,QAAoB,EACpB,OAAe;IAEf,MAAM,qBAAqB,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7D,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,EAAE;QACtE,aAAG,CACD,iCAAiC,qBAAqB,WAAW,OAAO,GAAG,CAC5E,CAAC;QACF,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,QAAQ,CAAC,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,sBAAsB,CAC7B,SAAiB,EACjB,QAAoB,EACpB,OAAe,EACf,YAA0B;IAE1B,aAAG,CACD,yBAAyB,SAAS,4BAA4B,OAAO,IAAI,CAC1E,CAAC;IACF,IAAI,MAAM,CAAC;IACX,IAAI;QACF,MAAM,GAAG,oBAAoB,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC7D;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,qBAAqB,SAAS,aAAa,KAAK,EAAE,CAAC,CAAC;KACrE;IACD,OAAO,cAAQ,CACb,MAAM;IACN,eAAe,CAAC,SAAS,gCAEvB,OAAO;QACP,OAAO,IACJ,CAAC,YAAY,IAAI,EAAE,CAAC,KACvB,OAAO,EAAE,YAAY,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC;IAEnE,qBAAqB,CAAC,IAAI,CAC3B,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,gBAAwB,EACxB,QAAoB,EACpB,OAAe,EACf,YAA0B;IAE1B,aAAG,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;IAC7C,OAAO,SAAS,MAAM,CAAC,SAAiB;QACtC,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE;YACvD,aAAG,CAAC,8BAA8B,SAAS,SAAS,gBAAgB,EAAE,CAAC,CAAC;YACxE,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"evaluateFromFileSystem.js","sourceRoot":"","sources":["../src/evaluateFromFileSystem.ts"],"names":[],"mappings":";;;;AAAA,gDAAwB;AACxB,gDAA4B;AAG5B,uCAAgC;AAEhC,SAAS,oBAAoB,CAC3B,SAAiB,EACjB,QAAoB,EACpB,OAAe;IAEf,MAAM,qBAAqB,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7D,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,EAAE;QACtE,aAAG,CACD,iCAAiC,qBAAqB,WAAW,OAAO,GAAG,CAC5E,CAAC;QACF,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,QAAQ,CAAC,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,sBAAsB,CAC7B,SAAiB,EACjB,QAAoB,EACpB,OAAe,EACf,YAA0B;IAE1B,aAAG,CACD,yBAAyB,SAAS,4BAA4B,OAAO,IAAI,CAC1E,CAAC;IACF,IAAI,MAAM,CAAC;IACX,IAAI;QACF,MAAM,GAAG,oBAAoB,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC7D;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,qBAAqB,SAAS,aAAa,KAAK,EAAE,CAAC,CAAC;KACrE;IACD,OAAO,cAAQ,CACb,MAAM;IACN,eAAe,CAAC,SAAS,gCAEvB,OAAO;QACP,OAAO,IACJ,CAAC,YAAY,IAAI,EAAE,CAAC,KACvB,OAAO,EAAE,YAAY,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC;IAEnE,qBAAqB,CAAC,IAAI,CAC3B,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,gBAAwB,EACxB,QAAoB,EACpB,OAAe,EACf,YAA0B;IAE1B,aAAG,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;IAC7C,OAAO,SAAS,MAAM,CAAC,SAAiB;QACtC,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE;YACvD,aAAG,CAAC,8BAA8B,SAAS,SAAS,gBAAgB,EAAE,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACtE,aAAG,CAAC,YAAY,SAAS,2BAA2B,YAAY,EAAE,CAAC,CAAC;YACpE,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;SAC9B;QACD,aAAG,CAAC,WAAW,gBAAgB,aAAa,SAAS,EAAE,CAAC,CAAC;QACzD,OAAO,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IAC1E,CAAC,CAAC;AACJ,CAAC;AAED,iBAAS,sBAAsB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -59,7 +59,11 @@ class HtmlRenderPlugin {
|
|
|
59
59
|
return result;
|
|
60
60
|
}
|
|
61
61
|
catch (error) {
|
|
62
|
-
|
|
62
|
+
logging_1.log(`Error rendering ${route.route}`);
|
|
63
|
+
if (error) {
|
|
64
|
+
error.route = route.route;
|
|
65
|
+
error.webpackStats = webpackStats;
|
|
66
|
+
}
|
|
63
67
|
throw error;
|
|
64
68
|
}
|
|
65
69
|
});
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/renderRoutes.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RenderConcurrency, TransformPath, Render } from "./common-types";
|
|
1
|
+
import { RenderConcurrency, TransformPath, Render, BaseRoute } from "./common-types";
|
|
2
2
|
import { Compilation } from "webpack";
|
|
3
3
|
interface Params<Route> {
|
|
4
4
|
render: Render<Route>;
|
|
@@ -9,5 +9,5 @@ interface Params<Route> {
|
|
|
9
9
|
renderCompilation: Compilation;
|
|
10
10
|
transformFilePath: TransformPath<Route>;
|
|
11
11
|
}
|
|
12
|
-
export default function renderRoutes<Route>({ render: performRender, renderConcurrency, routes, renderDirectory, renderCompilation, transformFilePath, }: Params<Route>): Promise<void[] | undefined>;
|
|
12
|
+
export default function renderRoutes<Route extends BaseRoute>({ render: performRender, renderConcurrency, routes, renderDirectory, renderCompilation, transformFilePath, }: Params<Route>): Promise<void[] | undefined>;
|
|
13
13
|
export {};
|
package/dist/renderRoutes.js
CHANGED
|
@@ -76,7 +76,7 @@ function renderRoutes({ render: performRender, renderConcurrency, routes, render
|
|
|
76
76
|
renderResult = yield performRender(route);
|
|
77
77
|
}
|
|
78
78
|
catch (error) {
|
|
79
|
-
console.error(`🚨 ${chalk_1.default.red(`An error occurred rendering "`)}
|
|
79
|
+
console.error(`🚨 ${chalk_1.default.red(`An error occurred rendering route: "${route.route}"`)}. Exiting render.`);
|
|
80
80
|
throw error;
|
|
81
81
|
}
|
|
82
82
|
if (typeof renderResult !== "string") {
|
package/dist/renderRoutes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderRoutes.js","sourceRoot":"","sources":["../src/renderRoutes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,kDAA0B;
|
|
1
|
+
{"version":3,"file":"renderRoutes.js","sourceRoot":"","sources":["../src/renderRoutes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,kDAA0B;AAS1B,uCAAgC;AAYhC,SAAS,SAAS,CAAC,UAAsB,EAAE,GAAW;IACpD,0DAA0D;IAC1D,IAAI,UAAU,CAAC,MAAM,EAAE;QACrB,aAAG,CAAC,mEAAmE,CAAC,CAAC;QACzE,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,0DAA0D;YAC1D,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtC,IAAI,KAAK,EAAE;oBACT,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,OAAO;iBACR;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,KAAoB,EAAE,EAAE;YAClE,IAAI,KAAK,EAAE;gBACT,kEAAkE;gBAClE,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;oBAC3B,aAAG,CACD,8FAA8F,CAC/F,CAAC;oBACF,OAAO,EAAE,CAAC;oBACV,OAAO;iBACR;gBACD,MAAM,CAAC,KAAK,CAAC,CAAC;gBACd,OAAO;aACR;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAA8B,YAAY,CAA0B,EAClE,MAAM,EAAE,aAAa,EACrB,iBAAiB,EACjB,MAAM,EACN,eAAe,EACf,iBAAiB,EACjB,iBAAiB,GACH;;QACd,aAAG,CAAC,sBAAsB,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;QAClD,SAAe,QAAQ,CAAC,GAAW,EAAE,OAAe;;gBAClD,aAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;gBAC7B,MAAM,SAAS,CACb,iBAAiB,CAAC,QAAQ,CAAC,gBAA8B,EACzD,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAClB,CAAC;gBACF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC3C,iBAAiB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CACnD,GAAG,EACH,OAAO,EACP,CAAC,KAAK,EAAE,EAAE;oBACR,IAAI,KAAK,EAAE;wBACT,MAAM,CAAC,KAAK,CAAC,CAAC;qBACf;oBAED,OAAO,EAAE,CAAC;gBACZ,CAAC,CACF,CACF,CAAC;YACJ,CAAC;SAAA;QAED,SAAe,MAAM,CAAC,KAAY;;gBAChC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAClD,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;gBACvE,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;oBACrC,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;iBACjD;gBACD,MAAM,WAAW,GAAG,sBAAsB;oBACxC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,gBAAgB,CAAC;oBAC9C,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;gBAE/D,IAAI,YAAY,CAAC;gBACjB,IAAI;oBACF,YAAY,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;iBAC3C;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,CAAC,KAAK,CACX,MAAM,eAAK,CAAC,GAAG,CACb,uCAAuC,KAAK,CAAC,KAAK,GAAG,CACtD,mBAAmB,CACrB,CAAC;oBACF,MAAM,KAAK,CAAC;iBACb;gBAED,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;oBACpC,MAAM,IAAI,KAAK,CACb,0CAA0C,OAAO,YAAY,IAAI,CAClE,CAAC;iBACH;gBAED,MAAM,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;gBAC1C,aAAG,CAAC,wBAAwB,WAAW,EAAE,CAAC,CAAC;YAC7C,CAAC;SAAA;QACD,IAAI,iBAAiB,KAAK,UAAU,EAAE;YACpC,aAAG,CAAC,oBAAoB,CAAC,CAAC;YAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;SACxC;QACD,aAAG,CAAC,kBAAkB,CAAC,CAAC;QACxB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC;SACrB;QACD,OAAO;IACT,CAAC;CAAA;AAtED,+BAsEC"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "html-render-webpack-plugin",
|
|
3
3
|
"description": "webpack plugin for rendering static HTML in a multi-config webpack build",
|
|
4
4
|
"author": "Jahred Hope <jahredhope@gmail.com>",
|
|
5
|
-
"version": "3.0.
|
|
5
|
+
"version": "3.0.2",
|
|
6
6
|
"main": "dist/index.js",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"keywords": [
|
|
@@ -58,7 +58,9 @@ function createLinker(
|
|
|
58
58
|
const absPath = path.join(path.dirname(parentModulePath), specifier);
|
|
59
59
|
if (!getFromSourceModules(specifier, fsModule, rootDir)) {
|
|
60
60
|
log(`Using external require for ${specifier} from ${parentModulePath}`);
|
|
61
|
-
|
|
61
|
+
const resolvedPath = require.resolve(specifier, { paths: [rootDir] });
|
|
62
|
+
log(`Resolved ${specifier} as external package to ${resolvedPath}`);
|
|
63
|
+
return require(resolvedPath);
|
|
62
64
|
}
|
|
63
65
|
log(`Linking ${parentModulePath} to asset ${specifier}`);
|
|
64
66
|
return evaluateFromFileSystem(absPath, fsModule, rootDir, extraGlobals);
|
package/src/index.ts
CHANGED
|
@@ -115,8 +115,12 @@ export default class HtmlRenderPlugin<Route extends BaseRoute = BaseRoute> {
|
|
|
115
115
|
`Successfully rendered ${route.route} (${timeSince(startRenderTime)})`
|
|
116
116
|
);
|
|
117
117
|
return result;
|
|
118
|
-
} catch (error) {
|
|
119
|
-
|
|
118
|
+
} catch (error: any) {
|
|
119
|
+
log(`Error rendering ${route.route}`);
|
|
120
|
+
if (error) {
|
|
121
|
+
error.route = route.route;
|
|
122
|
+
error.webpackStats = webpackStats;
|
|
123
|
+
}
|
|
120
124
|
throw error;
|
|
121
125
|
}
|
|
122
126
|
};
|
package/src/renderRoutes.ts
CHANGED
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
TransformPath,
|
|
6
6
|
Render,
|
|
7
7
|
FileSystem,
|
|
8
|
+
BaseRoute,
|
|
8
9
|
} from "./common-types";
|
|
9
10
|
import { Compilation } from "webpack";
|
|
10
11
|
import { log } from "./logging";
|
|
@@ -53,7 +54,7 @@ function safeMkdir(fileSystem: FileSystem, dir: string) {
|
|
|
53
54
|
});
|
|
54
55
|
}
|
|
55
56
|
|
|
56
|
-
export default async function renderRoutes<Route>({
|
|
57
|
+
export default async function renderRoutes<Route extends BaseRoute>({
|
|
57
58
|
render: performRender,
|
|
58
59
|
renderConcurrency,
|
|
59
60
|
routes,
|
|
@@ -98,7 +99,9 @@ export default async function renderRoutes<Route>({
|
|
|
98
99
|
renderResult = await performRender(route);
|
|
99
100
|
} catch (error) {
|
|
100
101
|
console.error(
|
|
101
|
-
`🚨 ${chalk.red(
|
|
102
|
+
`🚨 ${chalk.red(
|
|
103
|
+
`An error occurred rendering route: "${route.route}"`
|
|
104
|
+
)}. Exiting render.`
|
|
102
105
|
);
|
|
103
106
|
throw error;
|
|
104
107
|
}
|
|
@@ -59,7 +59,10 @@ describe("renderWhenReady", () => {
|
|
|
59
59
|
|
|
60
60
|
compiler.run(async () => {
|
|
61
61
|
await expect(promise).rejects.toEqual(
|
|
62
|
-
expect.objectContaining({
|
|
62
|
+
expect.objectContaining({
|
|
63
|
+
route: "/new",
|
|
64
|
+
webpackStats: expect.any(Object),
|
|
65
|
+
})
|
|
63
66
|
);
|
|
64
67
|
done();
|
|
65
68
|
});
|