-
Notifications
You must be signed in to change notification settings - Fork 49.9k
Flight: Support Webpack v5 #20524
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.
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
Closed
samcooke98
wants to merge
6
commits into
facebook:master
from
samcooke98:samc/server-components-misc
Closed
Flight: Support Webpack v5 #20524
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c3f621d
Flight-webpack: Include ts\tsx\jsx modules as well
samcooke98 2a6c136
Add tests
samcooke98 71b978f
Extend the test to include named imports
samcooke98 dbe62f8
Add webpack v5 specific API's
samcooke98 3135386
Refactor to reduce code duplication
samcooke98 61d3dc8
Prettier & Linting
samcooke98 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add tests
- This commit adds tests running in both webpack v4 and webpack v5. - Interestingly, both pass - I expected webpack v5 too fail. Will investigate
- Loading branch information
commit 2a6c13676ed9eebc56d1c0881e9429bb14f76295
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
packages/react-server-dom-webpack/src/__tests__/ReactFlightWebpackPlugin-test.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| const webpack5 = require('webpack5'); | ||
| const webpack4 = require('webpack'); | ||
| const path = require('path'); | ||
| const os = require('os'); | ||
| const FlightPlugin = require('../ReactFlightWebpackPlugin').default; | ||
|
|
||
| describe('ReactFlightWebpackPlugin', () => { | ||
| // Probably too big a timeout. | ||
| jest.setTimeout(5000 * 5); | ||
|
|
||
| test('produces manifest - webpack v4', done => { | ||
| const entry = path.resolve(path.join(__dirname, 'fixture', 'entry.js')); | ||
|
|
||
| const plugin = new FlightPlugin({isServer: false}); | ||
|
|
||
| const output = webpack4({ | ||
| entry, | ||
| plugins: [plugin], | ||
| output: { | ||
| // Output | ||
| path: path.resolve(path.join(os.tmpdir(), 'output')), | ||
| }, | ||
| mode: 'development', | ||
| }); | ||
|
|
||
| output.run((err, stats) => { | ||
| expect(err).toBeNull(); | ||
| const fileName = plugin.manifestFilename; //'react-client-manifest.json' | ||
|
|
||
| const pluginOutput = stats.compilation.assets[fileName]; | ||
| console.log(pluginOutput); | ||
|
|
||
| const producedManifest = pluginOutput.source(); | ||
|
|
||
| const manifest = JSON.parse(producedManifest); | ||
| // The key uses the absolute filename, which means we can't snapshot it. | ||
| const key = | ||
| 'file://' + | ||
| path.resolve(path.join(__dirname, 'fixture', 'Form.client.js')); | ||
|
|
||
| expect(manifest[key]).toMatchInlineSnapshot(` | ||
| Object { | ||
| "": Object { | ||
| "chunks": Array [ | ||
| "main", | ||
| ], | ||
| "id": "./packages/react-server-dom-webpack/src/__tests__/fixture/Form.client.js", | ||
| "name": "", | ||
| }, | ||
| "*": Object { | ||
| "chunks": Array [ | ||
| "main", | ||
| ], | ||
| "id": "./packages/react-server-dom-webpack/src/__tests__/fixture/Form.client.js", | ||
| "name": "*", | ||
| }, | ||
| "true": Object { | ||
| "chunks": Array [ | ||
| "main", | ||
| ], | ||
| "id": "./packages/react-server-dom-webpack/src/__tests__/fixture/Form.client.js", | ||
| "name": true, | ||
| }, | ||
| } | ||
| `); | ||
|
|
||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
| test('produces manifest - webpack v5', done => { | ||
| const entry = path.resolve(path.join(__dirname, 'fixture', 'entry.js')); | ||
|
|
||
| const plugin = new FlightPlugin({isServer: false}); | ||
| const fileName = plugin.manifestFilename; | ||
|
|
||
| const output = webpack5({ | ||
| entry: { | ||
| main: entry, | ||
| client: path.resolve(path.join(__dirname, 'fixture', 'Form.client.js')), | ||
| }, | ||
| plugins: [plugin], | ||
| cache: undefined, | ||
| output: { | ||
| // Output | ||
| path: path.resolve(path.join(os.tmpdir(), 'output')), | ||
| }, | ||
| mode: 'development', | ||
| }); | ||
|
|
||
| const originalFileSystem = output.outputFileSystem; | ||
|
|
||
| output.outputFileSystem = { | ||
| ...originalFileSystem, | ||
| writeFile: (dest, contents, err) => { | ||
| if (dest.includes(fileName)) { | ||
| assert(contents.toString()); | ||
| done(); | ||
| } | ||
| }, | ||
| }; | ||
|
|
||
| output.run((err, stats, foo) => { | ||
| expect(err).toBeNull(); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| function assert(manifestContents) { | ||
| const key = | ||
| 'file://' + path.resolve(path.join(__dirname, 'fixture', 'Form.client.js')); | ||
| expect(JSON.parse(manifestContents)[key]).toMatchInlineSnapshot(` | ||
| Object { | ||
| "": Object { | ||
| "chunks": Array [ | ||
| "client", | ||
| ], | ||
| "id": "./packages/react-server-dom-webpack/src/__tests__/fixture/Form.client.js", | ||
| "name": "", | ||
| }, | ||
| "*": Object { | ||
| "chunks": Array [ | ||
| "client", | ||
| ], | ||
| "id": "./packages/react-server-dom-webpack/src/__tests__/fixture/Form.client.js", | ||
| "name": "*", | ||
| }, | ||
| "undefined": Object { | ||
| "chunks": Array [ | ||
| "client", | ||
| ], | ||
| "id": "./packages/react-server-dom-webpack/src/__tests__/fixture/Form.client.js", | ||
| }, | ||
| } | ||
| `); | ||
| } |
4 changes: 4 additions & 0 deletions
4
packages/react-server-dom-webpack/src/__tests__/fixture/Form.client.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
|
|
||
| module.exports = function Form() { | ||
| console.log('Form Rendered!') | ||
| } |
4 changes: 4 additions & 0 deletions
4
packages/react-server-dom-webpack/src/__tests__/fixture/FormServer.server.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
|
|
||
| module.exports = function Form() { | ||
| console.log('Form Rendered! On the server') | ||
| } |
8 changes: 8 additions & 0 deletions
8
packages/react-server-dom-webpack/src/__tests__/fixture/entry.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
|
|
||
| const ClientComponent = require('./Form.client'); | ||
| const ServerComponent = require('./FormServer.server.js'); | ||
|
|
||
| console.log( | ||
| ClientComponent, | ||
| ServerComponent | ||
| ); |
3 changes: 3 additions & 0 deletions
3
packages/react-server-dom-webpack/src/__tests__/fixture/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "name": "fixture" | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, this should be a devDependency.