@storybook/angular 6.4.0-rc.7 → 6.4.1

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.
@@ -1,11 +1,14 @@
1
1
  import { BuilderOutput } from '@angular-devkit/architect';
2
2
  import { JsonObject } from '@angular-devkit/core';
3
3
  import { CLIOptions } from '@storybook/core-common';
4
+ import { ExtraEntryPoint, StylePreprocessorOptions } from '@angular-devkit/build-angular';
4
5
  export declare type StorybookBuilderOptions = JsonObject & {
5
6
  browserTarget?: string | null;
6
7
  tsConfig?: string;
7
8
  compodoc: boolean;
8
9
  compodocArgs: string[];
10
+ styles?: ExtraEntryPoint[];
11
+ stylePreprocessorOptions?: StylePreprocessorOptions;
9
12
  } & Pick<CLIOptions, 'outputDir' | 'configDir' | 'loglevel' | 'quiet' | 'docs'>;
10
13
  export declare type StorybookBuilderOutput = JsonObject & BuilderOutput & {};
11
14
  declare const _default: import("@angular-devkit/architect/src/internal").Builder<StorybookBuilderOptions>;
@@ -1,11 +1,14 @@
1
1
  import { BuilderOutput } from '@angular-devkit/architect';
2
2
  import { JsonObject } from '@angular-devkit/core';
3
+ import { ExtraEntryPoint, StylePreprocessorOptions } from '@angular-devkit/build-angular';
3
4
  import { CLIOptions } from '@storybook/core-common';
4
5
  export declare type StorybookBuilderOptions = JsonObject & {
5
6
  browserTarget?: string | null;
6
7
  tsConfig?: string;
7
8
  compodoc: boolean;
8
9
  compodocArgs: string[];
10
+ styles?: ExtraEntryPoint[];
11
+ stylePreprocessorOptions?: StylePreprocessorOptions;
9
12
  } & Pick<CLIOptions, 'port' | 'host' | 'configDir' | 'https' | 'sslCa' | 'sslCert' | 'sslKey' | 'smokeTest' | 'ci' | 'quiet' | 'docs'>;
10
13
  export declare type StorybookBuilderOutput = JsonObject & BuilderOutput & {};
11
14
  declare const _default: import("@angular-devkit/architect/src/internal").Builder<StorybookBuilderOptions>;
@@ -1,9 +1,12 @@
1
1
  import { LoadOptions, Options as CoreOptions } from '@storybook/core-common';
2
2
  import { BuilderContext } from '@angular-devkit/architect';
3
- import { JsonObject } from '@angular-devkit/core';
3
+ import { ExtraEntryPoint, StylePreprocessorOptions } from '@angular-devkit/build-angular';
4
4
  export declare type PresetOptions = CoreOptions & {
5
5
  angularBrowserTarget?: string | null;
6
- angularBuilderOptions?: JsonObject | null;
6
+ angularBuilderOptions?: {
7
+ styles?: ExtraEntryPoint[];
8
+ stylePreprocessorOptions?: StylePreprocessorOptions;
9
+ };
7
10
  angularBuilderContext?: BuilderContext | null;
8
11
  tsConfig?: string;
9
12
  };
@@ -1,11 +1,14 @@
1
1
  import { BuilderOutput } from '@angular-devkit/architect';
2
2
  import { JsonObject } from '@angular-devkit/core';
3
3
  import { CLIOptions } from '@storybook/core-common';
4
+ import { ExtraEntryPoint, StylePreprocessorOptions } from '@angular-devkit/build-angular';
4
5
  export declare type StorybookBuilderOptions = JsonObject & {
5
6
  browserTarget?: string | null;
6
7
  tsConfig?: string;
7
8
  compodoc: boolean;
8
9
  compodocArgs: string[];
10
+ styles?: ExtraEntryPoint[];
11
+ stylePreprocessorOptions?: StylePreprocessorOptions;
9
12
  } & Pick<CLIOptions, 'outputDir' | 'configDir' | 'loglevel' | 'quiet' | 'docs'>;
10
13
  export declare type StorybookBuilderOutput = JsonObject & BuilderOutput & {};
11
14
  declare const _default: import("@angular-devkit/architect/src/internal").Builder<StorybookBuilderOptions>;
@@ -46,17 +46,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
46
46
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
47
47
  }
48
48
  };
49
- var __rest = (this && this.__rest) || function (s, e) {
50
- var t = {};
51
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
52
- t[p] = s[p];
53
- if (s != null && typeof Object.getOwnPropertySymbols === "function")
54
- for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
55
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
56
- t[p[i]] = s[p[i]];
57
- }
58
- return t;
59
- };
60
49
  var __importDefault = (this && this.__importDefault) || function (mod) {
61
50
  return (mod && mod.__esModule) ? mod : { "default": mod };
62
51
  };
@@ -64,6 +53,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
64
53
  var architect_1 = require("@angular-devkit/architect");
65
54
  var rxjs_1 = require("rxjs");
66
55
  var operators_1 = require("rxjs/operators");
56
+ var find_up_1 = require("find-up");
67
57
  // eslint-disable-next-line import/no-extraneous-dependencies
68
58
  var standalone_1 = __importDefault(require("@storybook/angular/standalone"));
69
59
  var run_compodoc_1 = require("../utils/run-compodoc");
@@ -78,8 +68,18 @@ function commandBuilder(options, context) {
78
68
  return runCompodoc$.pipe(operators_1.mapTo({ tsConfig: tsConfig }));
79
69
  }), operators_1.map(function (_a) {
80
70
  var tsConfig = _a.tsConfig;
81
- var browserTarget = options.browserTarget, otherOptions = __rest(options, ["browserTarget"]);
82
- var standaloneOptions = __assign(__assign({}, otherOptions), { angularBrowserTarget: browserTarget, angularBuilderContext: context, tsConfig: tsConfig });
71
+ var browserTarget = options.browserTarget, stylePreprocessorOptions = options.stylePreprocessorOptions, styles = options.styles, configDir = options.configDir, docs = options.docs, loglevel = options.loglevel, outputDir = options.outputDir, quiet = options.quiet;
72
+ var standaloneOptions = {
73
+ configDir: configDir,
74
+ docs: docs,
75
+ loglevel: loglevel,
76
+ outputDir: outputDir,
77
+ quiet: quiet,
78
+ angularBrowserTarget: browserTarget,
79
+ angularBuilderContext: context,
80
+ angularBuilderOptions: __assign(__assign({}, (stylePreprocessorOptions ? { stylePreprocessorOptions: stylePreprocessorOptions } : {})), (styles ? { styles: styles } : {})),
81
+ tsConfig: tsConfig,
82
+ };
83
83
  return standaloneOptions;
84
84
  }), operators_1.switchMap(function (standaloneOptions) { return runInstance(__assign(__assign({}, standaloneOptions), { mode: 'static' })); }), operators_1.map(function () {
85
85
  return { success: true };
@@ -104,7 +104,7 @@ function setup(options, context) {
104
104
  browserOptions = _f.sent();
105
105
  _f.label = 4;
106
106
  case 4: return [2 /*return*/, {
107
- tsConfig: (_b = (_a = options.tsConfig) !== null && _a !== void 0 ? _a : browserOptions.tsConfig) !== null && _b !== void 0 ? _b : undefined,
107
+ tsConfig: (_b = (_a = options.tsConfig) !== null && _a !== void 0 ? _a : find_up_1.sync('tsconfig.json', { cwd: options.configDir })) !== null && _b !== void 0 ? _b : browserOptions.tsConfig,
108
108
  }];
109
109
  }
110
110
  });
@@ -51,15 +51,62 @@
51
51
  "items": {
52
52
  "type": "string"
53
53
  }
54
+ },
55
+ "styles": {
56
+ "type": "array",
57
+ "description": "Global styles to be included in the build.",
58
+ "items": {
59
+ "$ref": "#/definitions/extraEntryPoint"
60
+ },
61
+ "default": ""
62
+ },
63
+ "stylePreprocessorOptions": {
64
+ "description": "Options to pass to style preprocessors.",
65
+ "type": "object",
66
+ "properties": {
67
+ "includePaths": {
68
+ "description": "Paths to include. Paths will be resolved to workspace root.",
69
+ "type": "array",
70
+ "items": {
71
+ "type": "string"
72
+ },
73
+ "default": []
74
+ }
75
+ },
76
+ "additionalProperties": false,
77
+ "default": ""
54
78
  }
55
79
  },
56
80
  "additionalProperties": false,
57
- "oneOf": [
58
- {
59
- "required": ["browserTarget"]
60
- },
61
- {
62
- "required": ["tsConfig"]
81
+ "definitions": {
82
+ "extraEntryPoint": {
83
+ "oneOf": [
84
+ {
85
+ "type": "object",
86
+ "properties": {
87
+ "input": {
88
+ "type": "string",
89
+ "description": "The file to include."
90
+ },
91
+ "bundleName": {
92
+ "type": "string",
93
+ "pattern": "^[\\w\\-.]*$",
94
+ "description": "The bundle name for this extra entry point."
95
+ },
96
+ "inject": {
97
+ "type": "boolean",
98
+ "description": "If the bundle will be referenced in the HTML file.",
99
+ "default": true
100
+ }
101
+ },
102
+ "additionalProperties": false,
103
+ "required": ["input"]
104
+ },
105
+ {
106
+ "type": "string",
107
+ "description": "The file to include."
108
+ }
109
+ ]
63
110
  }
64
- ]
111
+ }
65
112
  }
@@ -1,11 +1,14 @@
1
1
  import { BuilderOutput } from '@angular-devkit/architect';
2
2
  import { JsonObject } from '@angular-devkit/core';
3
+ import { ExtraEntryPoint, StylePreprocessorOptions } from '@angular-devkit/build-angular';
3
4
  import { CLIOptions } from '@storybook/core-common';
4
5
  export declare type StorybookBuilderOptions = JsonObject & {
5
6
  browserTarget?: string | null;
6
7
  tsConfig?: string;
7
8
  compodoc: boolean;
8
9
  compodocArgs: string[];
10
+ styles?: ExtraEntryPoint[];
11
+ stylePreprocessorOptions?: StylePreprocessorOptions;
9
12
  } & Pick<CLIOptions, 'port' | 'host' | 'configDir' | 'https' | 'sslCa' | 'sslCert' | 'sslKey' | 'smokeTest' | 'ci' | 'quiet' | 'docs'>;
10
13
  export declare type StorybookBuilderOutput = JsonObject & BuilderOutput & {};
11
14
  declare const _default: import("@angular-devkit/architect/src/internal").Builder<StorybookBuilderOptions>;
@@ -46,17 +46,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
46
46
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
47
47
  }
48
48
  };
49
- var __rest = (this && this.__rest) || function (s, e) {
50
- var t = {};
51
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
52
- t[p] = s[p];
53
- if (s != null && typeof Object.getOwnPropertySymbols === "function")
54
- for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
55
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
56
- t[p[i]] = s[p[i]];
57
- }
58
- return t;
59
- };
60
49
  var __importDefault = (this && this.__importDefault) || function (mod) {
61
50
  return (mod && mod.__esModule) ? mod : { "default": mod };
62
51
  };
@@ -64,6 +53,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
64
53
  var architect_1 = require("@angular-devkit/architect");
65
54
  var rxjs_1 = require("rxjs");
66
55
  var operators_1 = require("rxjs/operators");
56
+ var find_up_1 = require("find-up");
67
57
  // eslint-disable-next-line import/no-extraneous-dependencies
68
58
  var standalone_1 = __importDefault(require("@storybook/angular/standalone"));
69
59
  var run_compodoc_1 = require("../utils/run-compodoc");
@@ -78,8 +68,24 @@ function commandBuilder(options, context) {
78
68
  return runCompodoc$.pipe(operators_1.mapTo({ tsConfig: tsConfig }));
79
69
  }), operators_1.map(function (_a) {
80
70
  var tsConfig = _a.tsConfig;
81
- var browserTarget = options.browserTarget, otherOptions = __rest(options, ["browserTarget"]);
82
- var standaloneOptions = __assign(__assign({}, otherOptions), { angularBrowserTarget: browserTarget, angularBuilderContext: context, tsConfig: tsConfig });
71
+ var browserTarget = options.browserTarget, stylePreprocessorOptions = options.stylePreprocessorOptions, styles = options.styles, ci = options.ci, configDir = options.configDir, docs = options.docs, host = options.host, https = options.https, port = options.port, quiet = options.quiet, smokeTest = options.smokeTest, sslCa = options.sslCa, sslCert = options.sslCert, sslKey = options.sslKey;
72
+ var standaloneOptions = {
73
+ ci: ci,
74
+ configDir: configDir,
75
+ docs: docs,
76
+ host: host,
77
+ https: https,
78
+ port: port,
79
+ quiet: quiet,
80
+ smokeTest: smokeTest,
81
+ sslCa: sslCa,
82
+ sslCert: sslCert,
83
+ sslKey: sslKey,
84
+ angularBrowserTarget: browserTarget,
85
+ angularBuilderContext: context,
86
+ angularBuilderOptions: __assign(__assign({}, (stylePreprocessorOptions ? { stylePreprocessorOptions: stylePreprocessorOptions } : {})), (styles ? { styles: styles } : {})),
87
+ tsConfig: tsConfig,
88
+ };
83
89
  return standaloneOptions;
84
90
  }), operators_1.switchMap(function (standaloneOptions) { return runInstance(standaloneOptions); }), operators_1.map(function () {
85
91
  return { success: true };
@@ -104,7 +110,7 @@ function setup(options, context) {
104
110
  browserOptions = _f.sent();
105
111
  _f.label = 4;
106
112
  case 4: return [2 /*return*/, {
107
- tsConfig: (_b = (_a = options.tsConfig) !== null && _a !== void 0 ? _a : browserOptions.tsConfig) !== null && _b !== void 0 ? _b : undefined,
113
+ tsConfig: (_b = (_a = options.tsConfig) !== null && _a !== void 0 ? _a : find_up_1.sync('tsconfig.json', { cwd: options.configDir })) !== null && _b !== void 0 ? _b : browserOptions.tsConfig,
108
114
  }];
109
115
  }
110
116
  });
@@ -78,7 +78,62 @@
78
78
  "items": {
79
79
  "type": "string"
80
80
  }
81
+ },
82
+ "styles": {
83
+ "type": "array",
84
+ "description": "Global styles to be included in the build.",
85
+ "items": {
86
+ "$ref": "#/definitions/extraEntryPoint"
87
+ },
88
+ "default": ""
89
+ },
90
+ "stylePreprocessorOptions": {
91
+ "description": "Options to pass to style preprocessors.",
92
+ "type": "object",
93
+ "properties": {
94
+ "includePaths": {
95
+ "description": "Paths to include. Paths will be resolved to workspace root.",
96
+ "type": "array",
97
+ "items": {
98
+ "type": "string"
99
+ },
100
+ "default": []
101
+ }
102
+ },
103
+ "additionalProperties": false,
104
+ "default": ""
81
105
  }
82
106
  },
83
- "additionalProperties": false
107
+ "additionalProperties": false,
108
+ "definitions": {
109
+ "extraEntryPoint": {
110
+ "oneOf": [
111
+ {
112
+ "type": "object",
113
+ "properties": {
114
+ "input": {
115
+ "type": "string",
116
+ "description": "The file to include."
117
+ },
118
+ "bundleName": {
119
+ "type": "string",
120
+ "pattern": "^[\\w\\-.]*$",
121
+ "description": "The bundle name for this extra entry point."
122
+ },
123
+ "inject": {
124
+ "type": "boolean",
125
+ "description": "If the bundle will be referenced in the HTML file.",
126
+ "default": true
127
+ }
128
+ },
129
+ "additionalProperties": false,
130
+ "required": ["input"]
131
+ },
132
+ {
133
+ "type": "string",
134
+ "description": "The file to include."
135
+ }
136
+ ]
137
+ }
138
+ }
84
139
  }
@@ -167,11 +167,11 @@ function getBuilderContext(options) {
167
167
  * Merge target options from browser target and from storybook options
168
168
  */
169
169
  function getBuilderOptions(options, builderContext) {
170
- var _a, _b, _c, _d;
170
+ var _a, _b;
171
171
  return __awaiter(this, void 0, void 0, function () {
172
172
  var browserTargetOptions, browserTarget, builderOptions;
173
- return __generator(this, function (_e) {
174
- switch (_e.label) {
173
+ return __generator(this, function (_c) {
174
+ switch (_c.label) {
175
175
  case 0:
176
176
  browserTargetOptions = {};
177
177
  if (!options.angularBrowserTarget) return [3 /*break*/, 2];
@@ -179,10 +179,10 @@ function getBuilderOptions(options, builderContext) {
179
179
  node_logger_1.logger.info("=> Using angular browser target options from \"" + browserTarget.project + ":" + browserTarget.target + (browserTarget.configuration ? ":" + browserTarget.configuration : '') + "\"");
180
180
  return [4 /*yield*/, builderContext.getTargetOptions(browserTarget)];
181
181
  case 1:
182
- browserTargetOptions = _e.sent();
183
- _e.label = 2;
182
+ browserTargetOptions = _c.sent();
183
+ _c.label = 2;
184
184
  case 2:
185
- builderOptions = __assign(__assign(__assign({}, browserTargetOptions), options.angularBuilderOptions), { tsConfig: (_d = (_c = (_a = options.tsConfig) !== null && _a !== void 0 ? _a : (_b = options.angularBuilderOptions) === null || _b === void 0 ? void 0 : _b.tsConfig) !== null && _c !== void 0 ? _c : browserTargetOptions.tsConfig) !== null && _d !== void 0 ? _d : find_up_1.sync('tsconfig.json', { cwd: options.configDir }) });
185
+ builderOptions = __assign(__assign(__assign({}, browserTargetOptions), options.angularBuilderOptions), { tsConfig: (_b = (_a = options.tsConfig) !== null && _a !== void 0 ? _a : find_up_1.sync('tsconfig.json', { cwd: options.configDir })) !== null && _b !== void 0 ? _b : browserTargetOptions.tsConfig });
186
186
  node_logger_1.logger.info("=> Using angular project with \"tsConfig:" + builderOptions.tsConfig + "\"");
187
187
  return [2 /*return*/, builderOptions];
188
188
  }
@@ -1,9 +1,12 @@
1
1
  import { LoadOptions, Options as CoreOptions } from '@storybook/core-common';
2
2
  import { BuilderContext } from '@angular-devkit/architect';
3
- import { JsonObject } from '@angular-devkit/core';
3
+ import { ExtraEntryPoint, StylePreprocessorOptions } from '@angular-devkit/build-angular';
4
4
  export declare type PresetOptions = CoreOptions & {
5
5
  angularBrowserTarget?: string | null;
6
- angularBuilderOptions?: JsonObject | null;
6
+ angularBuilderOptions?: {
7
+ styles?: ExtraEntryPoint[];
8
+ stylePreprocessorOptions?: StylePreprocessorOptions;
9
+ };
7
10
  angularBuilderContext?: BuilderContext | null;
8
11
  tsConfig?: string;
9
12
  };
@@ -1,2 +1,2 @@
1
- import { Configuration, RuleSetRule } from 'webpack';
1
+ import type { Configuration, RuleSetRule } from 'webpack';
2
2
  export declare const filterOutStylingRules: (config: Configuration) => RuleSetRule[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storybook/angular",
3
- "version": "6.4.0-rc.7",
3
+ "version": "6.4.1",
4
4
  "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
5
5
  "keywords": [
6
6
  "storybook"
@@ -45,15 +45,15 @@
45
45
  "prepare": "node ../../scripts/prepare.js"
46
46
  },
47
47
  "dependencies": {
48
- "@storybook/addons": "6.4.0-rc.7",
49
- "@storybook/api": "6.4.0-rc.7",
50
- "@storybook/core": "6.4.0-rc.7",
51
- "@storybook/core-common": "6.4.0-rc.7",
52
- "@storybook/core-events": "6.4.0-rc.7",
48
+ "@storybook/addons": "6.4.1",
49
+ "@storybook/api": "6.4.1",
50
+ "@storybook/core": "6.4.1",
51
+ "@storybook/core-common": "6.4.1",
52
+ "@storybook/core-events": "6.4.1",
53
53
  "@storybook/csf": "0.0.2--canary.87bc651.0",
54
- "@storybook/node-logger": "6.4.0-rc.7",
54
+ "@storybook/node-logger": "6.4.1",
55
55
  "@storybook/semver": "^7.3.2",
56
- "@storybook/store": "6.4.0-rc.7",
56
+ "@storybook/store": "6.4.1",
57
57
  "@types/webpack-env": "^1.16.0",
58
58
  "autoprefixer": "^9.8.6",
59
59
  "core-js": "^3.8.2",
@@ -138,5 +138,5 @@
138
138
  "access": "public"
139
139
  },
140
140
  "builders": "dist/ts3.9/builders/builders.json",
141
- "gitHead": "7162286c0d8d122c7206265fab41c4c191c86d40"
141
+ "gitHead": "bb20e8fef506e05fb9c67dd55b0405b4b1043698"
142
142
  }
package/standalone.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { CLIOptions, LoadOptions, BuilderOptions } from '@storybook/core-common';
2
2
  import { BuilderContext } from '@angular-devkit/architect';
3
- import { JsonObject } from '@angular-devkit/core';
3
+ import { JsonValue } from '@angular-devkit/core';
4
+ import { JsonSchema } from '@angular-devkit/core/src/json/schema';
4
5
 
5
6
  export type StandaloneOptions = Partial<
6
7
  CLIOptions &
@@ -8,7 +9,10 @@ export type StandaloneOptions = Partial<
8
9
  BuilderOptions & {
9
10
  mode?: 'static' | 'dev';
10
11
  angularBrowserTarget?: string | null;
11
- angularBuilderOptions?: JsonObject;
12
+ angularBuilderOptions?: JsonObject & {
13
+ styles?: ExtraEntryPoint[];
14
+ stylePreprocessorOptions?: StylePreprocessorOptions;
15
+ };
12
16
  angularBuilderContext?: BuilderContext | null;
13
17
  tsConfig?: string;
14
18
  }