@nx/storybook 16.0.0-beta.6 → 16.0.0-beta.7
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/package.json +8 -8
- package/src/executors/build-storybook/build-storybook.impl.js +1 -1
- package/src/executors/build-storybook/build-storybook.impl.js.map +1 -1
- package/src/executors/storybook/storybook.impl.js +4 -4
- package/src/executors/storybook/storybook.impl.js.map +1 -1
- package/src/generators/init/init.js +12 -0
- package/src/generators/init/init.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/storybook",
|
|
3
|
-
"version": "16.0.0-beta.
|
|
3
|
+
"version": "16.0.0-beta.7",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Storybook contains executors and generators for allowing your workspace to use the powerful Storybook integration testing & documenting capabilities.",
|
|
6
6
|
"repository": {
|
|
@@ -30,12 +30,12 @@
|
|
|
30
30
|
"migrations": "./migrations.json"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@nrwl/storybook": "16.0.0-beta.
|
|
34
|
-
"@nx/cypress": "16.0.0-beta.
|
|
35
|
-
"@nx/devkit": "16.0.0-beta.
|
|
36
|
-
"@nx/js": "16.0.0-beta.
|
|
37
|
-
"@nx/linter": "16.0.0-beta.
|
|
38
|
-
"@nx/workspace": "16.0.0-beta.
|
|
33
|
+
"@nrwl/storybook": "16.0.0-beta.7",
|
|
34
|
+
"@nx/cypress": "16.0.0-beta.7",
|
|
35
|
+
"@nx/devkit": "16.0.0-beta.7",
|
|
36
|
+
"@nx/js": "16.0.0-beta.7",
|
|
37
|
+
"@nx/linter": "16.0.0-beta.7",
|
|
38
|
+
"@nx/workspace": "16.0.0-beta.7",
|
|
39
39
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
40
40
|
"dotenv": "~10.0.0",
|
|
41
41
|
"enquirer": "~2.3.6",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"access": "public"
|
|
46
46
|
},
|
|
47
47
|
"types": "./index.d.ts",
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "eb477479bf73bca940323a66e486221f00006c0f"
|
|
49
49
|
}
|
|
@@ -42,7 +42,7 @@ function runInstance(options, storybook7) {
|
|
|
42
42
|
const env = (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'production';
|
|
43
43
|
process.env.NODE_ENV = env;
|
|
44
44
|
if (storybook7) {
|
|
45
|
-
return build
|
|
45
|
+
return build.build(Object.assign(Object.assign({}, options), { mode: 'static' }));
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
48
|
const nodeVersion = process.version.slice(1).split('.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/build-storybook/build-storybook.impl.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AACrD,gDAAgD;AAEhD,yBAAuB;AACvB,qDAG+B;AAE/B,oCAIkB;AAElB,SAA8B,sBAAsB,CAClD,OAA6C,EAC7C,OAAwB;;;QAExB,IAAA,sCAA0B,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACnE,MAAM,UAAU,GAAG,IAAA,iCAAqB,GAAE,KAAK,CAAC,CAAC;QACjD,IAAI,UAAU,EAAE;YACd,MAAM,YAAY,GAAe,OAAO,CAAC;YACzC,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACjD,MAAM,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAC5C,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACjD,eAAM,CAAC,IAAI,CAAC,mCAAmC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;YACzE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;aAAM;YACL,0CAA0C;YAC1C,iBAAiB;YACjB,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;YAChC,IAAA,qBAAa,GAAE,CAAC;YAEhB,eAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;YAEvD,MAAM,aAAa,GAAG,IAAA,iCAAyB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACrE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,YAAa,aAAa,4CAAC,CAAC;YAElE,MAAM,YAAY,iDACb,OAAO,GACP,gBAAgB,KACnB,gBAAgB,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,GACjE,CAAC;YAEF,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACjD,MAAM,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAC5C,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACjD,eAAM,CAAC,IAAI,CAAC,mCAAmC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;YACzE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;IACH,CAAC;CAAA;AApCD,yCAoCC;AAED,SAAS,WAAW,
|
|
1
|
+
{"version":3,"file":"build-storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/build-storybook/build-storybook.impl.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AACrD,gDAAgD;AAEhD,yBAAuB;AACvB,qDAG+B;AAE/B,oCAIkB;AAElB,SAA8B,sBAAsB,CAClD,OAA6C,EAC7C,OAAwB;;;QAExB,IAAA,sCAA0B,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACnE,MAAM,UAAU,GAAG,IAAA,iCAAqB,GAAE,KAAK,CAAC,CAAC;QACjD,IAAI,UAAU,EAAE;YACd,MAAM,YAAY,GAAe,OAAO,CAAC;YACzC,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACjD,MAAM,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAC5C,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACjD,eAAM,CAAC,IAAI,CAAC,mCAAmC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;YACzE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;aAAM;YACL,0CAA0C;YAC1C,iBAAiB;YACjB,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;YAChC,IAAA,qBAAa,GAAE,CAAC;YAEhB,eAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;YAEvD,MAAM,aAAa,GAAG,IAAA,iCAAyB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACrE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,YAAa,aAAa,4CAAC,CAAC;YAElE,MAAM,YAAY,iDACb,OAAO,GACP,gBAAgB,KACnB,gBAAgB,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,GACjE,CAAC;YAEF,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACjD,MAAM,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAC5C,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACjD,eAAM,CAAC,IAAI,CAAC,mCAAmC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;YACzE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;IACH,CAAC;CAAA;AApCD,yCAoCC;AAED,SAAS,WAAW,CAClB,OAAmB,EACnB,UAAmB;;IAMnB,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,YAAY,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC;IAE3B,IAAI,UAAU,EAAE;QACd,OAAO,KAAK,CAAC,KAAK,iCACb,OAAO,KACV,IAAI,EAAE,QAAQ,IACd,CAAC;KACJ;SAAM;QACL,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1B,eAAM,CAAC,IAAI,CAAC;;;OAGX,CAAC,CAAC;SACJ;QACD,OAAO,KAAK,CAAC,qBAAqB,CAAC,gCAC9B,OAAO,KACV,EAAE,EAAE,IAAI,GACF,CAAC,CAAC,CAAC,0CAA0C;KACtD;AACH,CAAC"}
|
|
@@ -17,8 +17,8 @@ function storybookExecutor(options, context) {
|
|
|
17
17
|
yield yield tslib_1.__await({
|
|
18
18
|
success: true,
|
|
19
19
|
info: {
|
|
20
|
-
port: result === null || result === void 0 ? void 0 : result
|
|
21
|
-
baseUrl: `${options.https ? 'https' : 'http'}://${(_a = options.host) !== null && _a !== void 0 ? _a : 'localhost'}:${result === null || result === void 0 ? void 0 : result
|
|
20
|
+
port: result === null || result === void 0 ? void 0 : result['port'],
|
|
21
|
+
baseUrl: `${options.https ? 'https' : 'http'}://${(_a = options.host) !== null && _a !== void 0 ? _a : 'localhost'}:${result === null || result === void 0 ? void 0 : result['port']}`,
|
|
22
22
|
},
|
|
23
23
|
});
|
|
24
24
|
yield tslib_1.__await(new Promise(() => { }));
|
|
@@ -43,11 +43,11 @@ function runInstance(options, storybook7) {
|
|
|
43
43
|
const env = (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'development';
|
|
44
44
|
process.env.NODE_ENV = env;
|
|
45
45
|
if (storybook7) {
|
|
46
|
-
return build
|
|
46
|
+
return build.build(Object.assign(Object.assign({}, options), { mode: 'dev' }));
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
49
|
// TODO(katerina): Remove when Storybook 7
|
|
50
|
-
return build
|
|
50
|
+
return build['buildDev'](Object.assign(Object.assign({}, options), { configType: env.toUpperCase(), mode: 'dev' }));
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
//# sourceMappingURL=storybook.impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/storybook/storybook.impl.ts"],"names":[],"mappings":";;;AACA,gDAAgD;AAChD,yBAAuB;AACvB,qDAG+B;AAC/B,oCAIkB;AAIlB,SAA+B,iBAAiB,CAC9C,OAA6C,EAC7C,OAAwB;;;;QAKxB,MAAM,UAAU,GAAG,IAAA,iCAAqB,GAAE,KAAK,CAAC,CAAC;QACjD,IAAA,sCAA0B,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACnE,IAAI,UAAU,EAAE;YACd,MAAM,YAAY,GAAe,OAAO,CAAC;YACzC,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/storybook/storybook.impl.ts"],"names":[],"mappings":";;;AACA,gDAAgD;AAChD,yBAAuB;AACvB,qDAG+B;AAC/B,oCAIkB;AAIlB,SAA+B,iBAAiB,CAC9C,OAA6C,EAC7C,OAAwB;;;;QAKxB,MAAM,UAAU,GAAG,IAAA,iCAAqB,GAAE,KAAK,CAAC,CAAC;QACjD,IAAA,sCAA0B,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACnE,IAAI,UAAU,EAAE;YACd,MAAM,YAAY,GAAe,OAAO,CAAC;YACzC,MAAM,MAAM,GAAG,sBAAM,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA,CAAC;YAC3D,4BAAM;gBACJ,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,MAAM,CAAC;oBACtB,OAAO,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,MAC1C,MAAA,OAAO,CAAC,IAAI,mCAAI,WAClB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,MAAM,CAAC,EAAE;iBACvB;aACF,CAAA,CAAC;YACF,sBAAM,IAAI,OAAO,CAAuB,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA,CAAC;SACnD;aAAM;YACL,0CAA0C;YAC1C,iBAAiB;YACjB,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;YAChC,IAAA,qBAAa,GAAE,CAAC;YAEhB,IAAI,aAAa,GAAG,IAAA,iCAAyB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACnE,MAAM,gBAAgB,GAAG,CAAC,4BAAa,aAAa,6CAAC,CAAC,CAAC,OAAO,CAAC;YAC/D,MAAM,YAAY,iDACb,OAAO,GACP,gBAAgB,KACnB,gBAAgB,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,GACjE,CAAC;YAEF,sBAAM,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA,CAAC;YAC5C,4BAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;YACxB,sBAAM,IAAI,OAAO,CAAuB,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA,CAAC;SACnD;;CACF;AAxCD,oCAwCC;AAED,SAAS,WAAW,CAClB,OAAmB,EACnB,UAAmB;;IAMnB,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,aAAa,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC;IAC3B,IAAI,UAAU,EAAE;QACd,OAAO,KAAK,CAAC,KAAK,iCACb,OAAO,KACV,IAAI,EAAE,KAAK,IACX,CAAC;KACJ;SAAM;QACL,0CAA0C;QAC1C,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC,gCACpB,OAAO,KACV,UAAU,EAAE,GAAG,CAAC,WAAW,EAAE,EAC7B,IAAI,EAAE,KAAK,GACL,CAAC,CAAC;KACX;AACH,CAAC"}
|
|
@@ -8,6 +8,7 @@ const versions_1 = require("../../utils/versions");
|
|
|
8
8
|
const utilities_1 = require("../../utils/utilities");
|
|
9
9
|
const semver_1 = require("semver");
|
|
10
10
|
function checkDependenciesInstalled(host, schema) {
|
|
11
|
+
var _a;
|
|
11
12
|
const packageJson = (0, devkit_1.readJson)(host, 'package.json');
|
|
12
13
|
const devDependencies = {};
|
|
13
14
|
const dependencies = {};
|
|
@@ -37,6 +38,17 @@ function checkDependenciesInstalled(host, schema) {
|
|
|
37
38
|
}
|
|
38
39
|
else {
|
|
39
40
|
devDependencies[schema.uiFramework] = storybook7VersionToInstall;
|
|
41
|
+
const isPnpm = (0, devkit_1.detectPackageManager)(host.root) === 'pnpm';
|
|
42
|
+
if (isPnpm) {
|
|
43
|
+
// If it's pnpm, it needs the framework without the builder
|
|
44
|
+
// as a dependency too (eg. @storybook/react)
|
|
45
|
+
const matchResult = (_a = schema.uiFramework) === null || _a === void 0 ? void 0 : _a.match(/^@storybook\/(\w+)/);
|
|
46
|
+
const uiFrameworkWithoutBuilder = matchResult ? matchResult[0] : null;
|
|
47
|
+
if (uiFrameworkWithoutBuilder) {
|
|
48
|
+
devDependencies[uiFrameworkWithoutBuilder] =
|
|
49
|
+
storybook7VersionToInstall;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
40
52
|
}
|
|
41
53
|
devDependencies['@storybook/core-server'] = storybook7VersionToInstall;
|
|
42
54
|
devDependencies['@storybook/addon-essentials'] = storybook7VersionToInstall;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|