@nrwl/storybook 13.2.0-beta.4 → 13.2.0-rc.2
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 +5 -5
- package/src/executors/build-storybook/build-storybook.impl.d.ts +1 -1
- package/src/executors/build-storybook/build-storybook.impl.js +4 -35
- package/src/executors/build-storybook/build-storybook.impl.js.map +1 -1
- package/src/executors/storybook/storybook.impl.d.ts +1 -1
- package/src/executors/storybook/storybook.impl.js +4 -32
- package/src/executors/storybook/storybook.impl.js.map +1 -1
- package/src/executors/utils.d.ts +2 -0
- package/src/executors/utils.js +71 -1
- package/src/executors/utils.js.map +1 -1
- package/src/generators/configuration/configuration.js +3 -33
- package/src/generators/configuration/configuration.js.map +1 -1
- package/src/utils/utilities.d.ts +5 -1
- package/src/utils/utilities.js +75 -1
- package/src/utils/utilities.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/storybook",
|
|
3
|
-
"version": "13.2.0-
|
|
3
|
+
"version": "13.2.0-rc.2",
|
|
4
4
|
"description": "Storybook plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -29,10 +29,10 @@
|
|
|
29
29
|
"migrations": "./migrations.json"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@nrwl/cypress": "13.2.0-
|
|
33
|
-
"@nrwl/devkit": "13.2.0-
|
|
34
|
-
"@nrwl/linter": "13.2.0-
|
|
35
|
-
"@nrwl/workspace": "13.2.0-
|
|
32
|
+
"@nrwl/cypress": "13.2.0-rc.2",
|
|
33
|
+
"@nrwl/devkit": "13.2.0-rc.2",
|
|
34
|
+
"@nrwl/linter": "13.2.0-rc.2",
|
|
35
|
+
"@nrwl/workspace": "13.2.0-rc.2",
|
|
36
36
|
"core-js": "^3.6.5",
|
|
37
37
|
"semver": "7.3.4",
|
|
38
38
|
"ts-loader": "^9.2.6",
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
require("
|
|
5
|
-
const path_1 = require("path");
|
|
6
|
-
const os_1 = require("os");
|
|
7
|
-
const fs_1 = require("fs");
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
8
5
|
const build = require("@storybook/core/standalone");
|
|
6
|
+
require("dotenv/config");
|
|
9
7
|
const utils_1 = require("../utils");
|
|
10
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
11
8
|
function buildStorybookExecutor(options, context) {
|
|
12
9
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
13
10
|
devkit_1.logger.info(`NX ui framework: ${options.uiFramework}`);
|
|
@@ -28,35 +25,7 @@ function runInstance(options) {
|
|
|
28
25
|
return build(Object.assign(Object.assign({}, options), { ci: true }));
|
|
29
26
|
}
|
|
30
27
|
function storybookOptionMapper(builderOptions, frameworkOptions, context) {
|
|
31
|
-
(0, utils_1.
|
|
32
|
-
|
|
33
|
-
const optionsWithFramework = Object.assign(Object.assign(Object.assign(Object.assign({}, builderOptions), { mode: 'static', outputDir: builderOptions.outputPath, workspaceRoot: context.root, configDir: storybookConfig }), frameworkOptions), { frameworkPresets: [...(frameworkOptions.frameworkPresets || [])], watch: false });
|
|
34
|
-
optionsWithFramework.config;
|
|
35
|
-
return optionsWithFramework;
|
|
36
|
-
}
|
|
37
|
-
function findOrCreateConfig(config, context) {
|
|
38
|
-
if (config.configFolder && (0, fs_1.statSync)(config.configFolder).isDirectory()) {
|
|
39
|
-
return config.configFolder;
|
|
40
|
-
}
|
|
41
|
-
else if ((0, fs_1.statSync)(config.configPath).isFile() &&
|
|
42
|
-
(0, fs_1.statSync)(config.pluginPath).isFile() &&
|
|
43
|
-
(0, fs_1.statSync)(config.srcRoot).isFile()) {
|
|
44
|
-
return createStorybookConfig(config.configPath, config.pluginPath, config.srcRoot);
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
const sourceRoot = context.workspace.projects[context.projectName].root;
|
|
48
|
-
if ((0, fs_1.statSync)((0, path_1.join)(context.root, sourceRoot, '.storybook')).isDirectory()) {
|
|
49
|
-
return (0, path_1.join)(context.root, sourceRoot, '.storybook');
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
throw new Error('No configuration settings');
|
|
53
|
-
}
|
|
54
|
-
function createStorybookConfig(configPath, pluginPath, srcRoot) {
|
|
55
|
-
const tmpDir = (0, os_1.tmpdir)();
|
|
56
|
-
const tmpFolder = (0, fs_1.mkdtempSync)(`${tmpDir}${path_1.sep}`);
|
|
57
|
-
(0, fs_1.copyFileSync)(configPath, `${tmpFolder}${(0, path_1.basename)(configPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
58
|
-
(0, fs_1.copyFileSync)(pluginPath, `${tmpFolder}${(0, path_1.basename)(pluginPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
59
|
-
(0, fs_1.copyFileSync)(srcRoot, `${tmpFolder}${(0, path_1.basename)(srcRoot)}`, fs_1.constants.COPYFILE_EXCL);
|
|
60
|
-
return tmpFolder;
|
|
28
|
+
const storybookOptions = Object.assign(Object.assign(Object.assign({}, builderOptions), (0, utils_1.resolveCommonStorybookOptionMapper)(builderOptions, frameworkOptions, context)), { mode: 'static', outputDir: builderOptions.outputPath });
|
|
29
|
+
return storybookOptions;
|
|
61
30
|
}
|
|
62
31
|
//# sourceMappingURL=build-storybook.impl.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"build-storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/build-storybook/build-storybook.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAuD;AACvD,oDAAoD;AACpD,yBAAuB;AAEvB,oCAIkB;AAQlB,SAA8B,sBAAsB,CAClD,OAAgC,EAChC,OAAwB;;QAExB,eAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAEvD,MAAM,aAAa,GAAG,IAAA,iCAAyB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAErE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,2CAAa,aAAa,EAAC,CAAC;QAClE,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAEzE,iBAAiB;QACjB,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;QAEhC,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QACjD,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;QAC1B,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QACjD,eAAM,CAAC,IAAI,CAAC,mCAAmC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QACrE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;CAAA;AAnBD,yCAmBC;AAED,SAAS,WAAW,CAAC,OAAgC;IACnD,OAAO,KAAK,iCAAM,OAAO,KAAE,EAAE,EAAE,IAAI,IAAG,CAAC;AACzC,CAAC;AAED,SAAS,qBAAqB,CAC5B,cAAuC,EACvC,gBAAqB,EACrB,OAAwB;IAExB,MAAM,gBAAgB,iDACjB,cAAc,GACd,IAAA,0CAAkC,EACnC,cAAc,EACd,gBAAgB,EAChB,OAAO,CACR,KACD,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,cAAc,CAAC,UAAU,GACrC,CAAC;IAEF,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
require("
|
|
5
|
-
const path_1 = require("path");
|
|
6
|
-
const os_1 = require("os");
|
|
7
|
-
const fs_1 = require("fs");
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
8
5
|
const server_1 = require("@storybook/core/server");
|
|
6
|
+
require("dotenv/config");
|
|
9
7
|
const utils_1 = require("../utils");
|
|
10
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
11
8
|
function storybookExecutor(options, context) {
|
|
12
9
|
return (0, tslib_1.__asyncGenerator)(this, arguments, function* storybookExecutor_1() {
|
|
13
10
|
let frameworkPath = (0, utils_1.getStorybookFrameworkPath)(options.uiFramework);
|
|
@@ -59,32 +56,7 @@ function runInstance(options) {
|
|
|
59
56
|
});
|
|
60
57
|
}
|
|
61
58
|
function storybookOptionMapper(builderOptions, frameworkOptions, context) {
|
|
62
|
-
(0, utils_1.
|
|
63
|
-
|
|
64
|
-
return Object.assign(Object.assign(Object.assign(Object.assign({}, builderOptions), { mode: 'dev', workspaceRoot: context.root, configDir: storybookConfig }), frameworkOptions), { frameworkPresets: [...(frameworkOptions.frameworkPresets || [])] });
|
|
65
|
-
}
|
|
66
|
-
function findOrCreateConfig(config, context) {
|
|
67
|
-
const sourceRoot = context.workspace.projects[context.projectName].root;
|
|
68
|
-
if (config.configFolder && (0, fs_1.statSync)(config.configFolder).isDirectory()) {
|
|
69
|
-
return config.configFolder;
|
|
70
|
-
}
|
|
71
|
-
else if ((0, fs_1.statSync)(config.configPath).isFile() &&
|
|
72
|
-
(0, fs_1.statSync)(config.pluginPath).isFile() &&
|
|
73
|
-
(0, fs_1.statSync)(config.srcRoot).isFile()) {
|
|
74
|
-
return createStorybookConfig(config.configPath, config.pluginPath, config.srcRoot);
|
|
75
|
-
}
|
|
76
|
-
else if ((0, fs_1.statSync)((0, path_1.join)(context.root, sourceRoot, '.storybook')).isDirectory()) {
|
|
77
|
-
return (0, path_1.join)(context.root, sourceRoot, '.storybook');
|
|
78
|
-
}
|
|
79
|
-
throw new Error('No configuration settings');
|
|
80
|
-
}
|
|
81
|
-
function createStorybookConfig(configPath, pluginPath, srcRoot) {
|
|
82
|
-
const tmpDir = (0, os_1.tmpdir)();
|
|
83
|
-
const tmpFolder = `${tmpDir}${path_1.sep}`;
|
|
84
|
-
(0, fs_1.mkdtempSync)(tmpFolder);
|
|
85
|
-
(0, fs_1.copyFileSync)(configPath, `${tmpFolder}/${(0, path_1.basename)(configPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
86
|
-
(0, fs_1.copyFileSync)(pluginPath, `${tmpFolder}/${(0, path_1.basename)(pluginPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
87
|
-
(0, fs_1.copyFileSync)(srcRoot, `${tmpFolder}/${(0, path_1.basename)(srcRoot)}`, fs_1.constants.COPYFILE_EXCL);
|
|
88
|
-
return tmpFolder;
|
|
59
|
+
const storybookOptions = Object.assign(Object.assign(Object.assign({}, builderOptions), (0, utils_1.resolveCommonStorybookOptionMapper)(builderOptions, frameworkOptions, context)), { mode: 'dev', watch: true });
|
|
60
|
+
return storybookOptions;
|
|
89
61
|
}
|
|
90
62
|
//# 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":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/storybook/storybook.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAuD;AACvD,mDAA4D;AAC5D,yBAAuB;AAEvB,oCAIkB;AAclB,SAA+B,iBAAiB,CAC9C,OAAiC,EACjC,OAAwB;;QAExB,IAAI,aAAa,GAAG,IAAA,iCAAyB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEnE,MAAM,gBAAgB,GAAG,CAAC,gEAAa,aAAa,GAAC,CAAC,CAAC,OAAO,CAAC;QAC/D,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAEzE,iBAAiB;QACjB,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;QAEhC,2BAAM,WAAW,CAAC,MAAM,CAAC,CAAA,CAAC;QAE1B,iCAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;QAExB,yEAAyE;QACzE,2BAAM,IAAI,OAAO,CAAuB,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA,CAAC;IACpD,CAAC;CAAA;AAlBD,oCAkBC;AAED,SAAS,WAAW,CAAC,OAAiC;;IACpD,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,aAAa,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC;IAC3B,OAAO,IAAA,2BAAkB,EAAC,gCACrB,OAAO,KACV,EAAE,EAAE,IAAI,EACR,UAAU,EAAE,GAAG,CAAC,WAAW,EAAE,GACvB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;;QACxB,qEAAqE;QACrE,oIAAoI;QACpI,IAAI,KAAK,YAAY,KAAK,EAAE;YAC1B,IAAK,KAAa,CAAC,KAAK,EAAE;gBACxB,eAAM,CAAC,KAAK,CAAE,KAAa,CAAC,KAAK,CAAC,CAAC;aACpC;iBAAM,IACJ,KAAa,CAAC,KAAK;gBACnB,KAAa,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EACvC;gBACC,KAAa,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE,CACzD,eAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CACd,CAAC;aACH;iBAAM;gBACL,eAAM,CAAC,KAAK,CAAC,KAAY,CAAC,CAAC;aAC5B;SACF;aAAM,IAAI,MAAA,KAAK,CAAC,WAAW,0CAAE,MAAM,EAAE;YACpC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,eAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7D;QAED,eAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACf,eAAM,CAAC,IAAI,CACT,KAAK,CAAC,KAAK;YACT,CAAC,CAAC;;;SAGD;YACD,CAAC,CAAC;;;SAGD,CACJ,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB,CAC5B,cAAwC,EACxC,gBAAqB,EACrB,OAAwB;IAExB,MAAM,gBAAgB,iDACjB,cAAc,GACd,IAAA,0CAAkC,EACnC,cAAc,EACd,gBAAgB,EAChB,OAAO,CACR,KACD,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,IAAI,GACZ,CAAC;IAEF,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
package/src/executors/utils.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
+
import 'dotenv/config';
|
|
2
3
|
import { CommonNxStorybookConfig } from './models';
|
|
3
4
|
export interface NodePackage {
|
|
4
5
|
name: string;
|
|
@@ -7,3 +8,4 @@ export interface NodePackage {
|
|
|
7
8
|
export declare function getStorybookFrameworkPath(uiFramework: any): any;
|
|
8
9
|
export declare function setStorybookAppProject(context: ExecutorContext, leadStorybookProject: string): void;
|
|
9
10
|
export declare function runStorybookSetupCheck(options: CommonNxStorybookConfig): void;
|
|
11
|
+
export declare function resolveCommonStorybookOptionMapper(builderOptions: CommonNxStorybookConfig, frameworkOptions: any, context: ExecutorContext): any;
|
package/src/executors/utils.js
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.runStorybookSetupCheck = exports.setStorybookAppProject = exports.getStorybookFrameworkPath = void 0;
|
|
3
|
+
exports.resolveCommonStorybookOptionMapper = exports.runStorybookSetupCheck = exports.setStorybookAppProject = exports.getStorybookFrameworkPath = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
6
|
+
const version_utils_1 = require("@nrwl/workspace/src/utilities/version-utils");
|
|
7
|
+
require("dotenv/config");
|
|
5
8
|
const fs_1 = require("fs");
|
|
6
9
|
const path_1 = require("path");
|
|
7
10
|
const semver_1 = require("semver");
|
|
11
|
+
const utilities_1 = require("../utils/utilities");
|
|
8
12
|
function getStorybookFrameworkPath(uiFramework) {
|
|
9
13
|
const serverOptionsPaths = {
|
|
10
14
|
'@storybook/angular': '@storybook/angular/dist/ts3.9/server/options',
|
|
@@ -111,4 +115,70 @@ function webpackFinalPropertyCheck(options) {
|
|
|
111
115
|
`);
|
|
112
116
|
}
|
|
113
117
|
}
|
|
118
|
+
function resolveCommonStorybookOptionMapper(builderOptions, frameworkOptions, context) {
|
|
119
|
+
const storybookConfig = (0, utilities_1.findOrCreateConfig)(builderOptions.config, context);
|
|
120
|
+
const storybookOptions = Object.assign(Object.assign({ workspaceRoot: context.root, configDir: storybookConfig }, frameworkOptions), { frameworkPresets: [...(frameworkOptions.frameworkPresets || [])], watch: false });
|
|
121
|
+
if (builderOptions.uiFramework === '@storybook/angular' &&
|
|
122
|
+
// just for new 6.4 with Angular
|
|
123
|
+
isStorybookGTE6_4()) {
|
|
124
|
+
let buildProjectName;
|
|
125
|
+
let targetName = 'build'; // default
|
|
126
|
+
let targetOptions = null;
|
|
127
|
+
if (builderOptions.projectBuildConfig) {
|
|
128
|
+
const targetString = normalizeTargetString(builderOptions.projectBuildConfig, targetName);
|
|
129
|
+
const { project, target, configuration } = (0, devkit_1.parseTargetString)(targetString);
|
|
130
|
+
// set the extracted target name
|
|
131
|
+
targetName = target;
|
|
132
|
+
buildProjectName = project;
|
|
133
|
+
targetOptions = (0, devkit_1.readTargetOptions)({ project, target, configuration }, context);
|
|
134
|
+
storybookOptions.angularBrowserTarget = targetString;
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
// to preserve the backwards compatibility for our users Nx resolves the
|
|
138
|
+
// default project just as Storybook used to before
|
|
139
|
+
const ws = new workspace_1.Workspaces(context.root);
|
|
140
|
+
const defaultProjectName = ws.calculateDefaultProjectName(context.cwd, context.workspace);
|
|
141
|
+
buildProjectName = defaultProjectName;
|
|
142
|
+
targetOptions = (0, devkit_1.readTargetOptions)({
|
|
143
|
+
project: defaultProjectName,
|
|
144
|
+
target: targetName,
|
|
145
|
+
configuration: '',
|
|
146
|
+
}, context);
|
|
147
|
+
storybookOptions.angularBrowserTarget = normalizeTargetString(defaultProjectName, targetName);
|
|
148
|
+
}
|
|
149
|
+
const project = context.workspace.projects[buildProjectName];
|
|
150
|
+
// construct a builder object for Storybook
|
|
151
|
+
storybookOptions.angularBuilderContext = {
|
|
152
|
+
target: Object.assign(Object.assign({}, project.targets[targetName]), { project: buildProjectName }),
|
|
153
|
+
workspaceRoot: context.cwd,
|
|
154
|
+
getProjectMetadata: () => {
|
|
155
|
+
return project;
|
|
156
|
+
},
|
|
157
|
+
getTargetOptions: () => {
|
|
158
|
+
return targetOptions;
|
|
159
|
+
},
|
|
160
|
+
logger: {
|
|
161
|
+
createChild(name) {
|
|
162
|
+
return devkit_1.logger;
|
|
163
|
+
},
|
|
164
|
+
},
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
// keep the backwards compatibility
|
|
169
|
+
setStorybookAppProject(context, builderOptions.projectBuildConfig);
|
|
170
|
+
}
|
|
171
|
+
return storybookOptions;
|
|
172
|
+
}
|
|
173
|
+
exports.resolveCommonStorybookOptionMapper = resolveCommonStorybookOptionMapper;
|
|
174
|
+
function normalizeTargetString(appName, defaultTarget = 'build') {
|
|
175
|
+
if (appName.includes(':')) {
|
|
176
|
+
return appName;
|
|
177
|
+
}
|
|
178
|
+
return `${appName}:${defaultTarget}`;
|
|
179
|
+
}
|
|
180
|
+
function isStorybookGTE6_4() {
|
|
181
|
+
const storybookVersion = (0, utilities_1.readCurrentWorkspaceStorybookVersionFromExecutor)();
|
|
182
|
+
return (0, semver_1.gte)((0, version_utils_1.checkAndCleanWithSemver)('@storybook/core', storybookVersion), '6.4.0-rc.1');
|
|
183
|
+
}
|
|
114
184
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/storybook/src/executors/utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/storybook/src/executors/utils.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,8DAA4D;AAC5D,+EAAsF;AACtF,yBAAuB;AACvB,2BAA8C;AAC9C,+BAA4B;AAC5B,mCAA6B;AAC7B,kDAG4B;AAQ5B,SAAgB,yBAAyB,CAAC,WAAW;IACnD,MAAM,kBAAkB,GAAG;QACzB,oBAAoB,EAAE,8CAA8C;QACpE,kBAAkB,EAAE,0CAA0C;QAC9D,iBAAiB,EAAE,yCAAyC;QAC5D,gBAAgB,EAAE,wCAAwC;QAC1D,iBAAiB,EAAE,yCAAyC;QAC5D,2BAA2B,EACzB,mDAAmD;QACrD,mBAAmB,EAAE,2CAA2C;KACjE,CAAC;IAEF,IAAI,qBAAqB,CAAC,WAAW,CAAC,EAAE;QACtC,OAAO,kBAAkB,CAAC,WAAW,CAAC,CAAC;KACxC;SAAM;QACL,OAAO,GAAG,WAAW,sBAAsB,CAAC;KAC7C;AACH,CAAC;AAjBD,8DAiBC;AAED,SAAS,qBAAqB,CAAC,WAAW;IACxC,MAAM,uBAAuB,GAAG,OAAO,CAAC,IAAA,WAAI,EAC1C,WAAW,EACX,cAAc,CACf,CAAC,CAAC,OAAO,CAAC;IAEX,OAAO,IAAA,YAAG,EAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC;AACpD,CAAC;AAED,2DAA2D;AAC3D,2EAA2E;AAC3E,SAAgB,sBAAsB,CACpC,OAAwB,EACxB,oBAA4B;IAE5B,IAAI,cAAsB,CAAC;IAC3B,+DAA+D;IAC/D,gBAAgB;IAEhB,IACE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,WAAW,KAAK,SAAS,EACzE;QACA,wDAAwD;QACxD,sDAAsD;QACtD,IAAI,oBAAoB,EAAE;YACxB,cAAc,GAAG,oBAAoB,CAAC;SACvC;aAAM;YACL,aAAa;YACb,OAAO;SACR;KACF;SAAM;QACL,+CAA+C;QAC/C,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;KACtC;IAED,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,cAAc,CAAC;AACzD,CAAC;AAzBD,wDAyBC;AAED,SAAgB,sBAAsB,CAAC,OAAgC;IACrE,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACnC,kBAAkB,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAHD,wDAGC;AAED,SAAS,kBAAkB,CAAC,OAAgC;IAC1D,IAAI,OAAO,CAAC,WAAW,KAAK,kBAAkB,EAAE;QAC9C,IAAI,uBAAuB,GAAG,IAAA,0BAAiB,EAC7C,OAAO,CAAC,MAAM,CAAC,YAAY,EAC3B,SAAS,CACV,CAAC;QAEF,IAAI,CAAC,IAAA,eAAU,EAAC,uBAAuB,CAAC,EAAE;YACxC,uBAAuB,GAAG,IAAA,0BAAiB,EACzC,OAAO,CAAC,MAAM,CAAC,YAAY,EAC3B,SAAS,CACV,CAAC;SACH;QAED,IAAI,CAAC,IAAA,eAAU,EAAC,uBAAuB,CAAC,EAAE;YACxC,kDAAkD;YAClD,OAAO;SACR;QAED,sFAAsF;QACtF,MAAM,eAAe,GAAG,IAAA,iBAAY,EAAC,uBAAuB,EAAE;YAC5D,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;YACpD,8CAA8C;YAC9C,eAAM,CAAC,IAAI,CAAC;;;;;;;CAOjB,CAAC,CAAC;SACE;KACF;AACH,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAgC;IACjE,IAAI,aAAa,GAAG;QAClB;YACE,IAAI,EAAE,IAAA,0BAAiB,EAAC,YAAY,EAAE,mBAAmB,CAAC;YAC1D,MAAM,EAAE,KAAK;SACd;QACD;YACE,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,mBAAmB,CAAC;YACzE,MAAM,EAAE,KAAK;SACd;KACF,CAAC;IAEF,aAAa,GAAG,aAAa;SAC1B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,uCACK,KAAK,KACR,MAAM,EAAE,IAAA,eAAU,EAAC,KAAK,CAAC,IAAI,CAAC,IAC9B;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;IAEpC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,eAAM,CAAC,IAAI,CACT;;IAEF,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;;IAItD,OAAO,CAAC,WAAW,KAAK,kBAAkB;YACxC,CAAC,CAAC,6DAA6D;YAC/D,CAAC,CAAC,+DACN;KACG,CACA,CAAC;KACH;AACH,CAAC;AAED,SAAgB,kCAAkC,CAChD,cAAuC,EACvC,gBAAqB,EACrB,OAAwB;IAExB,MAAM,eAAe,GAAG,IAAA,8BAAkB,EAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3E,MAAM,gBAAgB,iCACpB,aAAa,EAAE,OAAO,CAAC,IAAI,EAC3B,SAAS,EAAE,eAAe,IACvB,gBAAgB,KACnB,gBAAgB,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,EAChE,KAAK,EAAE,KAAK,GACb,CAAC;IAEF,IACE,cAAc,CAAC,WAAW,KAAK,oBAAoB;QACnD,gCAAgC;QAChC,iBAAiB,EAAE,EACnB;QACA,IAAI,gBAAgB,CAAC;QACrB,IAAI,UAAU,GAAG,OAAO,CAAC,CAAC,UAAU;QACpC,IAAI,aAAa,GAAG,IAAI,CAAC;QAEzB,IAAI,cAAc,CAAC,kBAAkB,EAAE;YACrC,MAAM,YAAY,GAAG,qBAAqB,CACxC,cAAc,CAAC,kBAAkB,EACjC,UAAU,CACX,CAAC;YAEF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GACtC,IAAA,0BAAiB,EAAC,YAAY,CAAC,CAAC;YAElC,gCAAgC;YAChC,UAAU,GAAG,MAAM,CAAC;YACpB,gBAAgB,GAAG,OAAO,CAAC;YAE3B,aAAa,GAAG,IAAA,0BAAiB,EAC/B,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,OAAO,CACR,CAAC;YAEF,gBAAgB,CAAC,oBAAoB,GAAG,YAAY,CAAC;SACtD;aAAM;YACL,wEAAwE;YACxE,mDAAmD;YAEnD,MAAM,EAAE,GAAG,IAAI,sBAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACxC,MAAM,kBAAkB,GAAG,EAAE,CAAC,2BAA2B,CACvD,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,SAAS,CAClB,CAAC;YAEF,gBAAgB,GAAG,kBAAkB,CAAC;YAEtC,aAAa,GAAG,IAAA,0BAAiB,EAC/B;gBACE,OAAO,EAAE,kBAAkB;gBAC3B,MAAM,EAAE,UAAU;gBAClB,aAAa,EAAE,EAAE;aAClB,EACD,OAAO,CACR,CAAC;YAEF,gBAAgB,CAAC,oBAAoB,GAAG,qBAAqB,CAC3D,kBAAkB,EAClB,UAAU,CACX,CAAC;SACH;QACD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAE7D,2CAA2C;QAC3C,gBAAgB,CAAC,qBAAqB,GAAG;YACvC,MAAM,kCACD,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,KAC9B,OAAO,EAAE,gBAAgB,GAC1B;YACD,aAAa,EAAE,OAAO,CAAC,GAAG;YAC1B,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,OAAO,CAAC;YACjB,CAAC;YACD,gBAAgB,EAAE,GAAG,EAAE;gBACrB,OAAO,aAAa,CAAC;YACvB,CAAC;YACD,MAAM,EAAE;gBACN,WAAW,CAAC,IAAI;oBACd,OAAO,eAAM,CAAC;gBAChB,CAAC;aACF;SACF,CAAC;KACH;SAAM;QACL,mCAAmC;QACnC,sBAAsB,CAAC,OAAO,EAAE,cAAc,CAAC,kBAAkB,CAAC,CAAC;KACpE;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AA/FD,gFA+FC;AAED,SAAS,qBAAqB,CAC5B,OAAe,EACf,gBAAwB,OAAO;IAE/B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACzB,OAAO,OAAO,CAAC;KAChB;IACD,OAAO,GAAG,OAAO,IAAI,aAAa,EAAE,CAAC;AACvC,CAAC;AAED,SAAS,iBAAiB;IACxB,MAAM,gBAAgB,GAAG,IAAA,4DAAgD,GAAE,CAAC;IAE5E,OAAO,IAAA,YAAG,EACR,IAAA,uCAAuB,EAAC,iBAAiB,EAAE,gBAAgB,CAAC,EAC5D,YAAY,CACb,CAAC;AACJ,CAAC"}
|
|
@@ -8,7 +8,6 @@ const linter_1 = require("@nrwl/linter");
|
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const utilities_1 = require("../../utils/utilities");
|
|
10
10
|
const cypress_project_1 = require("../cypress-project/cypress-project");
|
|
11
|
-
const versions_1 = require("../../utils/versions");
|
|
12
11
|
const init_1 = require("../init/init");
|
|
13
12
|
const version_utils_1 = require("@nrwl/workspace/src/utilities/version-utils");
|
|
14
13
|
const semver_1 = require("semver");
|
|
@@ -16,7 +15,7 @@ function configurationGenerator(tree, rawSchema) {
|
|
|
16
15
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
17
16
|
const schema = normalizeSchema(rawSchema);
|
|
18
17
|
const tasks = [];
|
|
19
|
-
const workspaceStorybookVersion =
|
|
18
|
+
const workspaceStorybookVersion = getCurrentWorkspaceStorybookVersion(tree);
|
|
20
19
|
const { projectType } = (0, devkit_1.readProjectConfiguration)(tree, schema.name);
|
|
21
20
|
const initTask = yield (0, init_1.initGenerator)(tree, {
|
|
22
21
|
uiFramework: schema.uiFramework,
|
|
@@ -230,37 +229,8 @@ function addStorybookTask(tree, projectName, uiFramework) {
|
|
|
230
229
|
};
|
|
231
230
|
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
|
|
232
231
|
}
|
|
233
|
-
function
|
|
234
|
-
|
|
235
|
-
let workspaceStorybookVersion = versions_1.storybookVersion;
|
|
236
|
-
if (packageJsonContents && packageJsonContents['devDependencies']) {
|
|
237
|
-
if (packageJsonContents['devDependencies']['@storybook/angular']) {
|
|
238
|
-
workspaceStorybookVersion =
|
|
239
|
-
packageJsonContents['devDependencies']['@storybook/angular'];
|
|
240
|
-
}
|
|
241
|
-
if (packageJsonContents['devDependencies']['@storybook/react']) {
|
|
242
|
-
workspaceStorybookVersion =
|
|
243
|
-
packageJsonContents['devDependencies']['@storybook/react'];
|
|
244
|
-
}
|
|
245
|
-
if (packageJsonContents['devDependencies']['@storybook/core']) {
|
|
246
|
-
workspaceStorybookVersion =
|
|
247
|
-
packageJsonContents['devDependencies']['@storybook/core'];
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
|
-
if (packageJsonContents && packageJsonContents['dependencies']) {
|
|
251
|
-
if (packageJsonContents['dependencies']['@storybook/angular']) {
|
|
252
|
-
workspaceStorybookVersion =
|
|
253
|
-
packageJsonContents['dependencies']['@storybook/angular'];
|
|
254
|
-
}
|
|
255
|
-
if (packageJsonContents['dependencies']['@storybook/react']) {
|
|
256
|
-
workspaceStorybookVersion =
|
|
257
|
-
packageJsonContents['dependencies']['@storybook/react'];
|
|
258
|
-
}
|
|
259
|
-
if (packageJsonContents['dependencies']['@storybook/core']) {
|
|
260
|
-
workspaceStorybookVersion =
|
|
261
|
-
packageJsonContents['dependencies']['@storybook/core'];
|
|
262
|
-
}
|
|
263
|
-
}
|
|
232
|
+
function getCurrentWorkspaceStorybookVersion(tree) {
|
|
233
|
+
let workspaceStorybookVersion = (0, utilities_1.readCurrentWorkspaceStorybookVersionFromGenerator)(tree);
|
|
264
234
|
if ((0, semver_1.gte)((0, version_utils_1.checkAndCleanWithSemver)('@storybook/core', workspaceStorybookVersion), '6.0.0')) {
|
|
265
235
|
workspaceStorybookVersion = '6';
|
|
266
236
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/configuration/configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAesB;AACtB,2FAAqF;AAErF,yCAAsC;AACtC,+BAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/configuration/configuration.ts"],"names":[],"mappings":"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"}
|
package/src/utils/utilities.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { Tree } from '@nrwl/devkit';
|
|
1
|
+
import { ExecutorContext, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { CompilerOptions } from 'typescript';
|
|
3
|
+
import { StorybookConfig } from '../executors/models';
|
|
3
4
|
export declare const Constants: {
|
|
4
5
|
addonDependencies: string[];
|
|
5
6
|
tsConfigExclusions: string[];
|
|
@@ -25,6 +26,8 @@ declare type Framework = {
|
|
|
25
26
|
};
|
|
26
27
|
export declare function isFramework(type: Framework['type'], schema: Pick<Framework, 'uiFramework'>): boolean;
|
|
27
28
|
export declare function safeFileDelete(tree: Tree, path: string): boolean;
|
|
29
|
+
export declare function readCurrentWorkspaceStorybookVersionFromGenerator(tree: Tree): string;
|
|
30
|
+
export declare function readCurrentWorkspaceStorybookVersionFromExecutor(): string;
|
|
28
31
|
export declare type TsConfig = {
|
|
29
32
|
extends: string;
|
|
30
33
|
compilerOptions: CompilerOptions;
|
|
@@ -35,4 +38,5 @@ export declare type TsConfig = {
|
|
|
35
38
|
path: string;
|
|
36
39
|
}>;
|
|
37
40
|
};
|
|
41
|
+
export declare function findOrCreateConfig(config: StorybookConfig, context: ExecutorContext): string;
|
|
38
42
|
export {};
|
package/src/utils/utilities.js
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.safeFileDelete = exports.isFramework = exports.Constants = void 0;
|
|
3
|
+
exports.findOrCreateConfig = exports.readCurrentWorkspaceStorybookVersionFromExecutor = exports.readCurrentWorkspaceStorybookVersionFromGenerator = exports.safeFileDelete = exports.isFramework = exports.Constants = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const versions_1 = require("./versions");
|
|
6
|
+
const fs_1 = require("fs");
|
|
7
|
+
const os_1 = require("os");
|
|
8
|
+
const path_1 = require("path");
|
|
4
9
|
exports.Constants = {
|
|
5
10
|
addonDependencies: ['@storybook/addons'],
|
|
6
11
|
tsConfigExclusions: ['stories', '**/*.stories.ts'],
|
|
@@ -55,4 +60,73 @@ function safeFileDelete(tree, path) {
|
|
|
55
60
|
}
|
|
56
61
|
}
|
|
57
62
|
exports.safeFileDelete = safeFileDelete;
|
|
63
|
+
function readCurrentWorkspaceStorybookVersionFromGenerator(tree) {
|
|
64
|
+
const packageJsonContents = (0, devkit_1.readJson)(tree, 'package.json');
|
|
65
|
+
return determineStorybookWorkspaceVersion(packageJsonContents);
|
|
66
|
+
}
|
|
67
|
+
exports.readCurrentWorkspaceStorybookVersionFromGenerator = readCurrentWorkspaceStorybookVersionFromGenerator;
|
|
68
|
+
function readCurrentWorkspaceStorybookVersionFromExecutor() {
|
|
69
|
+
const packageJsonContents = (0, devkit_1.readJsonFile)('package.json');
|
|
70
|
+
return determineStorybookWorkspaceVersion(packageJsonContents);
|
|
71
|
+
}
|
|
72
|
+
exports.readCurrentWorkspaceStorybookVersionFromExecutor = readCurrentWorkspaceStorybookVersionFromExecutor;
|
|
73
|
+
function determineStorybookWorkspaceVersion(packageJsonContents) {
|
|
74
|
+
let workspaceStorybookVersion = versions_1.storybookVersion;
|
|
75
|
+
if (packageJsonContents && packageJsonContents['devDependencies']) {
|
|
76
|
+
if (packageJsonContents['devDependencies']['@storybook/angular']) {
|
|
77
|
+
workspaceStorybookVersion =
|
|
78
|
+
packageJsonContents['devDependencies']['@storybook/angular'];
|
|
79
|
+
}
|
|
80
|
+
if (packageJsonContents['devDependencies']['@storybook/react']) {
|
|
81
|
+
workspaceStorybookVersion =
|
|
82
|
+
packageJsonContents['devDependencies']['@storybook/react'];
|
|
83
|
+
}
|
|
84
|
+
if (packageJsonContents['devDependencies']['@storybook/core']) {
|
|
85
|
+
workspaceStorybookVersion =
|
|
86
|
+
packageJsonContents['devDependencies']['@storybook/core'];
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
if (packageJsonContents && packageJsonContents['dependencies']) {
|
|
90
|
+
if (packageJsonContents['dependencies']['@storybook/angular']) {
|
|
91
|
+
workspaceStorybookVersion =
|
|
92
|
+
packageJsonContents['dependencies']['@storybook/angular'];
|
|
93
|
+
}
|
|
94
|
+
if (packageJsonContents['dependencies']['@storybook/react']) {
|
|
95
|
+
workspaceStorybookVersion =
|
|
96
|
+
packageJsonContents['dependencies']['@storybook/react'];
|
|
97
|
+
}
|
|
98
|
+
if (packageJsonContents['dependencies']['@storybook/core']) {
|
|
99
|
+
workspaceStorybookVersion =
|
|
100
|
+
packageJsonContents['dependencies']['@storybook/core'];
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
return workspaceStorybookVersion;
|
|
104
|
+
}
|
|
105
|
+
function findOrCreateConfig(config, context) {
|
|
106
|
+
if (config.configFolder && (0, fs_1.statSync)(config.configFolder).isDirectory()) {
|
|
107
|
+
return config.configFolder;
|
|
108
|
+
}
|
|
109
|
+
else if ((0, fs_1.statSync)(config.configPath).isFile() &&
|
|
110
|
+
(0, fs_1.statSync)(config.pluginPath).isFile() &&
|
|
111
|
+
(0, fs_1.statSync)(config.srcRoot).isFile()) {
|
|
112
|
+
return createStorybookConfig(config.configPath, config.pluginPath, config.srcRoot);
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
const sourceRoot = context.workspace.projects[context.projectName].root;
|
|
116
|
+
if ((0, fs_1.statSync)((0, path_1.join)(context.root, sourceRoot, '.storybook')).isDirectory()) {
|
|
117
|
+
return (0, path_1.join)(context.root, sourceRoot, '.storybook');
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
throw new Error('No configuration settings');
|
|
121
|
+
}
|
|
122
|
+
exports.findOrCreateConfig = findOrCreateConfig;
|
|
123
|
+
function createStorybookConfig(configPath, pluginPath, srcRoot) {
|
|
124
|
+
const tmpDir = (0, os_1.tmpdir)();
|
|
125
|
+
const tmpFolder = `${tmpDir}${path_1.sep}`;
|
|
126
|
+
(0, fs_1.mkdtempSync)(tmpFolder);
|
|
127
|
+
(0, fs_1.copyFileSync)(configPath, `${tmpFolder}/${(0, path_1.basename)(configPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
128
|
+
(0, fs_1.copyFileSync)(pluginPath, `${tmpFolder}/${(0, path_1.basename)(pluginPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
129
|
+
(0, fs_1.copyFileSync)(srcRoot, `${tmpFolder}/${(0, path_1.basename)(srcRoot)}`, fs_1.constants.COPYFILE_EXCL);
|
|
130
|
+
return tmpFolder;
|
|
131
|
+
}
|
|
58
132
|
//# sourceMappingURL=utilities.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/utilities.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/utilities.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.urlLoaderVersion = exports.svgrVersion = exports.babelPresetTypescriptVersion = exports.babelLoaderVersion = exports.babelCoreVersion = exports.storybookVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.2.0-
|
|
4
|
+
exports.nxVersion = '13.2.0-rc.2';
|
|
5
5
|
exports.storybookVersion = '~6.3.0';
|
|
6
6
|
exports.babelCoreVersion = '7.12.13';
|
|
7
7
|
exports.babelLoaderVersion = '8.1.0';
|