From 49982f6bcbae3884dc8ecc5530c45b13e2e460f2 Mon Sep 17 00:00:00 2001 From: Thibaud Av Date: Tue, 11 Jan 2022 22:39:12 +0100 Subject: [PATCH 1/3] fix(angular): fix ts build with angular 13.0 --- app/angular/src/server/angular-cli-webpack-13.x.x.js | 4 ++-- app/angular/src/server/framework-preset-angular-cli.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/angular/src/server/angular-cli-webpack-13.x.x.js b/app/angular/src/server/angular-cli-webpack-13.x.x.js index 0b74d3af9889..c8c87041cf20 100644 --- a/app/angular/src/server/angular-cli-webpack-13.x.x.js +++ b/app/angular/src/server/angular-cli-webpack-13.x.x.js @@ -6,7 +6,7 @@ const { getCommonConfig, getStylesConfig, getDevServerConfig, - getTypescriptWorkerPlugin, + getTypeScriptConfig, } = require('@angular-devkit/build-angular/src/webpack/configs'); const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'); @@ -45,7 +45,7 @@ exports.getWebpackConfig = async (baseConfig, { builderOptions, builderContext } (wco) => [ getCommonConfig(wco), getStylesConfig(wco), - getTypescriptWorkerPlugin ? getTypescriptWorkerPlugin(wco) : getDevServerConfig(wco), + getTypeScriptConfig ? getTypeScriptConfig(wco) : getDevServerConfig(wco), ] ); diff --git a/app/angular/src/server/framework-preset-angular-cli.ts b/app/angular/src/server/framework-preset-angular-cli.ts index 714db63557ea..3ed039ccca0f 100644 --- a/app/angular/src/server/framework-preset-angular-cli.ts +++ b/app/angular/src/server/framework-preset-angular-cli.ts @@ -47,8 +47,8 @@ export async function webpackFinal(baseConfig: webpack.Configuration, options: P return getWebpackConfig13_x_x(_baseConfig, { builderOptions: { watch: options.configType === 'DEVELOPMENT', - ...builderOptions, ...legacyDefaultOptions, + ...builderOptions, }, builderContext, }); From fe9d7b0124532e51077b33ecfe7f66a3f44a5128 Mon Sep 17 00:00:00 2001 From: Thibaud Av Date: Tue, 11 Jan 2022 22:39:50 +0100 Subject: [PATCH 2/3] ci(angular): add e2e test with angular 13.0 and 13.x --- .circleci/config.yml | 2 +- lib/cli/src/repro-generators/configs.ts | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4407913d14a5..19a248b8e0db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -222,7 +222,7 @@ jobs: # Do not test CRA here because it's done in PnP part # TODO: Remove `web_components_typescript` as soon as Lit 2 stable is released # TODO: Add `angular` as soon as Storybook is compatible with Angular 13 - command: yarn test:e2e-framework vue3 angular12 angular11 web_components_typescript web_components_lit2 + command: yarn test:e2e-framework vue3 angular130 angular13 angular12 angular11 web_components_typescript web_components_lit2 no_output_timeout: 5m - store_artifacts: path: /tmp/cypress-record diff --git a/lib/cli/src/repro-generators/configs.ts b/lib/cli/src/repro-generators/configs.ts index d9d1238e6973..629e3884007a 100644 --- a/lib/cli/src/repro-generators/configs.ts +++ b/lib/cli/src/repro-generators/configs.ts @@ -117,6 +117,18 @@ export const angular12: Parameters = { version: 'v12-lts', }; +export const angular130: Parameters = { + ...baseAngular, + name: 'angular130', + version: '13.0.x', +}; + +export const angular13: Parameters = { + ...baseAngular, + name: 'angular13', + version: '13.1.x', +}; + export const angular: Parameters = baseAngular; // #endregion From ad72f05e92cc48e5a156c9f24d7a8847a7944f62 Mon Sep 17 00:00:00 2001 From: Thibaud Av Date: Wed, 12 Jan 2022 00:27:56 +0100 Subject: [PATCH 3/3] fix(angular): fix sb init with angular 13 --- .../generators/ANGULAR/template-csf/.storybook/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/cli/src/generators/ANGULAR/template-csf/.storybook/tsconfig.json b/lib/cli/src/generators/ANGULAR/template-csf/.storybook/tsconfig.json index 28aadc68fd9a..b1e810022ba0 100644 --- a/lib/cli/src/generators/ANGULAR/template-csf/.storybook/tsconfig.json +++ b/lib/cli/src/generators/ANGULAR/template-csf/.storybook/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "%SET_DURING_SB_INIT%", "compilerOptions": { - "types": ["node"] + "types": ["node"], + "allowSyntheticDefaultImports": true }, "exclude": ["../src/test.ts", "../src/**/*.spec.ts", "../projects/**/*.spec.ts"], "include": ["../src/**/*", "../projects/**/*"],