GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 16:01:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14747 from storybookjs/angular/fix-windows

Browse Source 
Angular: Fix windows path for tsconfig
This commit is contained in:
Michael Shilman 2021-04-29 11:27:40 +08:00 committed by GitHub
commit b41d15d39f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/angular/src/server/angular-devkit-build-webpack.ts
View File

@ -7,7 +7,7 @@
import path from 'path';
import webpack from 'webpack';
import { normalize, resolve, workspaces } from '@angular-devkit/core';
import { normalize, resolve, workspaces, getSystemPath } from '@angular-devkit/core';
import { createConsoleLogger } from '@angular-devkit/core/node';
// Only type, so not dependent on the client version
@ -91,13 +91,19 @@ const buildWebpackConfigOptions = async (
);
}
const workspaceRoot = normalize(dirToSearch);
const projectRoot = resolve(workspaceRoot, normalize((project.root as string) || ''));
const sourceRoot = project.sourceRoot
? resolve(workspaceRoot, normalize(project.sourceRoot))
const workspaceRootNormalized = normalize(dirToSearch);
const projectRootNormalized = resolve(
workspaceRootNormalized,
normalize((project.root as string) || '')
);
const sourceRootNormalized = project.sourceRoot
? resolve(workspaceRootNormalized, normalize(project.sourceRoot))
: undefined;
const tsConfigPath = path.resolve(workspaceRoot, projectBuildOptions.tsConfig as string);
const tsConfigPath = path.resolve(
getSystemPath(workspaceRootNormalized),
projectBuildOptions.tsConfig as string
);
const tsConfig = importAngularCliReadTsconfigUtil().readTsconfig(tsConfigPath);
const ts = await import('typescript');
@ -118,9 +124,9 @@ const buildWebpackConfigOptions = async (
...projectBuildOptions,
assets: normalizeAssetPatterns(
(projectBuildOptions.assets as any[]) || [],
workspaceRoot,
projectRoot,
sourceRoot
workspaceRootNormalized,
projectRootNormalized,
sourceRootNormalized
),
optimization: (projectBuildOptions.optimization as any) ?? {
styles: {},
@ -134,11 +140,11 @@ const buildWebpackConfigOptions = async (
};
return {
root: workspaceRoot,
root: getSystemPath(workspaceRootNormalized),
// The dependency of `@angular-devkit/build-angular` to `@angular-devkit/core` is not exactly the same version as the one for storybook (node modules of node modules ^^)
logger: (createConsoleLogger() as unknown) as WebpackConfigOptions['logger'],
projectRoot,
sourceRoot,
projectRoot: getSystemPath(projectRootNormalized),
sourceRoot: getSystemPath(sourceRootNormalized),
buildOptions,
tsConfig,
tsConfigPath,