@storybook/angular 9.1.0-alpha.5 → 9.1.0-alpha.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,7 +13,10 @@ const run_compodoc_1 = require("../utils/run-compodoc");
13
13
  (0, telemetry_1.addToGlobalContext)('cliVersion', common_1.versions.storybook);
14
14
  const commandBuilder = (options, context) => {
15
15
  const builder = (0, rxjs_1.from)(setup(options, context)).pipe((0, operators_1.switchMap)(({ tsConfig }) => {
16
- const docTSConfig = (0, find_up_1.sync)('tsconfig.doc.json', { cwd: options.configDir });
16
+ const docTSConfig = (0, find_up_1.findUpSync)('tsconfig.doc.json', {
17
+ cwd: options.configDir,
18
+ stopAt: (0, common_1.getProjectRoot)(),
19
+ });
17
20
  const runCompodoc$ = options.compodoc
18
21
  ? (0, run_compodoc_1.runCompodoc)({ compodocArgs: options.compodocArgs, tsconfig: docTSConfig ?? tsConfig }, context).pipe((0, operators_1.mapTo)({ tsConfig }))
19
22
  : (0, rxjs_1.of)({});
@@ -67,7 +70,7 @@ async function setup(options, context) {
67
70
  }
68
71
  return {
69
72
  tsConfig: options.tsConfig ??
70
- (0, find_up_1.sync)('tsconfig.json', { cwd: options.configDir }) ??
73
+ (0, find_up_1.findUpSync)('tsconfig.json', { cwd: options.configDir, stopAt: (0, common_1.getProjectRoot)() }) ??
71
74
  browserOptions.tsConfig,
72
75
  };
73
76
  }
@@ -1,9 +1,9 @@
1
- import { getEnvConfig, versions } from 'storybook/internal/common';
1
+ import { getEnvConfig, getProjectRoot, versions } from 'storybook/internal/common';
2
2
  import { buildStaticStandalone, withTelemetry } from 'storybook/internal/core-server';
3
3
  import { addToGlobalContext } from 'storybook/internal/telemetry';
4
4
  import { createBuilder, targetFromTargetString, } from '@angular-devkit/architect';
5
5
  import { findPackageSync } from 'fd-package-json';
6
- import { sync as findUpSync } from 'find-up';
6
+ import { findUpSync } from 'find-up';
7
7
  import { from, of, throwError } from 'rxjs';
8
8
  import { catchError, map, mapTo, switchMap } from 'rxjs/operators';
9
9
  import { errorSummary, printErrorDetails } from '../utils/error-handler';
@@ -11,7 +11,10 @@ import { runCompodoc } from '../utils/run-compodoc';
11
11
  addToGlobalContext('cliVersion', versions.storybook);
12
12
  const commandBuilder = (options, context) => {
13
13
  const builder = from(setup(options, context)).pipe(switchMap(({ tsConfig }) => {
14
- const docTSConfig = findUpSync('tsconfig.doc.json', { cwd: options.configDir });
14
+ const docTSConfig = findUpSync('tsconfig.doc.json', {
15
+ cwd: options.configDir,
16
+ stopAt: getProjectRoot(),
17
+ });
15
18
  const runCompodoc$ = options.compodoc
16
19
  ? runCompodoc({ compodocArgs: options.compodocArgs, tsconfig: docTSConfig ?? tsConfig }, context).pipe(mapTo({ tsConfig }))
17
20
  : of({});
@@ -65,7 +68,7 @@ async function setup(options, context) {
65
68
  }
66
69
  return {
67
70
  tsConfig: options.tsConfig ??
68
- findUpSync('tsconfig.json', { cwd: options.configDir }) ??
71
+ findUpSync('tsconfig.json', { cwd: options.configDir, stopAt: getProjectRoot() }) ??
69
72
  browserOptions.tsConfig,
70
73
  };
71
74
  }
@@ -13,7 +13,10 @@ const run_compodoc_1 = require("../utils/run-compodoc");
13
13
  (0, telemetry_1.addToGlobalContext)('cliVersion', common_1.versions.storybook);
14
14
  const commandBuilder = (options, context) => {
15
15
  const builder = (0, rxjs_1.from)(setup(options, context)).pipe((0, operators_1.switchMap)(({ tsConfig }) => {
16
- const docTSConfig = (0, find_up_1.sync)('tsconfig.doc.json', { cwd: options.configDir });
16
+ const docTSConfig = (0, find_up_1.findUpSync)('tsconfig.doc.json', {
17
+ cwd: options.configDir,
18
+ stopAt: (0, common_1.getProjectRoot)(),
19
+ });
17
20
  const runCompodoc$ = options.compodoc
18
21
  ? (0, run_compodoc_1.runCompodoc)({
19
22
  compodocArgs: [...options.compodocArgs, ...(options.quiet ? ['--silent'] : [])],
@@ -81,7 +84,7 @@ async function setup(options, context) {
81
84
  }
82
85
  return {
83
86
  tsConfig: options.tsConfig ??
84
- (0, find_up_1.sync)('tsconfig.json', { cwd: options.configDir }) ??
87
+ (0, find_up_1.findUpSync)('tsconfig.json', { cwd: options.configDir }) ??
85
88
  browserOptions.tsConfig,
86
89
  };
87
90
  }
@@ -1,9 +1,9 @@
1
- import { getEnvConfig, versions } from 'storybook/internal/common';
1
+ import { getEnvConfig, getProjectRoot, versions } from 'storybook/internal/common';
2
2
  import { buildDevStandalone, withTelemetry } from 'storybook/internal/core-server';
3
3
  import { addToGlobalContext } from 'storybook/internal/telemetry';
4
4
  import { createBuilder, targetFromTargetString, } from '@angular-devkit/architect';
5
5
  import { findPackageSync } from 'fd-package-json';
6
- import { sync as findUpSync } from 'find-up';
6
+ import { findUpSync } from 'find-up';
7
7
  import { Observable, from, of } from 'rxjs';
8
8
  import { map, mapTo, switchMap } from 'rxjs/operators';
9
9
  import { errorSummary, printErrorDetails } from '../utils/error-handler';
@@ -11,7 +11,10 @@ import { runCompodoc } from '../utils/run-compodoc';
11
11
  addToGlobalContext('cliVersion', versions.storybook);
12
12
  const commandBuilder = (options, context) => {
13
13
  const builder = from(setup(options, context)).pipe(switchMap(({ tsConfig }) => {
14
- const docTSConfig = findUpSync('tsconfig.doc.json', { cwd: options.configDir });
14
+ const docTSConfig = findUpSync('tsconfig.doc.json', {
15
+ cwd: options.configDir,
16
+ stopAt: getProjectRoot(),
17
+ });
15
18
  const runCompodoc$ = options.compodoc
16
19
  ? runCompodoc({
17
20
  compodocArgs: [...options.compodocArgs, ...(options.quiet ? ['--silent'] : [])],
@@ -9,6 +9,7 @@ const core_1 = require("@angular-devkit/core");
9
9
  const find_up_1 = require("find-up");
10
10
  const angular_cli_webpack_1 = require("./angular-cli-webpack");
11
11
  const module_is_available_1 = require("./utils/module-is-available");
12
+ const common_1 = require("storybook/internal/common");
12
13
  async function webpackFinal(baseConfig, options) {
13
14
  if (!(0, module_is_available_1.moduleIsAvailable)('@angular-devkit/build-angular')) {
14
15
  node_logger_1.logger.info('=> Using base config because "@angular-devkit/build-angular" is not installed');
@@ -65,7 +66,7 @@ async function getBuilderOptions(options, builderContext) {
65
66
  ...browserTargetOptions,
66
67
  ...options.angularBuilderOptions,
67
68
  tsConfig: options.tsConfig ??
68
- (0, find_up_1.sync)('tsconfig.json', { cwd: options.configDir }) ??
69
+ (0, find_up_1.findUpSync)('tsconfig.json', { cwd: options.configDir, stopAt: (0, common_1.getProjectRoot)() }) ??
69
70
  browserTargetOptions.tsConfig,
70
71
  };
71
72
  node_logger_1.logger.info(`=> Using angular project with "tsConfig:${builderOptions.tsConfig}"`);
@@ -3,9 +3,10 @@ import { AngularLegacyBuildOptionsError } from 'storybook/internal/server-errors
3
3
  import { WebpackDefinePlugin, WebpackIgnorePlugin } from '@storybook/builder-webpack5';
4
4
  import { targetFromTargetString } from '@angular-devkit/architect';
5
5
  import { logging } from '@angular-devkit/core';
6
- import { sync as findUpSync } from 'find-up';
6
+ import { findUpSync } from 'find-up';
7
7
  import { getWebpackConfig as getCustomWebpackConfig } from './angular-cli-webpack';
8
8
  import { moduleIsAvailable } from './utils/module-is-available';
9
+ import { getProjectRoot } from 'storybook/internal/common';
9
10
  export async function webpackFinal(baseConfig, options) {
10
11
  if (!moduleIsAvailable('@angular-devkit/build-angular')) {
11
12
  logger.info('=> Using base config because "@angular-devkit/build-angular" is not installed');
@@ -62,7 +63,7 @@ async function getBuilderOptions(options, builderContext) {
62
63
  ...browserTargetOptions,
63
64
  ...options.angularBuilderOptions,
64
65
  tsConfig: options.tsConfig ??
65
- findUpSync('tsconfig.json', { cwd: options.configDir }) ??
66
+ findUpSync('tsconfig.json', { cwd: options.configDir, stopAt: getProjectRoot() }) ??
66
67
  browserTargetOptions.tsConfig,
67
68
  };
68
69
  logger.info(`=> Using angular project with "tsConfig:${builderOptions.tsConfig}"`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storybook/angular",
3
- "version": "9.1.0-alpha.5",
3
+ "version": "9.1.0-alpha.6",
4
4
  "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.",
5
5
  "keywords": [
6
6
  "storybook",
@@ -52,12 +52,12 @@
52
52
  "prep": "rimraf dist && jiti ../../../scripts/prepare/tsc.ts"
53
53
  },
54
54
  "dependencies": {
55
- "@storybook/builder-webpack5": "9.1.0-alpha.5",
56
- "@storybook/core-webpack": "9.1.0-alpha.5",
55
+ "@storybook/builder-webpack5": "9.1.0-alpha.6",
56
+ "@storybook/core-webpack": "9.1.0-alpha.6",
57
57
  "@storybook/global": "^5.0.0",
58
58
  "@types/webpack-env": "^1.18.0",
59
59
  "fd-package-json": "^1.2.0",
60
- "find-up": "^5.0.0",
60
+ "find-up": "^7.0.0",
61
61
  "telejson": "8.0.0",
62
62
  "ts-dedent": "^2.0.0",
63
63
  "tsconfig-paths-webpack-plugin": "^4.0.1",
@@ -96,7 +96,7 @@
96
96
  "@angular/platform-browser": ">=18.0.0 < 21.0.0",
97
97
  "@angular/platform-browser-dynamic": ">=18.0.0 < 21.0.0",
98
98
  "rxjs": "^6.5.3 || ^7.4.0",
99
- "storybook": "^9.1.0-alpha.5",
99
+ "storybook": "^9.1.0-alpha.6",
100
100
  "typescript": "^4.9.0 || ^5.0.0",
101
101
  "zone.js": ">=0.14.0"
102
102
  },