@storybook/angular 6.4.9 → 6.4.10
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,4 +1,5 @@
|
|
|
1
1
|
import { Configuration } from 'webpack';
|
|
2
|
-
export declare function webpack(config: Configuration, { configDir }: {
|
|
2
|
+
export declare function webpack(config: Configuration, { configDir, angularBuilderContext }: {
|
|
3
3
|
configDir: string;
|
|
4
|
-
|
|
4
|
+
angularBuilderContext: any;
|
|
5
|
+
}): Promise<Configuration>;
|
|
@@ -1,4 +1,8 @@
|
|
|
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
|
+
};
|
|
2
6
|
var __assign = (this && this.__assign) || function () {
|
|
3
7
|
__assign = Object.assign || function(t) {
|
|
4
8
|
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
@@ -74,6 +78,7 @@ var node_logger_1 = require("@storybook/node-logger");
|
|
|
74
78
|
var architect_1 = require("@angular-devkit/architect");
|
|
75
79
|
var find_up_1 = require("find-up");
|
|
76
80
|
var semver_1 = __importDefault(require("@storybook/semver"));
|
|
81
|
+
var ts_dedent_1 = __importDefault(require("ts-dedent"));
|
|
77
82
|
var core_1 = require("@angular-devkit/core");
|
|
78
83
|
var module_is_available_1 = require("./utils/module-is-available");
|
|
79
84
|
var angular_cli_webpack_12_2_x_1 = require("./angular-cli-webpack-12.2.x");
|
|
@@ -111,7 +116,7 @@ function webpackFinal(baseConfig, options) {
|
|
|
111
116
|
case 2:
|
|
112
117
|
legacyDefaultOptions = _a.sent();
|
|
113
118
|
return [2 /*return*/, angular_cli_webpack_13_x_x_1.getWebpackConfig(_baseConfig, {
|
|
114
|
-
builderOptions: __assign(__assign({}, builderOptions), legacyDefaultOptions),
|
|
119
|
+
builderOptions: __assign(__assign({ watch: options.configType === 'DEVELOPMENT' }, builderOptions), legacyDefaultOptions),
|
|
115
120
|
builderContext: builderContext,
|
|
116
121
|
})];
|
|
117
122
|
}
|
|
@@ -208,6 +213,7 @@ function getLegacyDefaultBuildOptions(options) {
|
|
|
208
213
|
// Not use legacy way with builder (`angularBrowserTarget` is defined or null with builder and undefined without)
|
|
209
214
|
return [2 /*return*/, {}];
|
|
210
215
|
}
|
|
216
|
+
node_logger_1.logger.warn(ts_dedent_1.default(templateObject_1 || (templateObject_1 = __makeTemplateObject(["Your Storybook startup uses a solution that will not be supported in version 7.0. \n You must use angular builder to have an explicit configuration on the project used in angular.json\n Read more at:\n - https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#sb-angular-builder)\n - https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#angular13)\n "], ["Your Storybook startup uses a solution that will not be supported in version 7.0. \n You must use angular builder to have an explicit configuration on the project used in angular.json\n Read more at:\n - https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#sb-angular-builder)\n - https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#angular13)\n "]))));
|
|
211
217
|
dirToSearch = process.cwd();
|
|
212
218
|
_b.label = 1;
|
|
213
219
|
case 1:
|
|
@@ -243,3 +249,4 @@ function getLegacyDefaultBuildOptions(options) {
|
|
|
243
249
|
});
|
|
244
250
|
});
|
|
245
251
|
}
|
|
252
|
+
var templateObject_1;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Configuration } from 'webpack';
|
|
2
|
-
export declare function webpack(config: Configuration, { configDir }: {
|
|
2
|
+
export declare function webpack(config: Configuration, { configDir, angularBuilderContext }: {
|
|
3
3
|
configDir: string;
|
|
4
|
-
|
|
4
|
+
angularBuilderContext: any;
|
|
5
|
+
}): Promise<Configuration>;
|
|
@@ -10,6 +10,61 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
14
|
+
if (k2 === undefined) k2 = k;
|
|
15
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
16
|
+
}) : (function(o, m, k, k2) {
|
|
17
|
+
if (k2 === undefined) k2 = k;
|
|
18
|
+
o[k2] = m[k];
|
|
19
|
+
}));
|
|
20
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
+
}) : function(o, v) {
|
|
23
|
+
o["default"] = v;
|
|
24
|
+
});
|
|
25
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
26
|
+
if (mod && mod.__esModule) return mod;
|
|
27
|
+
var result = {};
|
|
28
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
29
|
+
__setModuleDefault(result, mod);
|
|
30
|
+
return result;
|
|
31
|
+
};
|
|
32
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
33
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
34
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
35
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
36
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
37
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
38
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
39
|
+
});
|
|
40
|
+
};
|
|
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
|
+
};
|
|
13
68
|
var __spreadArrays = (this && this.__spreadArrays) || function () {
|
|
14
69
|
for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
|
|
15
70
|
for (var r = Array(s), k = 0, i = 0; i < il; i++)
|
|
@@ -23,52 +78,76 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
23
78
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
79
|
exports.webpack = void 0;
|
|
25
80
|
var path_1 = __importDefault(require("path"));
|
|
81
|
+
var semver_1 = __importDefault(require("@storybook/semver"));
|
|
26
82
|
var webpack_1 = require("webpack");
|
|
27
83
|
var autoprefixer_1 = __importDefault(require("autoprefixer"));
|
|
28
84
|
var ts_config_1 = __importDefault(require("./ts_config"));
|
|
29
85
|
var create_fork_ts_checker_plugin_1 = __importDefault(require("./create-fork-ts-checker-plugin"));
|
|
30
86
|
function webpack(config, _a) {
|
|
31
|
-
var configDir = _a.configDir;
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
87
|
+
var configDir = _a.configDir, angularBuilderContext = _a.angularBuilderContext;
|
|
88
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
89
|
+
var angularCliVersion, error_1, tsLoaderOptions;
|
|
90
|
+
return __generator(this, function (_b) {
|
|
91
|
+
switch (_b.label) {
|
|
92
|
+
case 0:
|
|
93
|
+
_b.trys.push([0, 2, , 3]);
|
|
94
|
+
return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('@angular/cli')); }).then(function (m) {
|
|
95
|
+
return semver_1.default.coerce(m.VERSION.full);
|
|
96
|
+
})];
|
|
97
|
+
case 1:
|
|
98
|
+
angularCliVersion = _b.sent();
|
|
99
|
+
if ((semver_1.default.satisfies(angularCliVersion, '12.2.x') && angularBuilderContext) ||
|
|
100
|
+
semver_1.default.satisfies(angularCliVersion, '>=13.0.0')) {
|
|
101
|
+
return [2 /*return*/, config];
|
|
102
|
+
}
|
|
103
|
+
return [3 /*break*/, 3];
|
|
104
|
+
case 2:
|
|
105
|
+
error_1 = _b.sent();
|
|
106
|
+
return [3 /*break*/, 3];
|
|
107
|
+
case 3:
|
|
108
|
+
tsLoaderOptions = ts_config_1.default(configDir);
|
|
109
|
+
return [2 /*return*/, __assign(__assign({}, config), { module: __assign(__assign({}, config.module), { rules: __spreadArrays(config.module.rules, [
|
|
110
|
+
{
|
|
111
|
+
test: /\.tsx?$/,
|
|
112
|
+
use: [
|
|
113
|
+
{
|
|
114
|
+
loader: require.resolve('ts-loader'),
|
|
115
|
+
options: tsLoaderOptions,
|
|
116
|
+
},
|
|
117
|
+
{ loader: path_1.default.resolve(__dirname, 'ngx-template-loader') },
|
|
118
|
+
],
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
test: /[/\\]@angular[/\\]core[/\\].+\.js$/,
|
|
122
|
+
parser: { system: true },
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
test: /\.html$/,
|
|
126
|
+
loader: require.resolve('raw-loader'),
|
|
127
|
+
exclude: /\.async\.html$/,
|
|
128
|
+
},
|
|
129
|
+
{
|
|
130
|
+
test: /\.s(c|a)ss$/,
|
|
131
|
+
use: [
|
|
132
|
+
{ loader: require.resolve('raw-loader') },
|
|
133
|
+
{
|
|
134
|
+
loader: require.resolve('postcss-loader'),
|
|
135
|
+
options: {
|
|
136
|
+
postcssOptions: {
|
|
137
|
+
plugins: [autoprefixer_1.default()],
|
|
138
|
+
},
|
|
139
|
+
},
|
|
140
|
+
},
|
|
141
|
+
{ loader: require.resolve('sass-loader') },
|
|
142
|
+
],
|
|
143
|
+
},
|
|
144
|
+
]) }), resolve: __assign({}, config.resolve), plugins: __spreadArrays(config.plugins, [
|
|
145
|
+
// See https://github.com/angular/angular/issues/11580#issuecomment-401127742
|
|
146
|
+
new webpack_1.ContextReplacementPlugin(/@angular(\\|\/)core(\\|\/)(fesm5|bundles)/, path_1.default.resolve(__dirname, '..')),
|
|
147
|
+
create_fork_ts_checker_plugin_1.default(tsLoaderOptions),
|
|
148
|
+
]) })];
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
});
|
|
73
152
|
}
|
|
74
153
|
exports.webpack = webpack;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@storybook/angular",
|
|
3
|
-
"version": "6.4.
|
|
3
|
+
"version": "6.4.10",
|
|
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.10",
|
|
49
|
+
"@storybook/api": "6.4.10",
|
|
50
|
+
"@storybook/core": "6.4.10",
|
|
51
|
+
"@storybook/core-common": "6.4.10",
|
|
52
|
+
"@storybook/core-events": "6.4.10",
|
|
53
53
|
"@storybook/csf": "0.0.2--canary.87bc651.0",
|
|
54
|
-
"@storybook/node-logger": "6.4.
|
|
54
|
+
"@storybook/node-logger": "6.4.10",
|
|
55
55
|
"@storybook/semver": "^7.3.2",
|
|
56
|
-
"@storybook/store": "6.4.
|
|
56
|
+
"@storybook/store": "6.4.10",
|
|
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": "ed6c4a7d9c14d705499c118b0bac33c57de7ebe0"
|
|
142
142
|
}
|