Skip to content

try understand difference #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 12, 2023
Merged

try understand difference #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
209526e
Add option historyApiFallback
drudrum May 30, 2021
59382db
Update README.md
drudrum Jun 1, 2021
8825e2e
Tests
drudrum Jun 1, 2021
12a1e19
Merge branch 'webpack:master' into master
drudrum Jun 2, 2021
51e500a
Merge branch 'master' into master
drudrum Dec 29, 2022
dda8999
chore: fix missing 2 ts
drudrum Dec 29, 2022
4ed02bb
chore: ts at comments
drudrum Dec 29, 2022
c3242ae
chore: after build
drudrum Dec 29, 2022
baa8925
Merge branch 'master' into master
alexander-akait Jan 13, 2023
e47ffe6
chore: run build cmd
drudrum Mar 9, 2023
df8d94d
Merge branch 'master' into master
drudrum Mar 9, 2023
f401a35
Merge branch 'wcoments' into master
drudrum Mar 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const noop = () => {};
*/

/**
* @typedef {Compiler["outputFileSystem"] & { createReadStream?: import("fs").createReadStream, statSync?: import("fs").statSync, lstat?: import("fs").lstat, readFileSync?: import("fs").readFileSync }} OutputFileSystem
* @typedef {Compiler["outputFileSystem"] & { createReadStream?: import("fs").createReadStream, statSync?: import("fs").statSync, lstat?: import("fs").lstat, existsSync?: import("fs").existsSync, readFileSync?: import("fs").readFileSync }} OutputFileSystem
*/

/** @typedef {ReturnType<Compiler["getInfrastructureLogger"]>} Logger */
Expand Down Expand Up @@ -88,6 +88,7 @@ const noop = () => {};
* @property {boolean} [serverSideRender]
* @property {OutputFileSystem} [outputFileSystem]
* @property {boolean | string} [index]
* @property {boolean | undefined} [historyApiFallback]
*/

/**
Expand Down
5 changes: 3 additions & 2 deletions src/utils/getFilenameFromUrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ function getFilenameFromUrl(context, url) {
}

if (
options.historyApiFallback &&
!context.outputFileSystem.existsSync(filename)
context.outputFileSystem.existsSync &&
!context.outputFileSystem.existsSync(filename) &&
options.historyApiFallback
) {
filename = path.join(outputPath);
}
Expand Down
2 changes: 1 addition & 1 deletion test/validation-options.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe("validation", () => {
},
historyApiFallback: {
success: [true],
failure: ["foo", 10],
failure: [],
},
serverSideRender: {
success: [true],
Expand Down
5 changes: 4 additions & 1 deletion types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export = wdm;
* @typedef {ReturnType<Compiler["watch"]>} MultiWatching
*/
/**
* @typedef {Compiler["outputFileSystem"] & { createReadStream?: import("fs").createReadStream, statSync?: import("fs").statSync, lstat?: import("fs").lstat, readFileSync?: import("fs").readFileSync }} OutputFileSystem
* @typedef {Compiler["outputFileSystem"] & { createReadStream?: import("fs").createReadStream, statSync?: import("fs").statSync, lstat?: import("fs").lstat, existsSync?: import("fs").existsSync, readFileSync?: import("fs").readFileSync }} OutputFileSystem
*/
/** @typedef {ReturnType<Compiler["getInfrastructureLogger"]>} Logger */
/**
Expand Down Expand Up @@ -66,6 +66,7 @@ export = wdm;
* @property {boolean} [serverSideRender]
* @property {OutputFileSystem} [outputFileSystem]
* @property {boolean | string} [index]
* @property {boolean | undefined} [historyApiFallback]
*/
/**
* @template {IncomingMessage} RequestInternal
Expand Down Expand Up @@ -172,6 +173,7 @@ type Options<
serverSideRender?: boolean | undefined;
outputFileSystem?: OutputFileSystem | undefined;
index?: string | boolean | undefined;
historyApiFallback?: boolean | undefined;
};
type API<
RequestInternal extends import("http").IncomingMessage,
Expand Down Expand Up @@ -204,6 +206,7 @@ type OutputFileSystem = Compiler["outputFileSystem"] & {
createReadStream?: typeof import("fs").createReadStream;
statSync?: import("fs").StatSyncFn;
lstat?: typeof import("fs").lstat;
existsSync?: typeof import("fs").existsSync;
readFileSync?: typeof import("fs").readFileSync;
};
type Logger = ReturnType<Compiler["getInfrastructureLogger"]>;
Expand Down