@nx/react 16.1.0-rc.0 → 16.1.0
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 +7 -7
- package/src/generators/storybook-configuration/configuration.js +6 -13
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +0 -2
- package/src/generators/storybook-configuration/schema.json +0 -12
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/react",
|
|
3
|
-
"version": "16.1.0
|
|
3
|
+
"version": "16.1.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/react": "16.1.0
|
|
35
|
-
"@nx/devkit": "16.1.0
|
|
36
|
-
"@nx/js": "16.1.0
|
|
37
|
-
"@nx/linter": "16.1.0
|
|
38
|
-
"@nx/web": "16.1.0
|
|
34
|
+
"@nrwl/react": "16.1.0",
|
|
35
|
+
"@nx/devkit": "16.1.0",
|
|
36
|
+
"@nx/js": "16.1.0",
|
|
37
|
+
"@nx/linter": "16.1.0",
|
|
38
|
+
"@nx/web": "16.1.0",
|
|
39
39
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
40
40
|
"@svgr/webpack": "^6.1.2",
|
|
41
41
|
"chalk": "^4.1.0",
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"access": "public"
|
|
47
47
|
},
|
|
48
48
|
"types": "./index.d.ts",
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "dfae1bf35a711d61a2cf75de65e2e352ebc97188"
|
|
50
50
|
}
|
|
@@ -22,23 +22,18 @@ function generateStories(host, schema) {
|
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
24
|
function storybookConfigurationGenerator(host, schema) {
|
|
25
|
-
var _a, _b
|
|
25
|
+
var _a, _b;
|
|
26
26
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
27
27
|
const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
|
|
28
|
-
let bundler =
|
|
28
|
+
let bundler = 'vite';
|
|
29
29
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
30
30
|
if (projectConfig.projectType === 'application' &&
|
|
31
|
-
(((
|
|
32
|
-
((
|
|
33
|
-
bundler = '
|
|
34
|
-
if (schema.bundler !== 'vite') {
|
|
35
|
-
devkit_1.logger.info(`The project ${schema.name} is set up to use Vite. So
|
|
36
|
-
Storybook will be configured to use Vite as well.`);
|
|
37
|
-
}
|
|
31
|
+
(((_a = projectConfig.targets['build']) === null || _a === void 0 ? void 0 : _a.executor) === '@nx/webpack:webpack' ||
|
|
32
|
+
((_b = projectConfig.targets['build']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/webpack:webpack')) {
|
|
33
|
+
bundler = 'webpack';
|
|
38
34
|
}
|
|
39
35
|
const installTask = yield configurationGenerator(host, {
|
|
40
36
|
name: schema.name,
|
|
41
|
-
uiFramework: '@storybook/react',
|
|
42
37
|
configureCypress: schema.configureCypress,
|
|
43
38
|
js: schema.js,
|
|
44
39
|
linter: schema.linter,
|
|
@@ -46,9 +41,7 @@ function storybookConfigurationGenerator(host, schema) {
|
|
|
46
41
|
tsConfiguration: schema.tsConfiguration,
|
|
47
42
|
configureTestRunner: schema.configureTestRunner,
|
|
48
43
|
configureStaticServe: schema.configureStaticServe,
|
|
49
|
-
bundler
|
|
50
|
-
storybook7Configuration: schema.storybook7Configuration,
|
|
51
|
-
storybook7UiFramework: bundler === 'vite'
|
|
44
|
+
uiFramework: bundler === 'vite'
|
|
52
45
|
? '@storybook/react-vite'
|
|
53
46
|
: '@storybook/react-webpack5',
|
|
54
47
|
skipFormat: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,uCAMoB;AACpB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,IAAA,sBAAa,EAAC,aAAa,EAAE,oBAAS,CAAC,CAAC;QACxC,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAC5B,oCAAoC,EACrC,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,iBAAiB,CACtC,MAAM,CAAC,IAAI,EACX,aAAa,CAAC,IAAI,EAClB,MAAM,CAAC,gBAAgB,CACxB,CAAC;QACF,MAAM,IAAA,iBAAgB,EAAC,IAAI,EAAE;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,oBAAoB,EAClB,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,oBAAoB;YACxD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,cAAc;YACd,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;;QAEhC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAE9C,eAAe,EAAE,oBAAS,CAAC,CAAC;QAE9B,IAAI,OAAO,GAAG,MAAM,CAAC;QACrB,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAElE,IACE,aAAa,CAAC,WAAW,KAAK,aAAa;YAC3C,CAAC,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,qBAAqB;gBACjE,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,uBAAuB,CAAC,EACvE;YACA,OAAO,GAAG,SAAS,CAAC;SACrB;QAED,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACrD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;YAC/C,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,WAAW,EACT,OAAO,KAAK,MAAM;gBAChB,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,2BAA2B;YACjC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,WAAW,CAAC;;CACpB;AA1CD,0EA0CC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
|
|
@@ -10,8 +10,6 @@ export interface StorybookConfigureSchema {
|
|
|
10
10
|
linter?: Linter;
|
|
11
11
|
cypressDirectory?: string;
|
|
12
12
|
ignorePaths?: string[];
|
|
13
|
-
bundler?: 'webpack' | 'vite';
|
|
14
13
|
configureTestRunner?: boolean;
|
|
15
14
|
configureStaticServe?: boolean;
|
|
16
|
-
storybook7Configuration?: boolean;
|
|
17
15
|
}
|
|
@@ -84,18 +84,6 @@
|
|
|
84
84
|
"configureTestRunner": {
|
|
85
85
|
"type": "boolean",
|
|
86
86
|
"description": "Add a Storybook Test-Runner target."
|
|
87
|
-
},
|
|
88
|
-
"bundler": {
|
|
89
|
-
"description": "The Storybook builder to use.",
|
|
90
|
-
"enum": ["vite", "webpack"],
|
|
91
|
-
"x-priority": "important"
|
|
92
|
-
},
|
|
93
|
-
"storybook7Configuration": {
|
|
94
|
-
"description": "Configure your workspace using Storybook version 7.",
|
|
95
|
-
"type": "boolean",
|
|
96
|
-
"default": true,
|
|
97
|
-
"hidden": true,
|
|
98
|
-
"aliases": ["storybook7betaConfiguration"]
|
|
99
87
|
}
|
|
100
88
|
},
|
|
101
89
|
"required": ["name"],
|