@nx/storybook 20.0.0-beta.4 → 20.0.0-beta.6

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/migrations.json CHANGED
@@ -1,29 +1,5 @@
1
1
  {
2
2
  "generators": {
3
- "update-16-0-0-add-nx-packages": {
4
- "cli": "nx",
5
- "version": "16.0.0-beta.1",
6
- "description": "Replace @nrwl/storybook with @nx/storybook",
7
- "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
8
- },
9
- "update-16-0-0-migrate-7": {
10
- "cli": "nx",
11
- "version": "16.0.0-beta.1",
12
- "description": "Update workspace to use Storybook v7",
13
- "implementation": "./src/migrations/update-16-0-0/update-sb-7"
14
- },
15
- "update-16-1-0": {
16
- "cli": "nx",
17
- "version": "16.1.0-beta.0",
18
- "description": "Ignore @nx/react/plugins/storybook in Storybook eslint rules.",
19
- "factory": "./src/migrations/update-16-1-0/eslint-ignore-react-plugin"
20
- },
21
- "update-16-5-0": {
22
- "cli": "nx",
23
- "version": "16.5.0-beta.0",
24
- "description": "Move .storybook/tsconfig.json to tsconfig.storybook.json for non-Angular projects.",
25
- "factory": "./src/migrations/update-16-5-0/move-storybook-tsconfig"
26
- },
27
3
  "update-19-6-0-add-nx-packages": {
28
4
  "cli": "nx",
29
5
  "version": "19.6.0-beta.0",
@@ -272,593 +248,6 @@
272
248
  }
273
249
  }
274
250
  },
275
- "16.7.0": {
276
- "version": "16.7.0-beta.3",
277
- "packages": {
278
- "@storybook/test-runner": {
279
- "version": "^0.13.0",
280
- "alwaysAddToPackageJson": false
281
- },
282
- "@storybook/core-server": {
283
- "version": "^7.2.1",
284
- "alwaysAddToPackageJson": false
285
- },
286
- "@storybook/angular": {
287
- "version": "^7.2.1",
288
- "alwaysAddToPackageJson": false
289
- },
290
- "@storybook/react": {
291
- "version": "^7.2.1",
292
- "alwaysAddToPackageJson": false
293
- },
294
- "@storybook/react-vite": {
295
- "version": "^7.2.1",
296
- "alwaysAddToPackageJson": false
297
- },
298
- "@storybook/react-webpack5": {
299
- "version": "^7.2.1",
300
- "alwaysAddToPackageJson": false
301
- },
302
- "@storybook/web-components-vite": {
303
- "version": "^7.2.1",
304
- "alwaysAddToPackageJson": false
305
- },
306
- "@storybook/web-components-webpack5": {
307
- "version": "^7.2.1",
308
- "alwaysAddToPackageJson": false
309
- },
310
- "@storybook/addon-a11y": {
311
- "version": "^7.2.1",
312
- "alwaysAddToPackageJson": false
313
- },
314
- "@storybook/addon-actions": {
315
- "version": "^7.2.1",
316
- "alwaysAddToPackageJson": false
317
- },
318
- "@storybook/addon-backgrounds": {
319
- "version": "^7.2.1",
320
- "alwaysAddToPackageJson": false
321
- },
322
- "@storybook/addon-controls": {
323
- "version": "^7.2.1",
324
- "alwaysAddToPackageJson": false
325
- },
326
- "@storybook/addon-docs": {
327
- "version": "^7.2.1",
328
- "alwaysAddToPackageJson": false
329
- },
330
- "@storybook/addon-essentials": {
331
- "version": "^7.2.1",
332
- "alwaysAddToPackageJson": false
333
- },
334
- "@storybook/addon-interactions": {
335
- "version": "^7.2.1",
336
- "alwaysAddToPackageJson": false
337
- },
338
- "@storybook/addon-mdx-gfm": {
339
- "version": "^7.2.1",
340
- "alwaysAddToPackageJson": false
341
- },
342
- "@storybook/addon-highlight": {
343
- "version": "^7.2.1",
344
- "alwaysAddToPackageJson": false
345
- },
346
- "@storybook/addon-jest": {
347
- "version": "^7.2.1",
348
- "alwaysAddToPackageJson": false
349
- },
350
- "@storybook/addon-links": {
351
- "version": "^7.2.1",
352
- "alwaysAddToPackageJson": false
353
- },
354
- "@storybook/addon-measure": {
355
- "version": "^7.2.1",
356
- "alwaysAddToPackageJson": false
357
- },
358
- "@storybook/addon-outline": {
359
- "version": "^7.2.1",
360
- "alwaysAddToPackageJson": false
361
- },
362
- "@storybook/addon-storyshots": {
363
- "version": "^7.2.1",
364
- "alwaysAddToPackageJson": false
365
- },
366
- "@storybook/addon-storyshots-puppeteer": {
367
- "version": "^7.2.1",
368
- "alwaysAddToPackageJson": false
369
- },
370
- "@storybook/addon-storysource": {
371
- "version": "^7.2.1",
372
- "alwaysAddToPackageJson": false
373
- },
374
- "@storybook/addon-toolbars": {
375
- "version": "^7.2.1",
376
- "alwaysAddToPackageJson": false
377
- },
378
- "@storybook/addon-viewport": {
379
- "version": "^7.2.1",
380
- "alwaysAddToPackageJson": false
381
- }
382
- }
383
- },
384
- "16.6.0": {
385
- "version": "16.6.0-beta.6",
386
- "packages": {
387
- "@storybook/test-runner": {
388
- "version": "^0.11.0",
389
- "alwaysAddToPackageJson": false
390
- },
391
- "@storybook/core-server": {
392
- "version": "^7.1.0",
393
- "alwaysAddToPackageJson": false
394
- },
395
- "@storybook/angular": {
396
- "version": "^7.1.0",
397
- "alwaysAddToPackageJson": false
398
- },
399
- "@storybook/react": {
400
- "version": "^7.1.0",
401
- "alwaysAddToPackageJson": false
402
- },
403
- "@storybook/react-vite": {
404
- "version": "^7.1.0",
405
- "alwaysAddToPackageJson": false
406
- },
407
- "@storybook/react-webpack5": {
408
- "version": "^7.1.0",
409
- "alwaysAddToPackageJson": false
410
- },
411
- "@storybook/web-components-vite": {
412
- "version": "^7.1.0",
413
- "alwaysAddToPackageJson": false
414
- },
415
- "@storybook/web-components-webpack5": {
416
- "version": "^7.1.0",
417
- "alwaysAddToPackageJson": false
418
- },
419
- "@storybook/addon-a11y": {
420
- "version": "^7.1.0",
421
- "alwaysAddToPackageJson": false
422
- },
423
- "@storybook/addon-actions": {
424
- "version": "^7.1.0",
425
- "alwaysAddToPackageJson": false
426
- },
427
- "@storybook/addon-backgrounds": {
428
- "version": "^7.1.0",
429
- "alwaysAddToPackageJson": false
430
- },
431
- "@storybook/addon-controls": {
432
- "version": "^7.1.0",
433
- "alwaysAddToPackageJson": false
434
- },
435
- "@storybook/addon-docs": {
436
- "version": "^7.1.0",
437
- "alwaysAddToPackageJson": false
438
- },
439
- "@storybook/addon-essentials": {
440
- "version": "^7.1.0",
441
- "alwaysAddToPackageJson": false
442
- },
443
- "@storybook/addon-interactions": {
444
- "version": "^7.1.0",
445
- "alwaysAddToPackageJson": false
446
- },
447
- "@storybook/addon-mdx-gfm": {
448
- "version": "^7.1.0",
449
- "alwaysAddToPackageJson": false
450
- },
451
- "@storybook/addon-highlight": {
452
- "version": "^7.1.0",
453
- "alwaysAddToPackageJson": false
454
- },
455
- "@storybook/addon-jest": {
456
- "version": "^7.1.0",
457
- "alwaysAddToPackageJson": false
458
- },
459
- "@storybook/addon-links": {
460
- "version": "^7.1.0",
461
- "alwaysAddToPackageJson": false
462
- },
463
- "@storybook/addon-measure": {
464
- "version": "^7.1.0",
465
- "alwaysAddToPackageJson": false
466
- },
467
- "@storybook/addon-outline": {
468
- "version": "^7.1.0",
469
- "alwaysAddToPackageJson": false
470
- },
471
- "@storybook/addon-storyshots": {
472
- "version": "^7.1.0",
473
- "alwaysAddToPackageJson": false
474
- },
475
- "@storybook/addon-storyshots-puppeteer": {
476
- "version": "^7.1.0",
477
- "alwaysAddToPackageJson": false
478
- },
479
- "@storybook/addon-storysource": {
480
- "version": "^7.1.0",
481
- "alwaysAddToPackageJson": false
482
- },
483
- "@storybook/addon-toolbars": {
484
- "version": "^7.1.0",
485
- "alwaysAddToPackageJson": false
486
- },
487
- "@storybook/addon-viewport": {
488
- "version": "^7.1.0",
489
- "alwaysAddToPackageJson": false
490
- }
491
- }
492
- },
493
- "16.5.0": {
494
- "version": "16.5.0-beta.0",
495
- "requires": {
496
- "@storybook/core-server": ">=7.0.0 <7.0.24"
497
- },
498
- "packages": {
499
- "@storybook/core-server": {
500
- "version": "^7.0.24",
501
- "alwaysAddToPackageJson": false
502
- },
503
- "@storybook/angular": {
504
- "version": "^7.0.24",
505
- "alwaysAddToPackageJson": false
506
- },
507
- "@storybook/react": {
508
- "version": "^7.0.24",
509
- "alwaysAddToPackageJson": false
510
- },
511
- "@storybook/web-components-vite": {
512
- "version": "^7.0.24",
513
- "alwaysAddToPackageJson": false
514
- },
515
- "@storybook/web-components-webpack5": {
516
- "version": "^7.0.24",
517
- "alwaysAddToPackageJson": false
518
- },
519
- "@storybook/builder-vite": {
520
- "version": "^7.0.24",
521
- "alwaysAddToPackageJson": false
522
- },
523
- "@storybook/builder-webpack5": {
524
- "version": "^7.0.24",
525
- "alwaysAddToPackageJson": false
526
- },
527
- "@storybook/addon-a11y": {
528
- "version": "^7.0.24",
529
- "alwaysAddToPackageJson": false
530
- },
531
- "@storybook/addon-actions": {
532
- "version": "^7.0.24",
533
- "alwaysAddToPackageJson": false
534
- },
535
- "@storybook/addon-backgrounds": {
536
- "version": "^7.0.24",
537
- "alwaysAddToPackageJson": false
538
- },
539
- "@storybook/addon-controls": {
540
- "version": "^7.0.24",
541
- "alwaysAddToPackageJson": false
542
- },
543
- "@storybook/addon-docs": {
544
- "version": "^7.0.24",
545
- "alwaysAddToPackageJson": false
546
- },
547
- "@storybook/addon-essentials": {
548
- "version": "^7.0.24",
549
- "alwaysAddToPackageJson": false
550
- },
551
- "@storybook/addon-mdx-gfm": {
552
- "version": "^7.0.24",
553
- "alwaysAddToPackageJson": false
554
- },
555
- "@storybook/addon-highlight": {
556
- "version": "^7.0.24",
557
- "alwaysAddToPackageJson": false
558
- },
559
- "@storybook/addon-interactions": {
560
- "version": "^7.0.24",
561
- "alwaysAddToPackageJson": false
562
- },
563
- "@storybook/addon-jest": {
564
- "version": "^7.0.24",
565
- "alwaysAddToPackageJson": false
566
- },
567
- "@storybook/addon-links": {
568
- "version": "^7.0.24",
569
- "alwaysAddToPackageJson": false
570
- },
571
- "@storybook/addon-measure": {
572
- "version": "^7.0.24",
573
- "alwaysAddToPackageJson": false
574
- },
575
- "@storybook/addon-outline": {
576
- "version": "^7.0.24",
577
- "alwaysAddToPackageJson": false
578
- },
579
- "@storybook/addon-storyshots": {
580
- "version": "^7.0.24",
581
- "alwaysAddToPackageJson": false
582
- },
583
- "@storybook/addon-storyshots-puppeteer": {
584
- "version": "^7.0.24",
585
- "alwaysAddToPackageJson": false
586
- },
587
- "@storybook/addon-storysource": {
588
- "version": "^7.0.24",
589
- "alwaysAddToPackageJson": false
590
- },
591
- "@storybook/addon-toolbars": {
592
- "version": "^7.0.24",
593
- "alwaysAddToPackageJson": false
594
- },
595
- "@storybook/addon-viewport": {
596
- "version": "^7.0.24",
597
- "alwaysAddToPackageJson": false
598
- }
599
- }
600
- },
601
- "16.1.3": {
602
- "version": "16.1.3-beta.0",
603
- "requires": {
604
- "@storybook/core-server": ">=7.0.0 <7.0.9"
605
- },
606
- "packages": {
607
- "@storybook/core-server": {
608
- "version": "^7.0.9",
609
- "alwaysAddToPackageJson": false
610
- },
611
- "@storybook/angular": {
612
- "version": "^7.0.9",
613
- "alwaysAddToPackageJson": false
614
- },
615
- "@storybook/react": {
616
- "version": "^7.0.9",
617
- "alwaysAddToPackageJson": false
618
- },
619
- "@storybook/web-components-vite": {
620
- "version": "^7.0.9",
621
- "alwaysAddToPackageJson": false
622
- },
623
- "@storybook/web-components-webpack5": {
624
- "version": "^7.0.9",
625
- "alwaysAddToPackageJson": false
626
- },
627
- "@storybook/builder-vite": {
628
- "version": "^7.0.9",
629
- "alwaysAddToPackageJson": false
630
- },
631
- "@storybook/builder-webpack5": {
632
- "version": "^7.0.9",
633
- "alwaysAddToPackageJson": false
634
- },
635
- "@storybook/addon-a11y": {
636
- "version": "^7.0.9",
637
- "alwaysAddToPackageJson": false
638
- },
639
- "@storybook/addon-actions": {
640
- "version": "^7.0.9",
641
- "alwaysAddToPackageJson": false
642
- },
643
- "@storybook/addon-backgrounds": {
644
- "version": "^7.0.9",
645
- "alwaysAddToPackageJson": false
646
- },
647
- "@storybook/addon-controls": {
648
- "version": "^7.0.9",
649
- "alwaysAddToPackageJson": false
650
- },
651
- "@storybook/addon-docs": {
652
- "version": "^7.0.9",
653
- "alwaysAddToPackageJson": false
654
- },
655
- "@storybook/addon-essentials": {
656
- "version": "^7.0.9",
657
- "alwaysAddToPackageJson": false
658
- },
659
- "@storybook/addon-mdx-gfm": {
660
- "version": "^7.0.9",
661
- "alwaysAddToPackageJson": false
662
- },
663
- "@storybook/addon-highlight": {
664
- "version": "^7.0.9",
665
- "alwaysAddToPackageJson": false
666
- },
667
- "@storybook/addon-interactions": {
668
- "version": "^7.0.9",
669
- "alwaysAddToPackageJson": false
670
- },
671
- "@storybook/addon-jest": {
672
- "version": "^7.0.9",
673
- "alwaysAddToPackageJson": false
674
- },
675
- "@storybook/addon-links": {
676
- "version": "^7.0.9",
677
- "alwaysAddToPackageJson": false
678
- },
679
- "@storybook/addon-measure": {
680
- "version": "^7.0.9",
681
- "alwaysAddToPackageJson": false
682
- },
683
- "@storybook/addon-outline": {
684
- "version": "^7.0.9",
685
- "alwaysAddToPackageJson": false
686
- },
687
- "@storybook/addon-storyshots": {
688
- "version": "^7.0.9",
689
- "alwaysAddToPackageJson": false
690
- },
691
- "@storybook/addon-storyshots-puppeteer": {
692
- "version": "^7.0.9",
693
- "alwaysAddToPackageJson": false
694
- },
695
- "@storybook/addon-storysource": {
696
- "version": "^7.0.9",
697
- "alwaysAddToPackageJson": false
698
- },
699
- "@storybook/addon-toolbars": {
700
- "version": "^7.0.9",
701
- "alwaysAddToPackageJson": false
702
- },
703
- "@storybook/addon-viewport": {
704
- "version": "^7.0.9",
705
- "alwaysAddToPackageJson": false
706
- }
707
- }
708
- },
709
- "16.1.0": {
710
- "version": "16.1.0-beta.0",
711
- "requires": {
712
- "@storybook/core-server": ">=7.0.0 <7.0.8"
713
- },
714
- "packages": {
715
- "eslint-plugin-storybook": {
716
- "version": "^0.6.12",
717
- "alwaysAddToPackageJson": false
718
- },
719
- "@storybook/core-server": {
720
- "version": "^7.0.8",
721
- "alwaysAddToPackageJson": false
722
- },
723
- "@storybook/angular": {
724
- "version": "^7.0.8",
725
- "alwaysAddToPackageJson": false
726
- },
727
- "@storybook/react": {
728
- "version": "^7.0.8",
729
- "alwaysAddToPackageJson": false
730
- },
731
- "@storybook/web-components-vite": {
732
- "version": "^7.0.8",
733
- "alwaysAddToPackageJson": false
734
- },
735
- "@storybook/web-components-webpack5": {
736
- "version": "^7.0.8",
737
- "alwaysAddToPackageJson": false
738
- },
739
- "@storybook/builder-vite": {
740
- "version": "^7.0.8",
741
- "alwaysAddToPackageJson": false
742
- },
743
- "@storybook/builder-webpack5": {
744
- "version": "^7.0.8",
745
- "alwaysAddToPackageJson": false
746
- },
747
- "@storybook/addon-a11y": {
748
- "version": "^7.0.8",
749
- "alwaysAddToPackageJson": false
750
- },
751
- "@storybook/addon-actions": {
752
- "version": "^7.0.8",
753
- "alwaysAddToPackageJson": false
754
- },
755
- "@storybook/addon-backgrounds": {
756
- "version": "^7.0.8",
757
- "alwaysAddToPackageJson": false
758
- },
759
- "@storybook/addon-controls": {
760
- "version": "^7.0.8",
761
- "alwaysAddToPackageJson": false
762
- },
763
- "@storybook/addon-docs": {
764
- "version": "^7.0.8",
765
- "alwaysAddToPackageJson": false
766
- },
767
- "@storybook/addon-essentials": {
768
- "version": "^7.0.8",
769
- "alwaysAddToPackageJson": false
770
- },
771
- "@storybook/addon-mdx-gfm": {
772
- "version": "^7.0.8",
773
- "alwaysAddToPackageJson": false
774
- },
775
- "@storybook/addon-highlight": {
776
- "version": "^7.0.8",
777
- "alwaysAddToPackageJson": false
778
- },
779
- "@storybook/addon-interactions": {
780
- "version": "^7.0.8",
781
- "alwaysAddToPackageJson": false
782
- },
783
- "@storybook/addon-jest": {
784
- "version": "^7.0.8",
785
- "alwaysAddToPackageJson": false
786
- },
787
- "@storybook/addon-links": {
788
- "version": "^7.0.8",
789
- "alwaysAddToPackageJson": false
790
- },
791
- "@storybook/addon-measure": {
792
- "version": "^7.0.8",
793
- "alwaysAddToPackageJson": false
794
- },
795
- "@storybook/addon-outline": {
796
- "version": "^7.0.8",
797
- "alwaysAddToPackageJson": false
798
- },
799
- "@storybook/addon-storyshots": {
800
- "version": "^7.0.8",
801
- "alwaysAddToPackageJson": false
802
- },
803
- "@storybook/addon-storyshots-puppeteer": {
804
- "version": "^7.0.8",
805
- "alwaysAddToPackageJson": false
806
- },
807
- "@storybook/addon-storysource": {
808
- "version": "^7.0.8",
809
- "alwaysAddToPackageJson": false
810
- },
811
- "@storybook/addon-toolbars": {
812
- "version": "^7.0.8",
813
- "alwaysAddToPackageJson": false
814
- },
815
- "@storybook/addon-viewport": {
816
- "version": "^7.0.8",
817
- "alwaysAddToPackageJson": false
818
- },
819
- "@storybook/react-native": {
820
- "version": "^6.5.3",
821
- "alwaysAddToPackageJson": false
822
- },
823
- "@storybook/addon-ondevice-actions": {
824
- "version": "^6.5.3",
825
- "alwaysAddToPackageJson": false
826
- },
827
- "@storybook/addon-ondevice-backgrounds": {
828
- "version": "^6.5.3",
829
- "alwaysAddToPackageJson": false
830
- },
831
- "@storybook/addon-ondevice-controls": {
832
- "version": "^6.5.3",
833
- "alwaysAddToPackageJson": false
834
- },
835
- "@storybook/addon-ondevice-notes": {
836
- "version": "^6.5.3",
837
- "alwaysAddToPackageJson": false
838
- }
839
- }
840
- },
841
- "16.0.0": {
842
- "version": "16.0.0-beta.1",
843
- "packages": {
844
- "@storybook/core-server": {
845
- "version": "^7.0.5",
846
- "alwaysAddToPackageJson": false
847
- },
848
- "@storybook/angular": {
849
- "version": "^7.0.5",
850
- "alwaysAddToPackageJson": false
851
- },
852
- "@storybook/react": {
853
- "version": "^7.0.5",
854
- "alwaysAddToPackageJson": false
855
- },
856
- "@storybook/addon-essentials": {
857
- "version": "^7.0.5",
858
- "alwaysAddToPackageJson": false
859
- }
860
- }
861
- },
862
251
  "18.2.0": {
863
252
  "version": "18.2.0-beta.1",
864
253
  "packages": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/storybook",
3
- "version": "20.0.0-beta.4",
3
+ "version": "20.0.0-beta.6",
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": {
@@ -33,14 +33,13 @@
33
33
  "migrations": "./migrations.json"
34
34
  },
35
35
  "dependencies": {
36
- "@nx/devkit": "20.0.0-beta.4",
36
+ "@nx/devkit": "20.0.0-beta.6",
37
37
  "@phenomnomnominal/tsquery": "~5.0.1",
38
38
  "semver": "^7.5.3",
39
39
  "tslib": "^2.3.0",
40
- "@nx/cypress": "20.0.0-beta.4",
41
- "@nx/js": "20.0.0-beta.4",
42
- "@nx/eslint": "20.0.0-beta.4",
43
- "@nrwl/storybook": "20.0.0-beta.4"
40
+ "@nx/cypress": "20.0.0-beta.6",
41
+ "@nx/js": "20.0.0-beta.6",
42
+ "@nx/eslint": "20.0.0-beta.6"
44
43
  },
45
44
  "publishConfig": {
46
45
  "access": "public"
@@ -4,6 +4,7 @@ exports.configurationGenerator = configurationGenerator;
4
4
  exports.configurationGeneratorInternal = configurationGeneratorInternal;
5
5
  const devkit_1 = require("@nx/devkit");
6
6
  const js_1 = require("@nx/js");
7
+ const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
7
8
  const init_1 = require("../init/init");
8
9
  const util_functions_1 = require("./lib/util-functions");
9
10
  const eslint_1 = require("@nx/eslint");
@@ -16,6 +17,7 @@ function configurationGenerator(tree, schema) {
16
17
  return configurationGeneratorInternal(tree, { addPlugin: false, ...schema });
17
18
  }
18
19
  async function configurationGeneratorInternal(tree, rawSchema) {
20
+ (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'storybook', 'configuration');
19
21
  const storybookMajor = (0, utilities_1.storybookMajorVersion)();
20
22
  if (storybookMajor > 0 && storybookMajor === 6) {
21
23
  throw new Error((0, utilities_1.pleaseUpgrade)());
@@ -18,14 +18,14 @@ async function convertToInferred(tree, options) {
18
18
  testStorybookTargetName: 'test-storybook',
19
19
  }, [
20
20
  {
21
- executors: ['@nx/storybook:build', '@nrwl/storybook:build'],
21
+ executors: ['@nx/storybook:build'],
22
22
  postTargetTransformer: (0, build_post_target_transformer_1.buildPostTargetTransformer)(migrationLogs),
23
23
  targetPluginOptionMapper: (targetName) => ({
24
24
  buildStorybookTargetName: targetName,
25
25
  }),
26
26
  },
27
27
  {
28
- executors: ['@nx/storybook:storybook', '@nrwl/storybook:storybook'],
28
+ executors: ['@nx/storybook:storybook'],
29
29
  postTargetTransformer: (0, serve_post_target_transformer_1.servePostTargetTransformer)(migrationLogs),
30
30
  targetPluginOptionMapper: (targetName) => ({
31
31
  serveStorybookTargetName: targetName,
@@ -1,6 +1,5 @@
1
1
  import { Tree } from '@nx/devkit';
2
2
  import { Linter, LinterType } from '@nx/eslint';
3
- import { type ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
4
3
  export interface CypressConfigureSchema {
5
4
  name: string;
6
5
  js?: boolean;
@@ -9,7 +8,6 @@ export interface CypressConfigureSchema {
9
8
  standaloneConfig?: boolean;
10
9
  ciTargetName?: string;
11
10
  skipFormat?: boolean;
12
- projectNameAndRootFormat?: ProjectNameAndRootFormat;
13
11
  }
14
12
  export declare function cypressProjectGenerator(tree: Tree, schema: CypressConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
15
13
  export default cypressProjectGenerator;
@@ -1,13 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.cypressProjectGenerator = cypressProjectGenerator;
4
- const project_name_1 = require("@nx/cypress/src/utils/project-name");
5
4
  const devkit_1 = require("@nx/devkit");
6
5
  const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
6
+ const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
7
7
  const path_1 = require("path");
8
8
  const utilities_1 = require("../../utils/utilities");
9
9
  const versions_1 = require("../../utils/versions");
10
10
  async function cypressProjectGenerator(tree, schema) {
11
+ (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'cypress', 'cypress-project');
11
12
  devkit_1.logger.warn(`Use 'interactionTests' instead when running '@nx/storybook:configuration'. This generator will be removed in v21.`);
12
13
  const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
13
14
  const e2eName = schema.name ? `${schema.name}-e2e` : undefined;
@@ -15,7 +16,6 @@ async function cypressProjectGenerator(tree, schema) {
15
16
  name: e2eName,
16
17
  projectType: 'application',
17
18
  directory: schema.directory,
18
- projectNameAndRootFormat: schema.projectNameAndRootFormat,
19
19
  });
20
20
  const libConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.name);
21
21
  const libRoot = libConfig.root;
@@ -33,7 +33,7 @@ async function cypressProjectGenerator(tree, schema) {
33
33
  devServerTarget: `${schema.name}:storybook`,
34
34
  skipFormat: true,
35
35
  });
36
- const generatedCypressProjectName = (0, project_name_1.getE2eProjectName)(schema.name, libRoot, schema.directory, schema.projectNameAndRootFormat);
36
+ const generatedCypressProjectName = projectName;
37
37
  removeUnneededFiles(tree, generatedCypressProjectName, schema.js);
38
38
  const project = (0, devkit_1.readProjectConfiguration)(tree, generatedCypressProjectName);
39
39
  if (project.targets.e2e && project.targets.e2e.options) {
@@ -129,13 +129,4 @@ function updateAngularJsonBuilder(tree, opts) {
129
129
  };
130
130
  (0, devkit_1.updateProjectConfiguration)(tree, opts.e2eProjectName, project);
131
131
  }
132
- function projectAlreadyHasCypress(tree) {
133
- const packageJsonContents = (0, devkit_1.readJson)(tree, 'package.json');
134
- return ((packageJsonContents?.['devDependencies']?.['@nx/cypress'] ||
135
- packageJsonContents?.['dependencies']?.['@nx/cypress'] ||
136
- packageJsonContents?.['devDependencies']?.['@nrwl/cypress'] ||
137
- packageJsonContents?.['dependencies']?.['@nrwl/cypress']) &&
138
- (packageJsonContents?.['devDependencies']?.['cypress'] ||
139
- packageJsonContents?.['dependencies']?.['cypress']));
140
- }
141
132
  exports.default = cypressProjectGenerator;
@@ -44,11 +44,6 @@
44
44
  "type": "boolean",
45
45
  "default": false,
46
46
  "x-priority": "internal"
47
- },
48
- "projectNameAndRootFormat": {
49
- "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
50
- "type": "string",
51
- "enum": ["as-provided", "derived"]
52
47
  }
53
48
  },
54
49
  "required": ["name"]
@@ -4,6 +4,7 @@ exports.initGenerator = initGenerator;
4
4
  exports.initGeneratorInternal = initGeneratorInternal;
5
5
  const devkit_1 = require("@nx/devkit");
6
6
  const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
7
+ const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
7
8
  const semver_1 = require("semver");
8
9
  const plugin_1 = require("../../plugins/plugin");
9
10
  const utilities_1 = require("../../utils/utilities");
@@ -55,6 +56,7 @@ function initGenerator(tree, schema) {
55
56
  return initGeneratorInternal(tree, { addPlugin: false, ...schema });
56
57
  }
57
58
  async function initGeneratorInternal(tree, schema) {
59
+ (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'storybook', 'init');
58
60
  const nxJson = (0, devkit_1.readNxJson)(tree);
59
61
  const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
60
62
  nxJson.useInferencePlugins !== false;
@@ -403,9 +403,7 @@ function checkStorybookInstalled(packageJson) {
403
403
  return ((packageJson.dependencies['@storybook/core-server'] ||
404
404
  packageJson.devDependencies['@storybook/core-server']) &&
405
405
  (packageJson.dependencies['@nx/storybook'] ||
406
- packageJson.devDependencies['@nx/storybook'] ||
407
- packageJson.dependencies['@nrwl/storybook'] ||
408
- packageJson.devDependencies['@nrwl/storybook']));
406
+ packageJson.devDependencies['@nx/storybook']));
409
407
  }
410
408
  function checkWebComponentsInstalled(packageJson) {
411
409
  return (packageJson.dependencies['@storybook/web-components'] ||
@@ -119,9 +119,7 @@ function checkStorybookInstalled(packageJson) {
119
119
  return ((packageJson.dependencies['@storybook/core-server'] ||
120
120
  packageJson.devDependencies['@storybook/core-server']) &&
121
121
  (packageJson.dependencies['@nx/storybook'] ||
122
- packageJson.devDependencies['@nx/storybook'] ||
123
- packageJson.dependencies['@nrwl/storybook'] ||
124
- packageJson.devDependencies['@nrwl/storybook']));
122
+ packageJson.devDependencies['@nx/storybook']));
125
123
  }
126
124
  function logResult(tree, migrationSummary) {
127
125
  devkit_1.output.log({
@@ -10,7 +10,7 @@ async function createTestUILibNoNgDevkit(appTree, libName) {
10
10
  skipFormat: true,
11
11
  skipTsConfig: false,
12
12
  unitTestRunner: 'none',
13
- name: libName,
13
+ directory: libName,
14
14
  });
15
15
  return appTree;
16
16
  }
@@ -96,18 +96,6 @@ function findStorybookAndBuildTargetsAndCompiler(targets) {
96
96
  '@nx/angular:webpack-browser',
97
97
  '@nx/esbuild:esbuild',
98
98
  '@nx/next:build',
99
- '@nrwl/js:babel',
100
- '@nrwl/js:swc',
101
- '@nrwl/js:tsc',
102
- '@nrwl/webpack:webpack',
103
- '@nrwl/rollup:rollup',
104
- '@nrwl/web:rollup',
105
- '@nrwl/vite:build',
106
- '@nrwl/angular:ng-packagr-lite',
107
- '@nrwl/angular:package',
108
- '@nrwl/angular:webpack-browser',
109
- '@nrwl/esbuild:esbuild',
110
- '@nrwl/next:build',
111
99
  '@nxext/vite:build',
112
100
  '@angular-devkit/build-angular:application',
113
101
  '@angular-devkit/build-angular:browser',
@@ -145,13 +133,11 @@ function findStorybookAndBuildTargetsAndCompiler(targets) {
145
133
  returnObject.compiler = targets[target].options?.compiler;
146
134
  }
147
135
  else if (targets[target].executor === '@storybook/angular:start-storybook' ||
148
- targets[target].executor === '@nrwl/storybook:storybook' ||
149
136
  targets[target].executor === '@nx/storybook:storybook') {
150
137
  returnObject.storybookTarget = target;
151
138
  }
152
139
  else if (targets[target].executor === '@storybook/angular:build-storybook' ||
153
- targets[target].executor === '@nx/storybook:build' ||
154
- targets[target].executor === '@nrwl/storybook:build') {
140
+ targets[target].executor === '@nx/storybook:build') {
155
141
  returnObject.storybookBuildTarget = target;
156
142
  }
157
143
  else if (targets[target].options?.compiler) {
@@ -1,2 +0,0 @@
1
- import { Tree } from '@nx/devkit';
2
- export default function changeStorybookTargets(tree: Tree): Promise<import("@nx/devkit").GeneratorCallback>;
@@ -1,30 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = changeStorybookTargets;
4
- const output_1 = require("nx/src/utils/output");
5
- const migrate_7_1 = require("../../generators/migrate-7/migrate-7");
6
- const utilities_1 = require("../../utils/utilities");
7
- async function changeStorybookTargets(tree) {
8
- const storybookVersion = (0, utilities_1.storybookMajorVersion)();
9
- if (!storybookVersion) {
10
- /**
11
- * This just checks if Storybook is installed in the workspace.
12
- * The thing here is that during the previous step of the migration,
13
- * during packageJsonUpdates, Nx has already set Storybook
14
- * to version 7, if Storybook exists in the workspace.
15
- * So, it makes no sense here to check if the version is
16
- * 7, because it will always be.
17
- */
18
- return;
19
- }
20
- output_1.output.log({
21
- title: 'Migrating Storybook to v7',
22
- bodyLines: [
23
- `🚀 This migration will update your Storybook configuration to v7.`,
24
- `It will call the @nx/storybook:migrate-7 generator for you.`,
25
- `You can read more about the migration and how this generator works here:`,
26
- `https://nx.dev/nx-api/storybook/generators/migrate-7`,
27
- ],
28
- });
29
- return (0, migrate_7_1.default)(tree, { autoAcceptAllPrompts: true });
30
- }
@@ -1,2 +0,0 @@
1
- import { Tree } from '@nx/devkit';
2
- export default function replacePackage(tree: Tree): Promise<void>;
@@ -1,9 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = replacePackage;
4
- const devkit_1 = require("@nx/devkit");
5
- const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
6
- async function replacePackage(tree) {
7
- await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/storybook', '@nx/storybook');
8
- await (0, devkit_1.formatFiles)(tree);
9
- }
@@ -1,2 +0,0 @@
1
- import { Tree } from '@nx/devkit';
2
- export default function (tree: Tree): Promise<void>;
@@ -1,38 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = default_1;
4
- const devkit_1 = require("@nx/devkit");
5
- async function default_1(tree) {
6
- const projects = (0, devkit_1.getProjects)(tree);
7
- const reactPlugin = '@nx/react/plugins/storybook';
8
- let shouldIgnoreReactPlugin = false;
9
- for (const [, config] of projects) {
10
- let sbConfigPath = (0, devkit_1.joinPathFragments)(config.root, '.storybook/main.ts');
11
- if (!tree.exists(sbConfigPath)) {
12
- sbConfigPath = (0, devkit_1.joinPathFragments)(config.root, '.storybook/main.js');
13
- }
14
- if (!tree.exists(sbConfigPath)) {
15
- continue;
16
- }
17
- const sbConfig = tree.read(sbConfigPath, 'utf-8');
18
- if (sbConfig.includes(reactPlugin)) {
19
- shouldIgnoreReactPlugin = true;
20
- break;
21
- }
22
- }
23
- if (shouldIgnoreReactPlugin && tree.exists('.eslintrc.json')) {
24
- (0, devkit_1.updateJson)(tree, '.eslintrc.json', (json) => {
25
- if (json.extends?.includes('plugin:storybook/recommended')) {
26
- json.rules ??= {};
27
- json.rules['storybook/no-uninstalled-addons'] = [
28
- 'error',
29
- {
30
- ignore: ['@nx/react/plugins/storybook'],
31
- },
32
- ];
33
- }
34
- return json;
35
- });
36
- }
37
- await (0, devkit_1.formatFiles)(tree);
38
- }
@@ -1,2 +0,0 @@
1
- import { Tree } from '@nx/devkit';
2
- export default function (tree: Tree): Promise<void>;
@@ -1,20 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = default_1;
4
- const devkit_1 = require("@nx/devkit");
5
- const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
6
- const util_functions_1 = require("../../generators/configuration/lib/util-functions");
7
- async function default_1(tree) {
8
- (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/storybook:storybook', (options, projectName) => {
9
- const projectConfiguration = (0, devkit_1.getProjects)(tree).get(projectName);
10
- const projectRoot = projectConfiguration.root;
11
- if (options?.['configDir'] === undefined) {
12
- return;
13
- }
14
- const pathToStorybookConfigFile = (0, devkit_1.joinPathFragments)(options?.['configDir'], 'tsconfig.json');
15
- (0, util_functions_1.renameAndMoveOldTsConfig)(projectRoot, pathToStorybookConfigFile, tree);
16
- });
17
- (0, util_functions_1.addStorybookToNamedInputs)(tree);
18
- (0, util_functions_1.addStorybookToTargetDefaults)(tree, false);
19
- await (0, devkit_1.formatFiles)(tree);
20
- }