@storybook/angular 6.5.0-alpha.29 → 6.5.0-alpha.32
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.
- package/dist/ts3.9/builders/build-storybook/index.js +33 -84
- package/dist/ts3.9/builders/start-storybook/index.js +40 -91
- package/dist/ts3.9/builders/utils/build-standalone-errors-handler.js +13 -11
- package/dist/ts3.9/builders/utils/run-compodoc.js +19 -25
- package/dist/ts3.9/client/preview/angular/app.token.js +1 -1
- package/dist/ts3.9/client/preview/angular/components/app.component.js +55 -59
- package/dist/ts3.9/client/preview/angular/helpers.js +66 -80
- package/dist/ts3.9/client/preview/angular-beta/AbstractRenderer.js +77 -125
- package/dist/ts3.9/client/preview/angular-beta/CanvasRenderer.js +18 -81
- package/dist/ts3.9/client/preview/angular-beta/ComputesTemplateFromComponent.js +53 -73
- package/dist/ts3.9/client/preview/angular-beta/DocsRenderer.js +41 -127
- package/dist/ts3.9/client/preview/angular-beta/RendererFactory.js +30 -66
- package/dist/ts3.9/client/preview/angular-beta/StorybookModule.js +42 -46
- package/dist/ts3.9/client/preview/angular-beta/StorybookProvider.js +15 -17
- package/dist/ts3.9/client/preview/angular-beta/StorybookWrapperComponent.js +63 -92
- package/dist/ts3.9/client/preview/angular-beta/utils/NgComponentAnalyzer.js +29 -49
- package/dist/ts3.9/client/preview/angular-beta/utils/NgModulesAnalyzer.js +10 -10
- package/dist/ts3.9/client/preview/decorateStory.js +18 -40
- package/dist/ts3.9/client/preview/decorators.js +27 -46
- package/dist/ts3.9/client/preview/globals.js +2 -2
- package/dist/ts3.9/client/preview/index.js +8 -21
- package/dist/ts3.9/client/preview/render.js +17 -56
- package/dist/ts3.9/demo/button.component.js +31 -22
- package/dist/ts3.9/demo/welcome.component.js +85 -18
- package/dist/ts3.9/server/angular-cli-webpack-12.2.x.js +38 -81
- package/dist/ts3.9/server/angular-cli-webpack-13.x.x.js +42 -85
- package/dist/ts3.9/server/angular-cli-webpack-older.js +77 -123
- package/dist/ts3.9/server/angular-devkit-build-webpack.js +72 -133
- package/dist/ts3.9/server/angular-read-workspace.js +44 -78
- package/dist/ts3.9/server/build.js +10 -47
- package/dist/ts3.9/server/create-fork-ts-checker-plugin.js +2 -2
- package/dist/ts3.9/server/framework-preset-angular-cli.js +111 -186
- package/dist/ts3.9/server/framework-preset-angular-ivy.js +35 -92
- package/dist/ts3.9/server/framework-preset-angular.js +62 -115
- package/dist/ts3.9/server/index.js +2 -2
- package/dist/ts3.9/server/ngx-template-loader/index.js +15 -15
- package/dist/ts3.9/server/options.js +1 -1
- package/dist/ts3.9/server/preset.js +4 -13
- package/dist/ts3.9/server/ts_config.js +5 -5
- package/dist/ts3.9/server/utils/filter-out-styling-rules.js +4 -4
- package/dist/ts3.9/server/utils/module-is-available.js +1 -1
- package/dist/ts3.9/server/utils/normalize-asset-patterns.js +16 -31
- package/dist/ts3.9/server/utils/normalize-optimization.js +3 -3
- package/package.json +9 -9
- package/standalone.d.ts +3 -5
|
@@ -8,58 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
13
|
};
|
|
41
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
15
|
+
const server_1 = require("@storybook/core/server");
|
|
16
|
+
const node_logger_1 = require("@storybook/node-logger");
|
|
17
|
+
const options_1 = __importDefault(require("./options"));
|
|
45
18
|
function build() {
|
|
46
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
case 1:
|
|
54
|
-
_a.sent();
|
|
55
|
-
return [3 /*break*/, 3];
|
|
56
|
-
case 2:
|
|
57
|
-
error_1 = _a.sent();
|
|
58
|
-
node_logger_1.logger.error(error_1);
|
|
59
|
-
return [3 /*break*/, 3];
|
|
60
|
-
case 3: return [2 /*return*/];
|
|
61
|
-
}
|
|
62
|
-
});
|
|
19
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
try {
|
|
21
|
+
yield server_1.buildStatic(options_1.default);
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
node_logger_1.logger.error(error);
|
|
25
|
+
}
|
|
63
26
|
});
|
|
64
27
|
}
|
|
65
28
|
build();
|
|
@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
/* eslint-disable func-names */
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
|
|
8
|
+
const node_logger_1 = require("@storybook/node-logger");
|
|
9
9
|
function default_1(tsLoaderOptions) {
|
|
10
10
|
if (tsLoaderOptions && tsLoaderOptions.configFile) {
|
|
11
11
|
return new fork_ts_checker_webpack_plugin_1.default({
|
|
@@ -1,19 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
|
|
3
|
-
if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
|
|
4
|
-
return cooked;
|
|
5
|
-
};
|
|
6
|
-
var __assign = (this && this.__assign) || function () {
|
|
7
|
-
__assign = Object.assign || function(t) {
|
|
8
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
9
|
-
s = arguments[i];
|
|
10
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
11
|
-
t[p] = s[p];
|
|
12
|
-
}
|
|
13
|
-
return t;
|
|
14
|
-
};
|
|
15
|
-
return __assign.apply(this, arguments);
|
|
16
|
-
};
|
|
17
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
18
3
|
if (k2 === undefined) k2 = k;
|
|
19
4
|
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
@@ -42,118 +27,67 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
42
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
43
28
|
});
|
|
44
29
|
};
|
|
45
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
46
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
47
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
48
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
49
|
-
function step(op) {
|
|
50
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
51
|
-
while (_) try {
|
|
52
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
53
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
54
|
-
switch (op[0]) {
|
|
55
|
-
case 0: case 1: t = op; break;
|
|
56
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
57
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
58
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
59
|
-
default:
|
|
60
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
61
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
62
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
63
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
64
|
-
if (t[2]) _.ops.pop();
|
|
65
|
-
_.trys.pop(); continue;
|
|
66
|
-
}
|
|
67
|
-
op = body.call(thisArg, _);
|
|
68
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
69
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
70
|
-
}
|
|
71
|
-
};
|
|
72
30
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
73
31
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
74
32
|
};
|
|
75
33
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
76
34
|
exports.webpackFinal = void 0;
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
35
|
+
const node_logger_1 = require("@storybook/node-logger");
|
|
36
|
+
const architect_1 = require("@angular-devkit/architect");
|
|
37
|
+
const find_up_1 = require("find-up");
|
|
38
|
+
const semver_1 = __importDefault(require("@storybook/semver"));
|
|
39
|
+
const ts_dedent_1 = __importDefault(require("ts-dedent"));
|
|
40
|
+
const core_1 = require("@angular-devkit/core");
|
|
41
|
+
const module_is_available_1 = require("./utils/module-is-available");
|
|
42
|
+
const angular_cli_webpack_12_2_x_1 = require("./angular-cli-webpack-12.2.x");
|
|
43
|
+
const angular_cli_webpack_13_x_x_1 = require("./angular-cli-webpack-13.x.x");
|
|
44
|
+
const angular_cli_webpack_older_1 = require("./angular-cli-webpack-older");
|
|
45
|
+
const angular_read_workspace_1 = require("./angular-read-workspace");
|
|
88
46
|
function webpackFinal(baseConfig, options) {
|
|
89
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
case 0:
|
|
134
|
-
builderContext = getBuilderContext(_options);
|
|
135
|
-
return [4 /*yield*/, getBuilderOptions(_options, builderContext)];
|
|
136
|
-
case 1:
|
|
137
|
-
builderOptions = _a.sent();
|
|
138
|
-
return [2 /*return*/, angular_cli_webpack_12_2_x_1.getWebpackConfig(_baseConfig, {
|
|
139
|
-
builderOptions: builderOptions,
|
|
140
|
-
builderContext: builderContext,
|
|
141
|
-
})];
|
|
142
|
-
}
|
|
143
|
-
});
|
|
144
|
-
}); },
|
|
145
|
-
},
|
|
146
|
-
{
|
|
147
|
-
info: '=> Loading angular-cli config for angular lower than 12.2.0',
|
|
148
|
-
condition: true,
|
|
149
|
-
getWebpackConfig: angular_cli_webpack_older_1.getWebpackConfig,
|
|
150
|
-
},
|
|
151
|
-
];
|
|
152
|
-
webpackGetter = webpackGetterByVersions.find(function (wg) { return wg.condition; });
|
|
153
|
-
node_logger_1.logger.info(webpackGetter.info);
|
|
154
|
-
return [2 /*return*/, Promise.resolve(webpackGetter.getWebpackConfig(baseConfig, options))];
|
|
155
|
-
}
|
|
156
|
-
});
|
|
47
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
48
|
+
if (!module_is_available_1.moduleIsAvailable('@angular-devkit/build-angular')) {
|
|
49
|
+
node_logger_1.logger.info('=> Using base config because "@angular-devkit/build-angular" is not installed');
|
|
50
|
+
return baseConfig;
|
|
51
|
+
}
|
|
52
|
+
const angularCliVersion = yield Promise.resolve().then(() => __importStar(require('@angular/cli'))).then((m) => semver_1.default.coerce(m.VERSION.full));
|
|
53
|
+
/**
|
|
54
|
+
* Ordered array to use the specific getWebpackConfig according to some condition like angular-cli version
|
|
55
|
+
*/
|
|
56
|
+
const webpackGetterByVersions = [
|
|
57
|
+
{
|
|
58
|
+
info: '=> Loading angular-cli config for angular >= 13.0.0',
|
|
59
|
+
condition: semver_1.default.satisfies(angularCliVersion, '>=13.0.0'),
|
|
60
|
+
getWebpackConfig: (_baseConfig, _options) => __awaiter(this, void 0, void 0, function* () {
|
|
61
|
+
const builderContext = getBuilderContext(_options);
|
|
62
|
+
const builderOptions = yield getBuilderOptions(_options, builderContext);
|
|
63
|
+
const legacyDefaultOptions = yield getLegacyDefaultBuildOptions(_options);
|
|
64
|
+
return angular_cli_webpack_13_x_x_1.getWebpackConfig(_baseConfig, {
|
|
65
|
+
builderOptions: Object.assign(Object.assign({ watch: options.configType === 'DEVELOPMENT' }, legacyDefaultOptions), builderOptions),
|
|
66
|
+
builderContext,
|
|
67
|
+
});
|
|
68
|
+
}),
|
|
69
|
+
},
|
|
70
|
+
{
|
|
71
|
+
info: '=> Loading angular-cli config for angular 12.2.x',
|
|
72
|
+
condition: semver_1.default.satisfies(angularCliVersion, '12.2.x') && options.angularBuilderContext,
|
|
73
|
+
getWebpackConfig: (_baseConfig, _options) => __awaiter(this, void 0, void 0, function* () {
|
|
74
|
+
const builderContext = getBuilderContext(_options);
|
|
75
|
+
const builderOptions = yield getBuilderOptions(_options, builderContext);
|
|
76
|
+
return angular_cli_webpack_12_2_x_1.getWebpackConfig(_baseConfig, {
|
|
77
|
+
builderOptions,
|
|
78
|
+
builderContext,
|
|
79
|
+
});
|
|
80
|
+
}),
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
info: '=> Loading angular-cli config for angular lower than 12.2.0',
|
|
84
|
+
condition: true,
|
|
85
|
+
getWebpackConfig: angular_cli_webpack_older_1.getWebpackConfig,
|
|
86
|
+
},
|
|
87
|
+
];
|
|
88
|
+
const webpackGetter = webpackGetterByVersions.find((wg) => wg.condition);
|
|
89
|
+
node_logger_1.logger.info(webpackGetter.info);
|
|
90
|
+
return Promise.resolve(webpackGetter.getWebpackConfig(baseConfig, options));
|
|
157
91
|
});
|
|
158
92
|
}
|
|
159
93
|
exports.webpackFinal = webpackFinal;
|
|
@@ -166,8 +100,8 @@ function getBuilderContext(options) {
|
|
|
166
100
|
return ((_a = options.angularBuilderContext) !== null && _a !== void 0 ? _a : {
|
|
167
101
|
target: { project: 'noop-project', builder: '', options: {} },
|
|
168
102
|
workspaceRoot: process.cwd(),
|
|
169
|
-
getProjectMetadata:
|
|
170
|
-
getTargetOptions:
|
|
103
|
+
getProjectMetadata: () => ({}),
|
|
104
|
+
getTargetOptions: () => ({}),
|
|
171
105
|
logger: new core_1.logging.Logger('Storybook'),
|
|
172
106
|
});
|
|
173
107
|
}
|
|
@@ -177,25 +111,22 @@ function getBuilderContext(options) {
|
|
|
177
111
|
*/
|
|
178
112
|
function getBuilderOptions(options, builderContext) {
|
|
179
113
|
var _a, _b;
|
|
180
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
return [2 /*return*/, builderOptions];
|
|
197
|
-
}
|
|
198
|
-
});
|
|
114
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
115
|
+
/**
|
|
116
|
+
* Get Browser Target options
|
|
117
|
+
*/
|
|
118
|
+
let browserTargetOptions = {};
|
|
119
|
+
if (options.angularBrowserTarget) {
|
|
120
|
+
const browserTarget = architect_1.targetFromTargetString(options.angularBrowserTarget);
|
|
121
|
+
node_logger_1.logger.info(`=> Using angular browser target options from "${browserTarget.project}:${browserTarget.target}${browserTarget.configuration ? `:${browserTarget.configuration}` : ''}"`);
|
|
122
|
+
browserTargetOptions = yield builderContext.getTargetOptions(browserTarget);
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* Merge target options from browser target options and from storybook options
|
|
126
|
+
*/
|
|
127
|
+
const builderOptions = Object.assign(Object.assign(Object.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 });
|
|
128
|
+
node_logger_1.logger.info(`=> Using angular project with "tsConfig:${builderOptions.tsConfig}"`);
|
|
129
|
+
return builderOptions;
|
|
199
130
|
});
|
|
200
131
|
}
|
|
201
132
|
/**
|
|
@@ -204,49 +135,43 @@ function getBuilderOptions(options, builderContext) {
|
|
|
204
135
|
* only work for angular.json with [defaultProject].build or "storybook.build" config
|
|
205
136
|
*/
|
|
206
137
|
function getLegacyDefaultBuildOptions(options) {
|
|
207
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
return [2 /*return*/, {}];
|
|
246
|
-
}
|
|
247
|
-
return [2 /*return*/];
|
|
248
|
-
}
|
|
249
|
-
});
|
|
138
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
139
|
+
if (options.angularBrowserTarget !== undefined) {
|
|
140
|
+
// Not use legacy way with builder (`angularBrowserTarget` is defined or null with builder and undefined without)
|
|
141
|
+
return {};
|
|
142
|
+
}
|
|
143
|
+
node_logger_1.logger.warn(ts_dedent_1.default `Your Storybook startup uses a solution that will not be supported in version 7.0.
|
|
144
|
+
You must use angular builder to have an explicit configuration on the project used in angular.json
|
|
145
|
+
Read more at:
|
|
146
|
+
- https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#sb-angular-builder)
|
|
147
|
+
- https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#angular13)
|
|
148
|
+
`);
|
|
149
|
+
const dirToSearch = process.cwd();
|
|
150
|
+
// Read angular workspace
|
|
151
|
+
let workspaceConfig;
|
|
152
|
+
try {
|
|
153
|
+
workspaceConfig = yield angular_read_workspace_1.readAngularWorkspaceConfig(dirToSearch);
|
|
154
|
+
}
|
|
155
|
+
catch (error) {
|
|
156
|
+
node_logger_1.logger.error(`=> Could not find angular workspace config (angular.json) on this path "${dirToSearch}"`);
|
|
157
|
+
node_logger_1.logger.info(`=> Fail to load angular-cli config. Using base config`);
|
|
158
|
+
return {};
|
|
159
|
+
}
|
|
160
|
+
// Find angular project target
|
|
161
|
+
try {
|
|
162
|
+
const browserTarget = {
|
|
163
|
+
configuration: undefined,
|
|
164
|
+
project: angular_read_workspace_1.getDefaultProjectName(workspaceConfig),
|
|
165
|
+
target: 'build',
|
|
166
|
+
};
|
|
167
|
+
const { target, project } = angular_read_workspace_1.findAngularProjectTarget(workspaceConfig, browserTarget.project, browserTarget.target);
|
|
168
|
+
node_logger_1.logger.info(`=> Using angular project "${browserTarget.project}:${browserTarget.target}" for configuring Storybook`);
|
|
169
|
+
return Object.assign({}, target.options);
|
|
170
|
+
}
|
|
171
|
+
catch (error) {
|
|
172
|
+
node_logger_1.logger.error(`=> Could not find angular project: ${error.message}`);
|
|
173
|
+
node_logger_1.logger.info(`=> Fail to load angular-cli config. Using base config`);
|
|
174
|
+
return {};
|
|
175
|
+
}
|
|
250
176
|
});
|
|
251
177
|
}
|
|
252
|
-
var templateObject_1;
|
|
@@ -1,15 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
14
3
|
if (k2 === undefined) k2 = k;
|
|
15
4
|
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
@@ -38,36 +27,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
38
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
39
28
|
});
|
|
40
29
|
};
|
|
41
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
42
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
43
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
44
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
45
|
-
function step(op) {
|
|
46
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
47
|
-
while (_) try {
|
|
48
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
49
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
50
|
-
switch (op[0]) {
|
|
51
|
-
case 0: case 1: t = op; break;
|
|
52
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
53
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
54
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
55
|
-
default:
|
|
56
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
57
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
58
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
59
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
60
|
-
if (t[2]) _.ops.pop();
|
|
61
|
-
_.trys.pop(); continue;
|
|
62
|
-
}
|
|
63
|
-
op = body.call(thisArg, _);
|
|
64
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
65
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
66
|
-
}
|
|
67
|
-
};
|
|
68
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
69
31
|
exports.webpack = exports.runNgcc = void 0;
|
|
70
|
-
|
|
32
|
+
const path = __importStar(require("path"));
|
|
71
33
|
/**
|
|
72
34
|
* Source : https://github.com/angular/angular-cli/blob/ebccb5de4a455af813c5e82483db6af20666bdbd/packages/angular_devkit/build_angular/src/utils/load-esm.ts#L23
|
|
73
35
|
* This uses a dynamic import to load a module which may be ESM.
|
|
@@ -83,7 +45,7 @@ var path = __importStar(require("path"));
|
|
|
83
45
|
*/
|
|
84
46
|
function loadEsmModule(modulePath) {
|
|
85
47
|
// eslint-disable-next-line no-new-func
|
|
86
|
-
return new Function('modulePath',
|
|
48
|
+
return new Function('modulePath', `return import(modulePath);`)(modulePath);
|
|
87
49
|
}
|
|
88
50
|
/**
|
|
89
51
|
* Run ngcc for converting modules to ivy format before starting storybook
|
|
@@ -91,56 +53,37 @@ function loadEsmModule(modulePath) {
|
|
|
91
53
|
*
|
|
92
54
|
* Information about Ivy can be found here https://angular.io/guide/ivy
|
|
93
55
|
*/
|
|
94
|
-
exports.runNgcc =
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
return [3 /*break*/, 4];
|
|
110
|
-
case 4:
|
|
111
|
-
ngcc.process({
|
|
112
|
-
// should be async: true but does not work due to
|
|
113
|
-
// https://github.com/storybookjs/storybook/pull/11157/files#r615413803
|
|
114
|
-
async: false,
|
|
115
|
-
basePath: path.join(process.cwd(), 'node_modules'),
|
|
116
|
-
createNewEntryPointFormats: true,
|
|
117
|
-
compileAllFormats: false,
|
|
118
|
-
});
|
|
119
|
-
return [2 /*return*/];
|
|
120
|
-
}
|
|
121
|
-
});
|
|
122
|
-
}); };
|
|
123
|
-
exports.webpack = function (webpackConfig, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
124
|
-
var angularOptions;
|
|
125
|
-
return __generator(this, function (_a) {
|
|
126
|
-
switch (_a.label) {
|
|
127
|
-
case 0: return [4 /*yield*/, options.presets.apply('angularOptions', {}, options)];
|
|
128
|
-
case 1:
|
|
129
|
-
angularOptions = _a.sent();
|
|
130
|
-
// Default to true, if undefined
|
|
131
|
-
if (angularOptions.enableIvy === false) {
|
|
132
|
-
return [2 /*return*/, webpackConfig];
|
|
133
|
-
}
|
|
134
|
-
exports.runNgcc();
|
|
135
|
-
return [2 /*return*/, __assign(__assign({}, webpackConfig), { resolve: __assign(__assign({}, webpackConfig.resolve), { mainFields: [
|
|
136
|
-
'es2015_ivy_ngcc',
|
|
137
|
-
'module_ivy_ngcc',
|
|
138
|
-
'main_ivy_ngcc',
|
|
139
|
-
'es2015',
|
|
140
|
-
'browser',
|
|
141
|
-
'module',
|
|
142
|
-
'main',
|
|
143
|
-
] }) })];
|
|
144
|
-
}
|
|
56
|
+
exports.runNgcc = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
57
|
+
let ngcc;
|
|
58
|
+
try {
|
|
59
|
+
ngcc = yield Promise.resolve().then(() => __importStar(require('@angular/compiler-cli/ngcc')));
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
ngcc = yield loadEsmModule('@angular/compiler-cli/ngcc');
|
|
63
|
+
}
|
|
64
|
+
ngcc.process({
|
|
65
|
+
// should be async: true but does not work due to
|
|
66
|
+
// https://github.com/storybookjs/storybook/pull/11157/files#r615413803
|
|
67
|
+
async: false,
|
|
68
|
+
basePath: path.join(process.cwd(), 'node_modules'),
|
|
69
|
+
createNewEntryPointFormats: true,
|
|
70
|
+
compileAllFormats: false,
|
|
145
71
|
});
|
|
146
|
-
});
|
|
72
|
+
});
|
|
73
|
+
exports.webpack = (webpackConfig, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
74
|
+
const angularOptions = yield options.presets.apply('angularOptions', {}, options);
|
|
75
|
+
// Default to true, if undefined
|
|
76
|
+
if (angularOptions.enableIvy === false) {
|
|
77
|
+
return webpackConfig;
|
|
78
|
+
}
|
|
79
|
+
exports.runNgcc();
|
|
80
|
+
return Object.assign(Object.assign({}, webpackConfig), { resolve: Object.assign(Object.assign({}, webpackConfig.resolve), { mainFields: [
|
|
81
|
+
'es2015_ivy_ngcc',
|
|
82
|
+
'module_ivy_ngcc',
|
|
83
|
+
'main_ivy_ngcc',
|
|
84
|
+
'es2015',
|
|
85
|
+
'browser',
|
|
86
|
+
'module',
|
|
87
|
+
'main',
|
|
88
|
+
] }) });
|
|
89
|
+
});
|