-
-
Notifications
You must be signed in to change notification settings - Fork 9.4k
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
Angular: Add built-in Ivy support instead of relying on addon #15229
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
This file contains 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,54 @@ | ||
import { Configuration } from 'webpack'; | ||
import { process as ngccProcess } from '@angular/compiler-cli/ngcc'; | ||
import * as path from 'path'; | ||
import { Options } from './framework-preset-angular-cli'; | ||
|
||
/** | ||
* Run ngcc for converting modules to ivy format before starting storybook | ||
* This step is needed in order to support Ivy in storybook | ||
* | ||
* Information about Ivy can be found here https://angular.io/guide/ivy | ||
*/ | ||
export const runNgcc = () => { | ||
ngccProcess({ | ||
// should be async: true but does not work due to | ||
// https://github.com/storybookjs/storybook/pull/11157/files#r615413803 | ||
async: false, | ||
basePath: path.join(process.cwd(), 'node_modules'), // absolute path to node_modules | ||
createNewEntryPointFormats: true, // --create-ivy-entry-points | ||
compileAllFormats: false, // --first-only | ||
}); | ||
}; | ||
|
||
export const webpack = async (webpackConfig: Configuration, options: Options) => { | ||
const angularOptions = await options.presets.apply( | ||
'angularOptions', | ||
{} as { | ||
enableIvy?: boolean; | ||
}, | ||
options | ||
); | ||
|
||
// Default to true, if undefined | ||
if (angularOptions.enableIvy === false) { | ||
kroeder marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return webpackConfig; | ||
} | ||
|
||
runNgcc(); | ||
|
||
return { | ||
...webpackConfig, | ||
resolve: { | ||
...webpackConfig.resolve, | ||
mainFields: [ | ||
'es2015_ivy_ngcc', | ||
'module_ivy_ngcc', | ||
'main_ivy_ngcc', | ||
'es2015', | ||
'browser', | ||
'module', | ||
'main', | ||
], | ||
}, | ||
}; | ||
}; |
This file contains 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
This file contains 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,7 @@ | ||
import { StorybookConfig as BaseConfig } from '@storybook/core-common'; | ||
|
||
export interface StorybookConfig extends BaseConfig { | ||
angularOptions?: { | ||
enableIvy: boolean; | ||
}; | ||
} |
This file contains 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 |
---|---|---|
|
@@ -15,4 +15,7 @@ module.exports = { | |
core: { | ||
builder: 'webpack4', | ||
}, | ||
angularOptions: { | ||
enableIvy: true, | ||
}, | ||
}; |
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.
Shouldn't we change this or should we wait ?
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.
It does work without being async. The downside is if someone starts the user app + storybook at the same time and both start
ngcc
then storybook will most likely crashSo it's an edge case but it also does not work yet to set it to async