Skip to content
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: Fix 16.1 compatibility #23064

Merged
merged 2 commits into from
Jun 14, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 37 additions & 6 deletions code/frameworks/angular/src/server/angular-cli-webpack.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,48 @@
/* eslint-disable global-require */
// Private angular devkit stuff
const {
generateI18nBrowserWebpackConfigFromContext,
} = require('@angular-devkit/build-angular/src/utils/webpack-browser-config');
const {
getCommonConfig,
getStylesConfig,
getDevServerConfig,
getTypeScriptConfig,
} = require('@angular-devkit/build-angular/src/webpack/configs');
const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
const { filterOutStylingRules } = require('./utils/filter-out-styling-rules');
const {
default: StorybookNormalizeAngularEntryPlugin,
} = require('./plugins/storybook-normalize-angular-entry-plugin');

const getAngularWebpackUtils = () => {
try {
// Angular < 16.1.0
const {
getCommonConfig,
getStylesConfig,
getDevServerConfig,
getTypeScriptConfig,
} = require('@angular-devkit/build-angular/src/webpack/configs');

return {
getCommonConfig,
getStylesConfig,
getDevServerConfig,
getTypeScriptConfig,
};
} catch (e) {
// Angular > 16.1.0
const {
getCommonConfig,
getStylesConfig,
getDevServerConfig,
getTypeScriptConfig,
} = require('@angular-devkit/build-angular/src/tools/webpack/configs');

return {
getCommonConfig,
getStylesConfig,
getDevServerConfig,
getTypeScriptConfig,
};
}
};

/**
* Extract webpack config from angular-cli 13.x.x
* ⚠️ This file is in JavaScript to not use TypeScript. Because current storybook TypeScript version is not compatible with Angular CLI.
Expand All @@ -26,6 +55,8 @@ exports.getWebpackConfig = async (baseConfig, { builderOptions, builderContext }
/**
* Get angular-cli Webpack config
*/
const { getCommonConfig, getStylesConfig, getDevServerConfig, getTypeScriptConfig } =
getAngularWebpackUtils();
const { config: cliConfig } = await generateI18nBrowserWebpackConfigFromContext(
{
// Default options
Expand Down