@storybook/angular 6.4.4 → 6.4.9
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.4/client/preview/angular-beta/AbstractRenderer.d.ts +13 -0
- package/dist/ts3.9/client/preview/angular-beta/AbstractRenderer.d.ts +13 -0
- package/dist/ts3.9/client/preview/angular-beta/AbstractRenderer.js +20 -1
- package/dist/ts3.9/server/__mocks-ng-workspace__/minimal-config/angular.json +1 -0
- package/dist/ts3.9/server/__mocks-ng-workspace__/some-config/angular.json +1 -0
- package/dist/ts3.9/server/__mocks-ng-workspace__/with-angularBrowserTarget/angular.json +4 -0
- package/dist/ts3.9/server/__mocks-ng-workspace__/with-nx/angular.json +1 -0
- package/dist/ts3.9/server/__mocks-ng-workspace__/with-nx-workspace/workspace.json +1 -0
- package/dist/ts3.9/server/__mocks-ng-workspace__/with-options-styles/angular.json +1 -0
- package/dist/ts3.9/server/angular-cli-webpack-12.2.x.js +7 -1
- package/dist/ts3.9/server/angular-cli-webpack-13.x.x.js +7 -1
- package/dist/ts3.9/server/angular-devkit-build-webpack.js +1 -1
- package/dist/ts3.9/server/framework-preset-angular-cli.js +1 -1
- package/package.json +9 -9
|
@@ -38,6 +38,19 @@ export declare abstract class AbstractRenderer {
|
|
|
38
38
|
parameters: Parameters;
|
|
39
39
|
targetDOMNode: HTMLElement;
|
|
40
40
|
}): Promise<void>;
|
|
41
|
+
/**
|
|
42
|
+
* Only ASCII alphanumerics can be used as HTML tag name.
|
|
43
|
+
* https://html.spec.whatwg.org/#elements-2
|
|
44
|
+
*
|
|
45
|
+
* Therefore, stories break when non-ASCII alphanumerics are included in target selector.
|
|
46
|
+
* https://github.com/storybookjs/storybook/issues/15147
|
|
47
|
+
*
|
|
48
|
+
* This method returns storyId when it doesn't contain any non-ASCII alphanumerics.
|
|
49
|
+
* Otherwise, it generates a valid HTML tag name from storyId by removing non-ASCII alphanumerics from storyId, prefixing "sb-", and suffixing "-component"
|
|
50
|
+
* @protected
|
|
51
|
+
* @memberof AbstractRenderer
|
|
52
|
+
*/
|
|
53
|
+
protected generateTargetSelectorFromStoryId(): string;
|
|
41
54
|
protected initAngularRootElement(targetDOMNode: HTMLElement, targetSelector: string): void;
|
|
42
55
|
private fullRendererRequired;
|
|
43
56
|
}
|
|
@@ -38,6 +38,19 @@ export declare abstract class AbstractRenderer {
|
|
|
38
38
|
parameters: Parameters;
|
|
39
39
|
targetDOMNode: HTMLElement;
|
|
40
40
|
}): Promise<void>;
|
|
41
|
+
/**
|
|
42
|
+
* Only ASCII alphanumerics can be used as HTML tag name.
|
|
43
|
+
* https://html.spec.whatwg.org/#elements-2
|
|
44
|
+
*
|
|
45
|
+
* Therefore, stories break when non-ASCII alphanumerics are included in target selector.
|
|
46
|
+
* https://github.com/storybookjs/storybook/issues/15147
|
|
47
|
+
*
|
|
48
|
+
* This method returns storyId when it doesn't contain any non-ASCII alphanumerics.
|
|
49
|
+
* Otherwise, it generates a valid HTML tag name from storyId by removing non-ASCII alphanumerics from storyId, prefixing "sb-", and suffixing "-component"
|
|
50
|
+
* @protected
|
|
51
|
+
* @memberof AbstractRenderer
|
|
52
|
+
*/
|
|
53
|
+
protected generateTargetSelectorFromStoryId(): string;
|
|
41
54
|
protected initAngularRootElement(targetDOMNode: HTMLElement, targetSelector: string): void;
|
|
42
55
|
private fullRendererRequired;
|
|
43
56
|
}
|
|
@@ -125,7 +125,7 @@ var AbstractRenderer = /** @class */ (function () {
|
|
|
125
125
|
return __generator(this, function (_c) {
|
|
126
126
|
switch (_c.label) {
|
|
127
127
|
case 0:
|
|
128
|
-
targetSelector = "" + this.
|
|
128
|
+
targetSelector = "" + this.generateTargetSelectorFromStoryId();
|
|
129
129
|
newStoryProps$ = new rxjs_1.BehaviorSubject(storyFnAngular.props);
|
|
130
130
|
moduleMetadata = StorybookModule_1.getStorybookModuleMetadata({ storyFnAngular: storyFnAngular, component: component, targetSelector: targetSelector }, newStoryProps$);
|
|
131
131
|
if (!this.fullRendererRequired({
|
|
@@ -156,6 +156,25 @@ var AbstractRenderer = /** @class */ (function () {
|
|
|
156
156
|
});
|
|
157
157
|
});
|
|
158
158
|
};
|
|
159
|
+
/**
|
|
160
|
+
* Only ASCII alphanumerics can be used as HTML tag name.
|
|
161
|
+
* https://html.spec.whatwg.org/#elements-2
|
|
162
|
+
*
|
|
163
|
+
* Therefore, stories break when non-ASCII alphanumerics are included in target selector.
|
|
164
|
+
* https://github.com/storybookjs/storybook/issues/15147
|
|
165
|
+
*
|
|
166
|
+
* This method returns storyId when it doesn't contain any non-ASCII alphanumerics.
|
|
167
|
+
* Otherwise, it generates a valid HTML tag name from storyId by removing non-ASCII alphanumerics from storyId, prefixing "sb-", and suffixing "-component"
|
|
168
|
+
* @protected
|
|
169
|
+
* @memberof AbstractRenderer
|
|
170
|
+
*/
|
|
171
|
+
AbstractRenderer.prototype.generateTargetSelectorFromStoryId = function () {
|
|
172
|
+
var invalidHtmlTag = /[^A-Za-z0-9-]/g;
|
|
173
|
+
var storyIdIsInvalidHtmlTagName = invalidHtmlTag.test(this.storyId);
|
|
174
|
+
return storyIdIsInvalidHtmlTagName
|
|
175
|
+
? "sb-" + this.storyId.replace(invalidHtmlTag, '') + "-component"
|
|
176
|
+
: this.storyId;
|
|
177
|
+
};
|
|
159
178
|
AbstractRenderer.prototype.initAngularRootElement = function (targetDOMNode, targetSelector) {
|
|
160
179
|
// Adds DOM element that angular will use as bootstrap component
|
|
161
180
|
// eslint-disable-next-line no-param-reassign
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
"projects": {
|
|
4
4
|
"foo-project": {
|
|
5
5
|
"root": "",
|
|
6
|
+
"sourceRoot": "src",
|
|
6
7
|
"architect": {
|
|
7
8
|
"build": {
|
|
8
9
|
"options": {
|
|
@@ -14,6 +15,7 @@
|
|
|
14
15
|
},
|
|
15
16
|
"no-confs-project": {
|
|
16
17
|
"root": "",
|
|
18
|
+
"sourceRoot": "src",
|
|
17
19
|
"architect": {
|
|
18
20
|
"target-build": {
|
|
19
21
|
"options": {
|
|
@@ -25,6 +27,7 @@
|
|
|
25
27
|
},
|
|
26
28
|
"no-target-conf-project": {
|
|
27
29
|
"root": "",
|
|
30
|
+
"sourceRoot": "src",
|
|
28
31
|
"architect": {
|
|
29
32
|
"target-build": {
|
|
30
33
|
"options": {
|
|
@@ -41,6 +44,7 @@
|
|
|
41
44
|
},
|
|
42
45
|
"target-project": {
|
|
43
46
|
"root": "",
|
|
47
|
+
"sourceRoot": "src",
|
|
44
48
|
"architect": {
|
|
45
49
|
"target-build": {
|
|
46
50
|
"options": {
|
|
@@ -55,6 +55,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
|
|
|
55
55
|
// Private angular devkit stuff
|
|
56
56
|
var generateI18nBrowserWebpackConfigFromContext = require('@angular-devkit/build-angular/src/utils/webpack-browser-config').generateI18nBrowserWebpackConfigFromContext;
|
|
57
57
|
var _a = require('@angular-devkit/build-angular/src/webpack/configs'), getCommonConfig = _a.getCommonConfig, getStylesConfig = _a.getStylesConfig, getTypeScriptConfig = _a.getTypeScriptConfig;
|
|
58
|
+
var TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
|
|
58
59
|
var filterOutStylingRules = require('./utils/filter-out-styling-rules').filterOutStylingRules;
|
|
59
60
|
/**
|
|
60
61
|
* Extract webpack config from angular-cli 12.2.x
|
|
@@ -82,7 +83,12 @@ exports.getWebpackConfig = function (baseConfig, _a) {
|
|
|
82
83
|
rulesExcludingStyles = filterOutStylingRules(baseConfig);
|
|
83
84
|
module = __assign(__assign({}, baseConfig.module), { rules: __spreadArrays(cliConfig.module.rules, rulesExcludingStyles) });
|
|
84
85
|
plugins = __spreadArrays(((_d = cliConfig.plugins) !== null && _d !== void 0 ? _d : []), baseConfig.plugins);
|
|
85
|
-
resolve = __assign(__assign({}, baseConfig.resolve), { modules: Array.from(new Set(__spreadArrays(baseConfig.resolve.modules, cliConfig.resolve.modules)))
|
|
86
|
+
resolve = __assign(__assign({}, baseConfig.resolve), { modules: Array.from(new Set(__spreadArrays(baseConfig.resolve.modules, cliConfig.resolve.modules))), plugins: [
|
|
87
|
+
new TsconfigPathsPlugin({
|
|
88
|
+
configFile: builderOptions.tsConfig,
|
|
89
|
+
mainFields: ['browser', 'module', 'main'],
|
|
90
|
+
}),
|
|
91
|
+
] });
|
|
86
92
|
return [2 /*return*/, __assign(__assign({}, baseConfig), { entry: entry,
|
|
87
93
|
module: module,
|
|
88
94
|
plugins: plugins,
|
|
@@ -55,6 +55,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
|
|
|
55
55
|
// Private angular devkit stuff
|
|
56
56
|
var generateI18nBrowserWebpackConfigFromContext = require('@angular-devkit/build-angular/src/utils/webpack-browser-config').generateI18nBrowserWebpackConfigFromContext;
|
|
57
57
|
var _a = require('@angular-devkit/build-angular/src/webpack/configs'), getCommonConfig = _a.getCommonConfig, getStylesConfig = _a.getStylesConfig, getTypescriptWorkerPlugin = _a.getTypescriptWorkerPlugin;
|
|
58
|
+
var TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
|
|
58
59
|
var filterOutStylingRules = require('./utils/filter-out-styling-rules').filterOutStylingRules;
|
|
59
60
|
/**
|
|
60
61
|
* Extract webpack config from angular-cli 13.x.x
|
|
@@ -82,7 +83,12 @@ exports.getWebpackConfig = function (baseConfig, _a) {
|
|
|
82
83
|
rulesExcludingStyles = filterOutStylingRules(baseConfig);
|
|
83
84
|
module = __assign(__assign({}, baseConfig.module), { rules: __spreadArrays(cliConfig.module.rules, rulesExcludingStyles) });
|
|
84
85
|
plugins = __spreadArrays(((_d = cliConfig.plugins) !== null && _d !== void 0 ? _d : []), baseConfig.plugins);
|
|
85
|
-
resolve = __assign(__assign({}, baseConfig.resolve), { modules: Array.from(new Set(__spreadArrays(baseConfig.resolve.modules, cliConfig.resolve.modules)))
|
|
86
|
+
resolve = __assign(__assign({}, baseConfig.resolve), { modules: Array.from(new Set(__spreadArrays(baseConfig.resolve.modules, cliConfig.resolve.modules))), plugins: [
|
|
87
|
+
new TsconfigPathsPlugin({
|
|
88
|
+
configFile: builderOptions.tsConfig,
|
|
89
|
+
mainFields: ['browser', 'module', 'main'],
|
|
90
|
+
}),
|
|
91
|
+
] });
|
|
86
92
|
return [2 /*return*/, __assign(__assign({}, baseConfig), { entry: entry,
|
|
87
93
|
module: module,
|
|
88
94
|
plugins: plugins,
|
|
@@ -163,7 +163,7 @@ var buildWebpackConfigOptions = function (dirToSearch, project, target, confName
|
|
|
163
163
|
// 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 ^^)
|
|
164
164
|
logger: node_1.createConsoleLogger(),
|
|
165
165
|
projectRoot: core_1.getSystemPath(projectRootNormalized),
|
|
166
|
-
sourceRoot: core_1.getSystemPath(sourceRootNormalized),
|
|
166
|
+
sourceRoot: sourceRootNormalized ? core_1.getSystemPath(sourceRootNormalized) : undefined,
|
|
167
167
|
buildOptions: buildOptions,
|
|
168
168
|
tsConfig: tsConfig,
|
|
169
169
|
tsConfigPath: tsConfigPath,
|
|
@@ -230,7 +230,7 @@ function getLegacyDefaultBuildOptions(options) {
|
|
|
230
230
|
target: 'build',
|
|
231
231
|
};
|
|
232
232
|
_a = angular_read_workspace_1.findAngularProjectTarget(workspaceConfig, browserTarget.project, browserTarget.target), target = _a.target, project = _a.project;
|
|
233
|
-
node_logger_1.logger.info("=> Using angular project \"" + project + ":" + target + "\" for configuring Storybook");
|
|
233
|
+
node_logger_1.logger.info("=> Using angular project \"" + browserTarget.project + ":" + browserTarget.target + "\" for configuring Storybook");
|
|
234
234
|
return [2 /*return*/, __assign({}, target.options)];
|
|
235
235
|
}
|
|
236
236
|
catch (error) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@storybook/angular",
|
|
3
|
-
"version": "6.4.
|
|
3
|
+
"version": "6.4.9",
|
|
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.
|
|
49
|
-
"@storybook/api": "6.4.
|
|
50
|
-
"@storybook/core": "6.4.
|
|
51
|
-
"@storybook/core-common": "6.4.
|
|
52
|
-
"@storybook/core-events": "6.4.
|
|
48
|
+
"@storybook/addons": "6.4.9",
|
|
49
|
+
"@storybook/api": "6.4.9",
|
|
50
|
+
"@storybook/core": "6.4.9",
|
|
51
|
+
"@storybook/core-common": "6.4.9",
|
|
52
|
+
"@storybook/core-events": "6.4.9",
|
|
53
53
|
"@storybook/csf": "0.0.2--canary.87bc651.0",
|
|
54
|
-
"@storybook/node-logger": "6.4.
|
|
54
|
+
"@storybook/node-logger": "6.4.9",
|
|
55
55
|
"@storybook/semver": "^7.3.2",
|
|
56
|
-
"@storybook/store": "6.4.
|
|
56
|
+
"@storybook/store": "6.4.9",
|
|
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": "
|
|
141
|
+
"gitHead": "7d354c89322080b241454eff2cd3adf9c11306cd"
|
|
142
142
|
}
|