From 7d35905a5b0c1460a128b854dd802f510aab1cda Mon Sep 17 00:00:00 2001 From: castastrophe Date: Fri, 15 Mar 2024 10:02:41 -0400 Subject: [PATCH] feat!: postcss config build and script; remove gulp BREAKING CHANGE: - Removes component-builder & component-builder-simple for script leveraging postcss - Imports added to index.css and themes/express.css --- .github/actions/file-diff/index.js | 75 +- .github/workflows/build.yml | 4 +- .github/workflows/compare-results.yml | 27 +- .github/workflows/development.yml | 17 +- .github/workflows/lint.yml | 46 +- .npmignore | 5 +- .../cyclebutton/cyclebutton.stories.js | 46 +- .../quickaction/quickaction.stories.js | 79 +- .../searchwithin/searchwithin.stories.js | 235 +- .../splitbutton/splitbutton.stories.js | 98 +- .storybook/main.js | 16 +- .storybook/package.json | 22 +- .storybook/postcss.config.js | 99 - .storybook/preview-head.html | 12 +- .storybook/preview.js | 18 - .storybook/project.json | 25 +- components/README.md | 2 - components/accordion/gulpfile.js | 1 - components/accordion/package.json | 5 +- components/accordion/project.json | 5 +- .../accordion/stories/accordion.stories.js | 6 +- components/accordion/stories/template.js | 2 +- components/actionbar/gulpfile.js | 1 - components/actionbar/package.json | 5 +- components/actionbar/project.json | 5 +- .../actionbar/stories/actionbar.stories.js | 8 +- components/actionbutton/gulpfile.js | 1 - components/actionbutton/index.css | 1 + components/actionbutton/package.json | 5 +- components/actionbutton/project.json | 5 +- .../stories/actionbutton-quiet.stories.js | 6 +- .../actionbutton-staticblack.stories.js | 4 +- .../actionbutton-staticwhite.stories.js | 4 +- .../stories/actionbutton.stories.js | 6 +- components/actionbutton/themes/express.css | 2 + components/actiongroup/gulpfile.js | 1 - components/actiongroup/index.css | 4 +- components/actiongroup/package.json | 5 +- components/actiongroup/project.json | 5 +- .../stories/actiongroup.stories.js | 4 +- components/actiongroup/themes/express.css | 2 + components/actionmenu/gulpfile.js | 1 - components/actionmenu/package.json | 5 +- .../actionmenu/stories/actionmenu.stories.js | 8 +- components/alertbanner/gulpfile.js | 1 - components/alertbanner/index.css | 2 + components/alertbanner/package.json | 5 +- components/alertbanner/project.json | 5 +- .../stories/alertbanner.stories.js | 4 +- components/alertbanner/themes/express.css | 2 + components/alertdialog/gulpfile.js | 1 - components/alertdialog/package.json | 5 +- components/alertdialog/project.json | 5 +- .../stories/alertdialog.stories.js | 4 +- components/asset/gulpfile.js | 1 - components/asset/package.json | 5 +- components/asset/project.json | 5 +- components/asset/stories/asset.stories.js | 4 +- components/assetcard/gulpfile.js | 1 - components/assetcard/index.css | 2 + components/assetcard/package.json | 5 +- components/assetcard/project.json | 5 +- .../assetcard/stories/assetcard.stories.js | 4 +- components/assetcard/themes/express.css | 2 + components/assetlist/gulpfile.js | 1 - components/assetlist/package.json | 5 +- components/assetlist/project.json | 5 +- .../assetlist/stories/assetlist.stories.js | 4 +- components/avatar/gulpfile.js | 1 - components/avatar/package.json | 5 +- components/avatar/project.json | 5 +- components/avatar/stories/avatar.stories.js | 4 +- components/badge/gulpfile.js | 1 - components/badge/package.json | 5 +- components/badge/project.json | 5 +- components/badge/stories/badge.stories.js | 4 +- components/breadcrumb/gulpfile.js | 1 - components/breadcrumb/package.json | 5 +- components/breadcrumb/project.json | 5 +- .../breadcrumb/stories/breadcrumb.stories.js | 4 +- components/button/gulpfile.js | 1 - components/button/index.css | 1 + components/button/package.json | 5 +- components/button/project.json | 5 +- components/button/stories/button.stories.js | 4 +- components/button/themes/express.css | 2 + components/buttongroup/gulpfile.js | 1 - components/buttongroup/package.json | 5 +- components/buttongroup/project.json | 5 +- .../stories/buttongroup.stories.js | 4 +- components/calendar/gulpfile.js | 1 - components/calendar/package.json | 5 +- components/calendar/project.json | 5 +- .../calendar/stories/calendar.stories.js | 4 +- components/card/gulpfile.js | 1 - components/card/package.json | 5 +- components/card/project.json | 5 +- components/card/stories/card.stories.js | 4 +- components/checkbox/gulpfile.js | 1 - components/checkbox/index.css | 4 +- components/checkbox/package.json | 5 +- components/checkbox/project.json | 5 +- .../checkbox/stories/checkbox.stories.js | 4 +- components/checkbox/themes/express.css | 2 + components/clearbutton/gulpfile.js | 1 - components/clearbutton/index.css | 8 +- components/clearbutton/package.json | 5 +- components/clearbutton/project.json | 5 +- .../stories/clearbutton.stories.js | 4 +- components/clearbutton/themes/express.css | 2 + components/closebutton/gulpfile.js | 1 - components/closebutton/index.css | 2 + components/closebutton/package.json | 5 +- components/closebutton/project.json | 5 +- .../stories/closebutton.stories.js | 4 +- components/closebutton/themes/express.css | 2 + components/coachindicator/gulpfile.js | 1 - components/coachindicator/package.json | 5 +- components/coachindicator/project.json | 5 +- .../stories/coachindicator.stories.js | 4 +- components/coachmark/gulpfile.js | 1 - components/coachmark/package.json | 5 +- components/coachmark/project.json | 5 +- .../coachmark/stories/coachmark.stories.js | 4 +- components/colorarea/gulpfile.js | 1 - components/colorarea/package.json | 5 +- components/colorarea/project.json | 5 +- .../colorarea/stories/colorarea.stories.js | 4 +- components/colorhandle/gulpfile.js | 1 - components/colorhandle/package.json | 5 +- components/colorhandle/project.json | 5 +- .../stories/colorhandle.stories.js | 4 +- components/colorloupe/gulpfile.js | 1 - components/colorloupe/package.json | 5 +- components/colorloupe/project.json | 5 +- .../colorloupe/stories/colorloupe.stories.js | 4 +- components/colorslider/gulpfile.js | 1 - components/colorslider/package.json | 5 +- components/colorslider/project.json | 5 +- .../stories/colorslider.stories.js | 4 +- components/colorwheel/gulpfile.js | 1 - components/colorwheel/package.json | 5 +- components/colorwheel/project.json | 5 +- .../colorwheel/stories/colorwheel.stories.js | 4 +- components/combobox/gulpfile.js | 1 - components/combobox/index.css | 4 +- components/combobox/package.json | 5 +- components/combobox/project.json | 5 +- .../combobox/stories/combobox.stories.js | 4 +- components/combobox/themes/express.css | 2 + components/commons/project.json | 5 +- components/contextualhelp/gulpfile.js | 1 - components/contextualhelp/package.json | 5 +- components/contextualhelp/project.json | 5 +- .../stories/contextualhelp.stories.js | 4 +- components/datepicker/gulpfile.js | 1 - components/datepicker/index.css | 4 +- components/datepicker/package.json | 5 +- components/datepicker/project.json | 5 +- .../datepicker/stories/datepicker.stories.js | 6 +- components/datepicker/themes/express.css | 2 + components/dial/gulpfile.js | 1 - components/dial/package.json | 5 +- components/dial/project.json | 5 +- components/dial/stories/dial.stories.js | 4 +- components/dialog/gulpfile.js | 1 - components/dialog/package.json | 5 +- components/dialog/project.json | 5 +- components/dialog/stories/dialog.stories.js | 4 +- components/divider/gulpfile.js | 1 - components/divider/package.json | 5 +- components/divider/project.json | 5 +- components/divider/stories/divider.stories.js | 4 +- components/dropindicator/gulpfile.js | 1 - components/dropindicator/package.json | 5 +- components/dropindicator/project.json | 5 +- .../stories/dropindicator.stories.js | 4 +- components/dropzone/gulpfile.js | 1 - components/dropzone/package.json | 5 +- components/dropzone/project.json | 5 +- .../dropzone/stories/dropzone.stories.js | 4 +- components/fieldgroup/gulpfile.js | 1 - components/fieldgroup/package.json | 5 +- components/fieldgroup/project.json | 5 +- .../fieldgroup/stories/fieldgroup.stories.js | 4 +- components/fieldlabel/gulpfile.js | 1 - components/fieldlabel/package.json | 3 - components/fieldlabel/project.json | 5 +- .../fieldlabel/stories/fieldlabel.stories.js | 6 +- components/fieldlabel/stories/form.stories.js | 6 +- components/floatingactionbutton/gulpfile.js | 1 - components/floatingactionbutton/package.json | 5 +- components/floatingactionbutton/project.json | 5 +- .../stories/floatingactionbutton.stories.js | 4 +- components/helptext/gulpfile.js | 1 - components/helptext/package.json | 5 +- components/helptext/project.json | 5 +- .../helptext/stories/helptext.stories.js | 4 +- components/icon/gulpfile.js | 1 - components/icon/package.json | 3 - components/icon/project.json | 5 +- components/icon/stories/icon.stories.js | 4 +- components/icon/stories/template.js | 8 +- components/icon/stories/utilities.js | 12 +- components/illustratedmessage/gulpfile.js | 1 - components/illustratedmessage/package.json | 5 +- components/illustratedmessage/project.json | 5 +- .../stories/illustratedmessage.stories.js | 4 +- components/infieldbutton/gulpfile.js | 1 - components/infieldbutton/index.css | 2 + components/infieldbutton/package.json | 5 +- components/infieldbutton/project.json | 5 +- components/infieldbutton/themes/express.css | 2 + components/inlinealert/gulpfile.js | 1 - components/inlinealert/package.json | 5 +- components/inlinealert/project.json | 5 +- .../stories/inlinealert.stories.js | 4 +- components/link/gulpfile.js | 1 - components/link/package.json | 5 +- components/link/project.json | 5 +- components/link/stories/link.stories.js | 4 +- components/logicbutton/gulpfile.js | 1 - components/logicbutton/package.json | 5 +- components/logicbutton/project.json | 5 +- .../stories/logicbutton.stories.js | 4 +- components/menu/gulpfile.js | 1 - components/menu/package.json | 3 - components/menu/project.json | 5 +- components/menu/stories/menu.stories.js | 4 +- components/miller/gulpfile.js | 1 - components/miller/package.json | 5 +- components/miller/project.json | 5 +- components/miller/stories/miller.stories.js | 4 +- components/modal/gulpfile.js | 1 - components/modal/package.json | 5 +- components/modal/project.json | 5 +- components/modal/stories/modal.stories.js | 4 +- components/opacitycheckerboard/gulpfile.js | 1 - components/opacitycheckerboard/package.json | 5 +- components/opacitycheckerboard/project.json | 5 +- .../stories/opacitycheckerboard.stories.js | 4 +- components/page/gulpfile.js | 1 - components/page/package.json | 5 +- components/page/project.json | 5 +- components/pagination/gulpfile.js | 1 - components/pagination/package.json | 5 +- components/pagination/project.json | 5 +- .../pagination/stories/pagination.stories.js | 4 +- components/picker/gulpfile.js | 1 - components/picker/index.css | 1 + components/picker/package.json | 5 +- components/picker/project.json | 5 +- components/picker/stories/picker.stories.js | 4 +- components/picker/themes/express.css | 2 + components/pickerbutton/gulpfile.js | 1 - components/pickerbutton/index.css | 2 + components/pickerbutton/package.json | 5 +- components/pickerbutton/project.json | 5 +- .../stories/pickerbutton.stories.js | 4 +- components/pickerbutton/themes/express.css | 2 + components/popover/gulpfile.js | 1 - components/popover/index.css | 1 + components/popover/package.json | 5 +- components/popover/project.json | 5 +- components/popover/stories/popover.stories.js | 4 +- components/popover/themes/express.css | 2 + components/progressbar/gulpfile.js | 1 - components/progressbar/package.json | 5 +- components/progressbar/project.json | 5 +- .../progressbar/stories/meter.stories.js | 4 +- .../stories/progressbar.stories.js | 4 +- components/progresscircle/gulpfile.js | 1 - components/progresscircle/package.json | 5 +- components/progresscircle/project.json | 5 +- .../stories/progresscircle.stories.js | 4 +- components/radio/gulpfile.js | 1 - components/radio/index.css | 2 + components/radio/package.json | 5 +- components/radio/project.json | 5 +- components/radio/stories/radio.stories.js | 4 +- components/radio/themes/express.css | 2 + components/rating/gulpfile.js | 1 - components/rating/index.css | 6 +- components/rating/package.json | 5 +- components/rating/project.json | 5 +- components/rating/stories/rating.stories.js | 4 +- components/rating/themes/express.css | 2 + components/search/gulpfile.js | 1 - components/search/index.css | 2 + components/search/package.json | 5 +- components/search/project.json | 5 +- components/search/stories/search.stories.js | 4 +- components/search/themes/express.css | 2 + components/sidenav/gulpfile.js | 1 - components/sidenav/package.json | 5 +- components/sidenav/project.json | 5 +- components/site/gulpfile.js | 1 - components/site/package.json | 5 +- components/site/project.json | 5 +- components/slider/gulpfile.js | 1 - components/slider/index.css | 1 + components/slider/package.json | 5 +- components/slider/project.json | 5 +- components/slider/stories/slider.stories.js | 4 +- components/slider/themes/express.css | 2 + components/splitview/gulpfile.js | 1 - components/splitview/package.json | 5 +- components/splitview/project.json | 5 +- .../splitview/stories/splitview.stories.js | 4 +- components/statuslight/gulpfile.js | 1 - components/statuslight/package.json | 5 +- components/statuslight/project.json | 5 +- .../stories/statuslight.stories.js | 4 +- components/steplist/gulpfile.js | 1 - components/steplist/package.json | 5 +- components/steplist/project.json | 5 +- .../steplist/stories/steplist.stories.js | 4 +- components/stepper/gulpfile.js | 1 - components/stepper/index.css | 2 + components/stepper/package.json | 5 +- components/stepper/project.json | 5 +- components/stepper/stories/stepper.stories.js | 4 +- components/stepper/themes/express.css | 2 + components/swatch/gulpfile.js | 1 - components/swatch/package.json | 5 +- components/swatch/project.json | 5 +- components/swatch/stories/swatch.stories.js | 4 +- components/swatchgroup/gulpfile.js | 1 - components/swatchgroup/package.json | 5 +- components/swatchgroup/project.json | 5 +- .../stories/swatchgroup.stories.js | 4 +- components/switch/gulpfile.js | 1 - components/switch/index.css | 2 + components/switch/package.json | 5 +- components/switch/project.json | 5 +- components/switch/stories/switch.stories.js | 4 +- components/switch/themes/express.css | 2 + components/table/gulpfile.js | 1 - components/table/package.json | 5 +- components/table/project.json | 5 +- components/table/stories/table.stories.js | 4 +- components/tabs/gulpfile.js | 1 - components/tabs/index.css | 2 + components/tabs/package.json | 5 +- components/tabs/project.json | 5 +- components/tabs/themes/express.css | 2 + components/tag/gulpfile.js | 1 - components/tag/index.css | 2 + components/tag/package.json | 5 +- components/tag/project.json | 5 +- components/tag/stories/tag.stories.js | 4 +- components/tag/themes/express.css | 2 + components/taggroup/gulpfile.js | 1 - components/taggroup/package.json | 5 +- components/taggroup/project.json | 5 +- .../taggroup/stories/taggroup.stories.js | 6 +- components/textfield/gulpfile.js | 1 - components/textfield/index.css | 2 + components/textfield/package.json | 5 +- components/textfield/project.json | 5 +- components/textfield/stories/template.js | 2 +- .../textfield/stories/textfield.stories.js | 6 +- components/textfield/themes/express.css | 2 + components/thumbnail/gulpfile.js | 1 - components/thumbnail/package.json | 5 +- components/thumbnail/project.json | 5 +- .../thumbnail/stories/thumbnail.stories.js | 4 +- components/toast/gulpfile.js | 1 - components/toast/index.css | 2 + components/toast/package.json | 5 +- components/toast/project.json | 5 +- components/toast/stories/toast.stories.js | 6 +- components/toast/themes/express.css | 2 + components/tooltip/gulpfile.js | 1 - components/tooltip/index.css | 1 + components/tooltip/package.json | 5 +- components/tooltip/project.json | 5 +- components/tooltip/stories/tooltip.stories.js | 4 +- components/tooltip/themes/express.css | 2 + components/tray/gulpfile.js | 1 - components/tray/package.json | 5 +- components/tray/project.json | 5 +- components/tray/stories/tray.stories.js | 4 +- components/treeview/gulpfile.js | 1 - components/treeview/package.json | 5 +- components/treeview/project.json | 5 +- .../treeview/stories/treeview.stories.js | 4 +- components/typography/gulpfile.js | 1 - components/typography/package.json | 5 +- components/typography/project.json | 5 +- .../typography/stories/typography.stories.js | 4 +- components/underlay/gulpfile.js | 1 - components/underlay/package.json | 5 +- components/underlay/project.json | 5 +- components/well/gulpfile.js | 1 - components/well/package.json | 5 +- components/well/project.json | 5 +- components/well/stories/well.stories.js | 4 +- generator/package.json | 2 - generator/plopfile.js | 33 +- generator/templates/.npmignore.hbs | 1 - generator/templates/gulpfile.js.hbs | 1 - generator/templates/index.js.hbs | 3 + generator/templates/package.json.hbs | 21 +- generator/templates/project.json.hbs | 15 + generator/templates/stories/template.js.hbs | 27 +- .../stories/{{ folderName }}.stories.js.hbs | 40 +- gulpfile.js | 17 - nx.json | 9 +- package.json | 49 +- .../legacy-postcss-dropdupedvars/CHANGELOG.md | 14 - .../legacy-postcss-dropdupedvars/README.md | 39 - .../expected/dupes.css | 7 - .../fixtures/dupes.css | 10 - plugins/legacy-postcss-dropdupedvars/index.js | 37 - .../legacy-postcss-dropdupedvars/package.json | 19 - plugins/legacy-postcss-dropdupedvars/test.js | 25 - .../CHANGELOG.md | 14 - .../legacy-postcss-dropunusedvars/README.md | 47 - .../expected/unused.css | 15 - .../expected/varRefs.css | 19 - .../fixtures/unused.css | 16 - .../fixtures/varRefs.css | 22 - .../legacy-postcss-dropunusedvars/index.js | 90 - .../package.json | 22 - plugins/legacy-postcss-dropunusedvars/test.js | 29 - plugins/postcss-droproot/CHANGELOG.md | 48 - plugins/postcss-droproot/README.md | 26 - plugins/postcss-droproot/index.js | 28 - plugins/postcss-droproot/package.json | 15 - plugins/postcss-notnested/CHANGELOG.md | 14 - plugins/postcss-notnested/README.md | 8 - plugins/postcss-notnested/index.js | 71 - plugins/postcss-notnested/package.json | 15 - .../postcss-transformselectors/CHANGELOG.md | 54 - plugins/postcss-transformselectors/README.md | 41 - .../expected/complex.css | 114 - .../expected/regex.css | 21 - .../expected/replace.css | 16 - .../expected/transform.css | 7 - .../fixtures/complex.css | 104 - .../fixtures/regex.css | 21 - .../fixtures/replace.css | 16 - .../fixtures/transform.css | 7 - plugins/postcss-transformselectors/index.js | 45 - .../postcss-transformselectors/package.json | 19 - plugins/postcss-transformselectors/test.js | 70 - plugins/postcss-varfallback/CHANGELOG.md | 56 - plugins/postcss-varfallback/README.md | 39 - .../postcss-varfallback/expected/basic.css | 7 - .../expected/functions.css | 8 - .../postcss-varfallback/expected/nested.css | 8 - .../postcss-varfallback/fixtures/basic.css | 10 - .../fixtures/functions.css | 11 - .../postcss-varfallback/fixtures/nested.css | 11 - plugins/postcss-varfallback/index.js | 59 - plugins/postcss-varfallback/package.json | 22 - plugins/postcss-varfallback/test.js | 33 - plugins/postcss-varsonly/CHANGELOG.md | 14 - plugins/postcss-varsonly/README.md | 8 - plugins/postcss-varsonly/index.js | 51 - plugins/postcss-varsonly/package.json | 15 - postcss.config.js | 93 + site/README.md | 2 +- site/get-started.pug | 8 +- site/gulpfile.js | 56 - site/halo-focus.pug | 2 +- site/includes/dependencies.pug | 4 +- site/includes/footer.pug | 3 +- site/includes/nav.pug | 14 +- site/includes/sidebar.pug | 2 +- site/package.json | 41 + site/project.json | 61 + .../js}/adobe-globalnav.js | 2 - site/resources/js/polyfills.js | 2 +- site/tasks/builder.js | 715 +++++ .../index.css => site/tasks/index.js | 3 + site/tasks/server.js | 139 + site/tasks/utilities.js | 136 + site/templates/individualComponent.pug | 4 +- site/util.js | 156 +- tasks/clean-up-after-migration.sh | 3 +- tasks/compare-compiled-output.js | 141 +- tasks/component-builder.js | 459 +++ tasks/mod-extractor.js | 152 - tasks/templates/compare-listing.njk | 222 +- tasks/templates/diff-preview.njk | 145 +- tasks/templates/sidenav.njk | 69 + tokens/postcss.config.js | 4 +- tools/bundle-builder/CHANGELOG.md | 494 --- tools/bundle-builder/README.md | 56 - tools/bundle-builder/dev/index.js | 200 -- tools/bundle-builder/docs/README.md | 58 - tools/bundle-builder/docs/index.js | 389 --- tools/bundle-builder/index.js | 205 -- tools/bundle-builder/lib/depUtils.js | 115 - tools/bundle-builder/lib/dirs.js | 18 - tools/bundle-builder/lib/exec.js | 52 - tools/bundle-builder/package.json | 55 - tools/bundle-builder/subrunner/index.js | 116 - tools/bundle-builder/vars/index.js | 200 -- tools/component-builder-simple/CHANGELOG.md | 423 --- tools/component-builder-simple/README.md | 16 - tools/component-builder-simple/css/index.js | 99 - .../css/processors.js | 46 - tools/component-builder-simple/index.js | 34 - tools/component-builder-simple/package.json | 46 - tools/component-builder/CHANGELOG.md | 607 ---- tools/component-builder/README.md | 20 - tools/component-builder/css/index.js | 48 - tools/component-builder/css/lib/varUtils.js | 225 -- tools/component-builder/css/processors.js | 94 - tools/component-builder/css/vars.js | 84 - tools/component-builder/docs/index.js | 115 - tools/component-builder/index.js | 36 - tools/component-builder/package.json | 63 - yarn.lock | 2642 ++--------------- 517 files changed, 3604 insertions(+), 9553 deletions(-) delete mode 100644 .storybook/postcss.config.js delete mode 100644 components/accordion/gulpfile.js delete mode 100644 components/actionbar/gulpfile.js delete mode 100644 components/actionbutton/gulpfile.js delete mode 100644 components/actiongroup/gulpfile.js delete mode 100644 components/actionmenu/gulpfile.js delete mode 100644 components/alertbanner/gulpfile.js delete mode 100644 components/alertdialog/gulpfile.js delete mode 100644 components/asset/gulpfile.js delete mode 100644 components/assetcard/gulpfile.js delete mode 100644 components/assetlist/gulpfile.js delete mode 100644 components/avatar/gulpfile.js delete mode 100644 components/badge/gulpfile.js delete mode 100644 components/breadcrumb/gulpfile.js delete mode 100644 components/button/gulpfile.js delete mode 100644 components/buttongroup/gulpfile.js delete mode 100644 components/calendar/gulpfile.js delete mode 100644 components/card/gulpfile.js delete mode 100644 components/checkbox/gulpfile.js delete mode 100644 components/clearbutton/gulpfile.js delete mode 100644 components/closebutton/gulpfile.js delete mode 100644 components/coachindicator/gulpfile.js delete mode 100644 components/coachmark/gulpfile.js delete mode 100644 components/colorarea/gulpfile.js delete mode 100644 components/colorhandle/gulpfile.js delete mode 100644 components/colorloupe/gulpfile.js delete mode 100644 components/colorslider/gulpfile.js delete mode 100644 components/colorwheel/gulpfile.js delete mode 100644 components/combobox/gulpfile.js delete mode 100644 components/contextualhelp/gulpfile.js delete mode 100644 components/datepicker/gulpfile.js delete mode 100644 components/dial/gulpfile.js delete mode 100644 components/dialog/gulpfile.js delete mode 100644 components/divider/gulpfile.js delete mode 100644 components/dropindicator/gulpfile.js delete mode 100644 components/dropzone/gulpfile.js delete mode 100644 components/fieldgroup/gulpfile.js delete mode 100644 components/fieldlabel/gulpfile.js delete mode 100644 components/floatingactionbutton/gulpfile.js delete mode 100644 components/helptext/gulpfile.js delete mode 100644 components/icon/gulpfile.js delete mode 100644 components/illustratedmessage/gulpfile.js delete mode 100644 components/infieldbutton/gulpfile.js delete mode 100644 components/inlinealert/gulpfile.js delete mode 100644 components/link/gulpfile.js delete mode 100644 components/logicbutton/gulpfile.js delete mode 100644 components/menu/gulpfile.js delete mode 100644 components/miller/gulpfile.js delete mode 100644 components/modal/gulpfile.js delete mode 100644 components/opacitycheckerboard/gulpfile.js delete mode 100644 components/page/gulpfile.js delete mode 100644 components/pagination/gulpfile.js delete mode 100644 components/picker/gulpfile.js delete mode 100644 components/pickerbutton/gulpfile.js delete mode 100644 components/popover/gulpfile.js delete mode 100644 components/progressbar/gulpfile.js delete mode 100644 components/progresscircle/gulpfile.js delete mode 100644 components/radio/gulpfile.js delete mode 100644 components/rating/gulpfile.js delete mode 100644 components/search/gulpfile.js delete mode 100644 components/sidenav/gulpfile.js delete mode 100644 components/site/gulpfile.js delete mode 100644 components/slider/gulpfile.js delete mode 100644 components/splitview/gulpfile.js delete mode 100644 components/statuslight/gulpfile.js delete mode 100644 components/steplist/gulpfile.js delete mode 100644 components/stepper/gulpfile.js delete mode 100644 components/swatch/gulpfile.js delete mode 100644 components/swatchgroup/gulpfile.js delete mode 100644 components/switch/gulpfile.js delete mode 100644 components/table/gulpfile.js delete mode 100644 components/tabs/gulpfile.js delete mode 100644 components/tag/gulpfile.js delete mode 100644 components/taggroup/gulpfile.js delete mode 100644 components/textfield/gulpfile.js delete mode 100644 components/thumbnail/gulpfile.js delete mode 100644 components/toast/gulpfile.js delete mode 100644 components/tooltip/gulpfile.js delete mode 100644 components/tray/gulpfile.js delete mode 100644 components/treeview/gulpfile.js delete mode 100644 components/typography/gulpfile.js delete mode 100644 components/underlay/gulpfile.js delete mode 100644 components/well/gulpfile.js delete mode 100644 generator/templates/.npmignore.hbs delete mode 100644 generator/templates/gulpfile.js.hbs create mode 100644 generator/templates/index.js.hbs create mode 100644 generator/templates/project.json.hbs delete mode 100644 gulpfile.js delete mode 100644 plugins/legacy-postcss-dropdupedvars/CHANGELOG.md delete mode 100644 plugins/legacy-postcss-dropdupedvars/README.md delete mode 100644 plugins/legacy-postcss-dropdupedvars/expected/dupes.css delete mode 100644 plugins/legacy-postcss-dropdupedvars/fixtures/dupes.css delete mode 100644 plugins/legacy-postcss-dropdupedvars/index.js delete mode 100644 plugins/legacy-postcss-dropdupedvars/package.json delete mode 100644 plugins/legacy-postcss-dropdupedvars/test.js delete mode 100644 plugins/legacy-postcss-dropunusedvars/CHANGELOG.md delete mode 100644 plugins/legacy-postcss-dropunusedvars/README.md delete mode 100644 plugins/legacy-postcss-dropunusedvars/expected/unused.css delete mode 100644 plugins/legacy-postcss-dropunusedvars/expected/varRefs.css delete mode 100644 plugins/legacy-postcss-dropunusedvars/fixtures/unused.css delete mode 100644 plugins/legacy-postcss-dropunusedvars/fixtures/varRefs.css delete mode 100644 plugins/legacy-postcss-dropunusedvars/index.js delete mode 100644 plugins/legacy-postcss-dropunusedvars/package.json delete mode 100644 plugins/legacy-postcss-dropunusedvars/test.js delete mode 100644 plugins/postcss-droproot/CHANGELOG.md delete mode 100644 plugins/postcss-droproot/README.md delete mode 100644 plugins/postcss-droproot/index.js delete mode 100644 plugins/postcss-droproot/package.json delete mode 100644 plugins/postcss-notnested/CHANGELOG.md delete mode 100644 plugins/postcss-notnested/README.md delete mode 100644 plugins/postcss-notnested/index.js delete mode 100644 plugins/postcss-notnested/package.json delete mode 100644 plugins/postcss-transformselectors/CHANGELOG.md delete mode 100644 plugins/postcss-transformselectors/README.md delete mode 100644 plugins/postcss-transformselectors/expected/complex.css delete mode 100644 plugins/postcss-transformselectors/expected/regex.css delete mode 100644 plugins/postcss-transformselectors/expected/replace.css delete mode 100644 plugins/postcss-transformselectors/expected/transform.css delete mode 100644 plugins/postcss-transformselectors/fixtures/complex.css delete mode 100644 plugins/postcss-transformselectors/fixtures/regex.css delete mode 100644 plugins/postcss-transformselectors/fixtures/replace.css delete mode 100644 plugins/postcss-transformselectors/fixtures/transform.css delete mode 100644 plugins/postcss-transformselectors/index.js delete mode 100644 plugins/postcss-transformselectors/package.json delete mode 100644 plugins/postcss-transformselectors/test.js delete mode 100644 plugins/postcss-varfallback/CHANGELOG.md delete mode 100644 plugins/postcss-varfallback/README.md delete mode 100644 plugins/postcss-varfallback/expected/basic.css delete mode 100644 plugins/postcss-varfallback/expected/functions.css delete mode 100644 plugins/postcss-varfallback/expected/nested.css delete mode 100644 plugins/postcss-varfallback/fixtures/basic.css delete mode 100644 plugins/postcss-varfallback/fixtures/functions.css delete mode 100644 plugins/postcss-varfallback/fixtures/nested.css delete mode 100644 plugins/postcss-varfallback/index.js delete mode 100644 plugins/postcss-varfallback/package.json delete mode 100644 plugins/postcss-varfallback/test.js delete mode 100644 plugins/postcss-varsonly/CHANGELOG.md delete mode 100644 plugins/postcss-varsonly/README.md delete mode 100644 plugins/postcss-varsonly/index.js delete mode 100644 plugins/postcss-varsonly/package.json create mode 100644 postcss.config.js delete mode 100644 site/gulpfile.js create mode 100644 site/package.json create mode 100644 site/project.json rename site/{includes => resources/js}/adobe-globalnav.js (98%) create mode 100644 site/tasks/builder.js rename components/actionmenu/index.css => site/tasks/index.js (87%) create mode 100644 site/tasks/server.js create mode 100644 site/tasks/utilities.js create mode 100644 tasks/component-builder.js delete mode 100644 tasks/mod-extractor.js create mode 100644 tasks/templates/sidenav.njk delete mode 100644 tools/bundle-builder/CHANGELOG.md delete mode 100644 tools/bundle-builder/README.md delete mode 100644 tools/bundle-builder/dev/index.js delete mode 100644 tools/bundle-builder/docs/README.md delete mode 100644 tools/bundle-builder/docs/index.js delete mode 100644 tools/bundle-builder/index.js delete mode 100644 tools/bundle-builder/lib/depUtils.js delete mode 100644 tools/bundle-builder/lib/dirs.js delete mode 100644 tools/bundle-builder/lib/exec.js delete mode 100644 tools/bundle-builder/package.json delete mode 100644 tools/bundle-builder/subrunner/index.js delete mode 100644 tools/bundle-builder/vars/index.js delete mode 100644 tools/component-builder-simple/CHANGELOG.md delete mode 100644 tools/component-builder-simple/README.md delete mode 100644 tools/component-builder-simple/css/index.js delete mode 100644 tools/component-builder-simple/css/processors.js delete mode 100644 tools/component-builder-simple/index.js delete mode 100644 tools/component-builder-simple/package.json delete mode 100644 tools/component-builder/CHANGELOG.md delete mode 100644 tools/component-builder/README.md delete mode 100644 tools/component-builder/css/index.js delete mode 100644 tools/component-builder/css/lib/varUtils.js delete mode 100644 tools/component-builder/css/processors.js delete mode 100644 tools/component-builder/css/vars.js delete mode 100644 tools/component-builder/docs/index.js delete mode 100644 tools/component-builder/index.js delete mode 100644 tools/component-builder/package.json diff --git a/.github/actions/file-diff/index.js b/.github/actions/file-diff/index.js index b1b8b5b0b5a..c8f13dd6254 100644 --- a/.github/actions/file-diff/index.js +++ b/.github/actions/file-diff/index.js @@ -52,7 +52,7 @@ async function run() { * and not just reporting on the overall size of the compiled assets * @type boolean */ - const hasDiff = baseOutput.size > 0; + const hasBase = baseOutput.size > 0; // --------------- End evaluation --------------- /** Split the data by component package */ @@ -66,7 +66,7 @@ async function run() { ); /** Calculate the overall size of the base branch's assets */ - const overallBaseSize = hasDiff + const overallBaseSize = hasBase ? [...baseOutput.values()].reduce((acc, size) => acc + size, 0) : undefined; @@ -95,21 +95,27 @@ async function run() { * PR - base / base = change */ let changeSummary = ""; - if (baseOutput.size > 0 && hasDiff && hasChange) { + if (baseOutput.size > 0 && hasBase && hasChange) { changeSummary = `**Total change (Δ)**: ${printChange(overallHeadSize, overallBaseSize)} (${printPercentChange(overallHeadSize, overallBaseSize)})`; - } else if (baseOutput.size > 0 && hasDiff && !hasChange) { + } else if (baseOutput.size > 0 && hasBase && !hasChange) { changeSummary = `No change in file sizes`; } if (changeSummary !== "") { - summary.push(...[ + summary.push( changeSummary, - "Table reports on changes to a package's main file. Other changes can be found in the collapsed \"Details\" below.", + "", + "Table reports on changes to a package's main file. Other changes can be found in the collapsed Details section below.", "" - ]); + ); } - markdown.push(`
`, `Details`, ""); + markdown.push( + "", + `
`, + `Details`, + "" + ); sections.map(({ name, filePath, headMainSize, baseMainSize, hasChange, mainFile, fileMap }) => { if (!hasChange) return; @@ -117,7 +123,7 @@ async function run() { const data = []; /** We only evaluate changes if there is a diff branch being used and this is the main file for the package */ - if (hasDiff) { + if (hasBase) { /** * If: the component folder exists in the original branch but not the PR * Or: the pull request file size is 0 or empty but the original branch has a size @@ -155,8 +161,8 @@ async function run() { const md = ["", `#### ${name}`, ""]; md.push( ...[ - ["File", "Head", ...(hasDiff ? ["Base", "Δ"] : [])], - [" - ", " - ", ...(hasDiff ? [" - ", " - "] : [])], + ["File", "Head", ...(hasBase ? ["Base", "Δ"] : [])], + [" - ", " - ", ...(hasBase ? [" - ", " - "] : [])], ].map((row) => `| ${row.join(" | ")} |`), ...[...fileMap.entries()] .reduce( @@ -170,10 +176,11 @@ async function run() { ...table, [ readableFilename === mainFile ? `**${readableFilename}**` : readableFilename, - isRemoved(headByteSize, baseByteSize) ? "**removed**" : isNew(headByteSize, baseByteSize) ? "**new**" : bytesToSize(headByteSize), - ...(hasDiff ? [ + // If the file was removed, note it's absense with a dash; otherwise, note it's size + isRemoved(headByteSize, baseByteSize) ? " - " : bytesToSize(headByteSize), + ...(hasBase ? [ bytesToSize(baseByteSize), - `${printChange(headByteSize, baseByteSize)}${difference(headByteSize, baseByteSize) !== 0 ? ` (${printPercentChange(headByteSize , baseByteSize)})` : ""}`, + isRemoved(headByteSize, baseByteSize) ? "🚨 deleted, moved, or renamed" : isNew(headByteSize, baseByteSize) ? "🎉 **new**" : `${printChange(headByteSize, baseByteSize)}${difference(headByteSize, baseByteSize) !== 0 ? ` (${printPercentChange(headByteSize , baseByteSize)})` : ""}`, ] : []), ] ]; @@ -192,8 +199,8 @@ async function run() { if (summaryTable.length > 0) { // Add the headings to the summary table if it contains data summaryTable = [ - ["Package", "Size", ...(hasDiff ? ["Δ"] : [])], - ["-", "-", ...(hasDiff ? ["-"] : [])], + ["Package", "Size", ...(hasBase ? ["Δ"] : [])], + ["-", "-", ...(hasBase ? ["-"] : [])], ...summaryTable, ]; @@ -237,7 +244,7 @@ async function run() { ); core.setOutput("total-size", headMainSize); - if (hasDiff) { + if (hasBase) { const baseMainSize = [...baseOutput.entries()].reduce( (acc, [_, size]) => acc + size, 0 @@ -245,7 +252,7 @@ async function run() { core.setOutput( "has-changed", - hasDiff && headMainSize !== baseMainSize ? "true" : "false" + hasBase && headMainSize !== baseMainSize ? "true" : "false" ); } } else { @@ -379,11 +386,37 @@ const splitDataByPackage = function (dataMap, path, baseMap = new Map()) { if (!fileMap.has(readableFilename)) { fileMap.set(readableFilename, { - headByteSize: headByteSize, + headByteSize, baseByteSize: baseMap.get(file), }); - } else { - throw new Error(`The file ${file} was found twice in the dataset`); + } + + /** Update the component's table data */ + PACKAGES.set(packageName, fileMap); + }); + + // Look for any base files not present in the head + [...baseMap.entries()].forEach(([file, baseByteSize]) => { + // Determine the name of the component + const parts = file.split(sep); + const componentIdx = parts.findIndex((part) => part === "dist") - 1; + const packageName = parts[componentIdx]; + + if (!filePath) { + filePath = `${file.replace(path, "")}/${parts.slice(componentIdx + 1, -1).join(sep)}`; + } + + const readableFilename = file.replace(/^.*\/dist\//, ""); + + const fileMap = PACKAGES.has(packageName) + ? PACKAGES.get(packageName) + : new Map(); + + if (!fileMap.has(readableFilename)) { + fileMap.set(readableFilename, { + headByteSize: dataMap.get(file), + baseByteSize, + }); } /** Update the component's table data */ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e323d590db..eb354235a27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,9 +118,9 @@ jobs: run: yarn nx reset ## --- BUILD --- ## - - name: Build components + - name: Build components & ui-icons shell: bash - run: yarn build + run: yarn builder tag:component,ui-icons ## --- UPLOAD (only ubuntu-latest at the moment) --- ## - name: Upload compiled assets & NX performance profile diff --git a/.github/workflows/compare-results.yml b/.github/workflows/compare-results.yml index ea746aa5f2a..cc2ffaa3e3c 100644 --- a/.github/workflows/compare-results.yml +++ b/.github/workflows/compare-results.yml @@ -98,6 +98,31 @@ jobs: ui-icons/dist/** token: ${{ secrets.GITHUB_TOKEN }} + - name: Generate rich diff if changes detected + id: rich-diff + if: ${{ steps.compare.outputs.has-changed }} + shell: bash + run: yarn compare + + - name: Upload changes + if: ${{ steps.compare.outputs.has-changed }} + uses: actions/upload-artifact@v4 + with: + name: rich-diff + path: | + .diff-output/index.html + .diff-output/diffs/*/*.html + components/typography/dist/index.css + components/table/dist/index.css + components/badge/dist/index.css + components/button/dist/index.css + components/card/dist/index.css + components/icon/dist/index.css + components/sidenav/dist/index.css + tokens/dist/index.css + node_modules/diff2html/bundles/css/diff2html.min.css + node_modules/diff2html/bundles/js/diff2html.min.js + fetch-build-artifacts: name: Fetch & validate build artifacts strategy: @@ -172,7 +197,7 @@ jobs: - name: Build if: ${{ steps.download.outcome != 'success' }} shell: bash - run: yarn build + run: yarn builder tag:component,ui-icons - name: Upload compiled assets if: ${{ steps.download.outcome != 'success' }} diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index a889e8c5871..d01ee115874 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -86,8 +86,8 @@ jobs: outputs: styles_added_files: ${{ steps.changed-files.outputs.styles_added_files }} styles_modified_files: ${{ steps.changed-files.outputs.styles_modified_files }} - # eslint_added_files: ${{ steps.changed-files.outputs.eslint_added_files }} - # eslint_modified_files: ${{ steps.changed-files.outputs.eslint_modified_files }} + eslint_added_files: ${{ steps.changed-files.outputs.eslint_added_files }} + eslint_modified_files: ${{ steps.changed-files.outputs.eslint_modified_files }} permissions: pull-requests: read @@ -101,23 +101,24 @@ jobs: - components/*/index.css - components/*/themes/spectrum.css - components/*/themes/express.css - # eslint: - # - components/*/package.json - # - components/*/project.json - # - components/*/stories/*.js + eslint: + - components/*/package.json + - components/*/project.json + - components/*/stories/*.js # ------------------------------------------------------------- # Lint pre-compiled assets for consistency # ------------------------------------------------------------- lint: name: Lint + if: contains(github.event.pull_request.labels.*.name, 'skip_lint') needs: [changed_files] uses: ./.github/workflows/lint.yml with: styles_added_files: ${{ needs.changed_files.outputs.styles_added_files }} styles_modified_files: ${{ needs.changed_files.outputs.styles_modified_files }} - # eslint_added_files: ${{ needs.changed_files.outputs.eslint_added_files }} - # eslint_modified_files: ${{ needs.changed_files.outputs.eslint_modified_files }} + eslint_added_files: ${{ needs.changed_files.outputs.eslint_added_files }} + eslint_modified_files: ${{ needs.changed_files.outputs.eslint_modified_files }} secrets: inherit # ------------------------------------------------------------- diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bbaf2618e47..0c8e9b64e96 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,12 +12,12 @@ on: styles_modified_files: type: string required: false - # eslint_added_files: - # type: string - # required: false - # eslint_modified_files: - # type: string - # required: false + eslint_added_files: + type: string + required: false + eslint_modified_files: + type: string + required: false workflow_call: inputs: styles_added_files: @@ -26,12 +26,12 @@ on: styles_modified_files: type: string required: false - # eslint_added_files: - # type: string - # required: false - # eslint_modified_files: - # type: string - # required: false + eslint_added_files: + type: string + required: false + eslint_modified_files: + type: string + required: false permissions: contents: read @@ -80,18 +80,18 @@ jobs: fail_on_error: true level: error reporter: github-pr-check - filter_mode: file + filter_mode: diff_context # stylelint_input: "components/*/index.css components/*/themes/*.css" stylelint_input: "${{ inputs.styles_added_files }} ${{ inputs.styles_modified_files }}" stylelint_config: stylelint.config.js - # - name: Run eslint on packages and stories - # uses: reviewdog/action-eslint@v1.20.0 - # if: ${{ inputs.eslint_added_files != '' || inputs.eslint_modified_files != '' }} - # with: - # fail_on_error: true - # level: error - # reporter: github-pr-check - # filter_mode: file - # # eslint_flags: "components/*/stories/*.js" - # eslint_flags: "${{ inputs.eslint_added_files }} ${{ inputs.eslint_modified_files }}" + - name: Run eslint on packages and stories + uses: reviewdog/action-eslint@v1.20.0 + if: ${{ inputs.eslint_added_files != '' || inputs.eslint_modified_files != '' }} + with: + fail_on_error: true + level: error + reporter: github-pr-check + filter_mode: diff_context + # eslint_flags: "components/*/stories/*.js" + eslint_flags: "${{ inputs.eslint_added_files }} ${{ inputs.eslint_modified_files }}" diff --git a/.npmignore b/.npmignore index 33a2ffd5d33..01f17f16e23 100644 --- a/.npmignore +++ b/.npmignore @@ -1,11 +1,8 @@ /src -/docs +/dist /node_modules /tasks /temp -/gulpfile.js npm-debug.log /.github -/dist/docs/ /components -/tools diff --git a/.storybook/deprecated/cyclebutton/cyclebutton.stories.js b/.storybook/deprecated/cyclebutton/cyclebutton.stories.js index 3d4008f8486..0dea4e87b44 100644 --- a/.storybook/deprecated/cyclebutton/cyclebutton.stories.js +++ b/.storybook/deprecated/cyclebutton/cyclebutton.stories.js @@ -1,8 +1,11 @@ -// Import the component markup template -import { Template } from "@spectrum-css/cyclebutton/stories/template"; - import { default as ActionButtonStories } from "@spectrum-css/actionbutton/stories/actionbutton.stories.js"; +import { Template as ActionButton } from "@spectrum-css/actionbutton/stories/template.js"; import { default as IconStories } from "@spectrum-css/icon/stories/icon.stories.js"; +import { useArgs } from "@storybook/client-api"; +import { html } from "lit"; + +import "@spectrum-css/cyclebutton/dist/index-vars.css"; +import "@spectrum-css/cyclebutton/dist/vars.css"; export default { title: "Deprecated/Cycle button", @@ -42,5 +45,40 @@ export default { }, }; -export const Default = Template.bind({}); +export const Default = (({ + rootClass = "spectrum-CycleButton", + customClasses = [], + size = "m", + initialIcon = "Play", + selectedIcon = "Pause", + isDisabled = false, + onclick, + ...globals +}) => { + const [{ selectedIcon: icon }, updateArgs] = useArgs(); + + return html` + + + ${ActionButton({ + ...globals, + customClasses: [rootClass], + isQuiet: true, + isDisabled, + size, + iconName: initialIcon, + onclick: + onclick ?? + function () { + if (isDisabled) return; + + updateArgs({ initialIcon: selectedIcon }); + updateArgs({ selectedIcon: icon }); + }, + })} + `; +}).bind({}); Default.args = {}; diff --git a/.storybook/deprecated/quickaction/quickaction.stories.js b/.storybook/deprecated/quickaction/quickaction.stories.js index 6e20fd56eaa..9ca40f98bb9 100644 --- a/.storybook/deprecated/quickaction/quickaction.stories.js +++ b/.storybook/deprecated/quickaction/quickaction.stories.js @@ -1,4 +1,11 @@ -import { Template } from "@spectrum-css/quickaction/stories/template.js"; +import { html } from "lit"; +import { classMap } from "lit/directives/class-map.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + +import { Template as ActionButton } from "@spectrum-css/actionbutton/stories/template.js"; + +import "@spectrum-css/quickaction/dist/index-vars.css"; +import "@spectrum-css/quickaction/dist/vars.css"; export default { title: "Deprecated/Quick actions", @@ -64,5 +71,75 @@ export default { }, }; +const Template = ({ + rootClass = "spectrum-QuickActions", + size = "m", + isOpen = false, + textOnly = false, + position, + // noOverlay = false, + content = [], + id, + customClasses = [], + ...globals +}) => { + if (!content.length) { + console.warn("QuickActions: requires content be passed in to render."); + return html``; + } + + if (!content.some((c) => c.icon)) textOnly = true; + + return html` + + +
({ ...a, [c]: true }), {}), + })}" + id=${ifDefined(id)} + > + ${content.map((c) => { + if ((typeof c === "object" && c.iconName) || c.label) { + return ActionButton({ ...globals, ...c, isQuiet: true }); + } else return c; + })} +
+ `; +}; + export const Default = Template.bind({}); Default.args = {}; diff --git a/.storybook/deprecated/searchwithin/searchwithin.stories.js b/.storybook/deprecated/searchwithin/searchwithin.stories.js index 5beca556f44..3cc55e07eeb 100644 --- a/.storybook/deprecated/searchwithin/searchwithin.stories.js +++ b/.storybook/deprecated/searchwithin/searchwithin.stories.js @@ -1,27 +1,127 @@ -// Import the component markup template -import { Template } from "@spectrum-css/searchwithin/stories/template.js"; +import { html } from "lit"; +import { classMap } from "lit/directives/class-map.js"; +import { ifDefined } from "lit/directives/if-defined.js"; +import { styleMap } from "lit/directives/style-map.js"; -import { default as PickerStories } from "@spectrum-css/picker/stories/picker.stories.js"; -const ignoreProps = ["rootClass", "position", "isRounded"]; +import { Template as ClearButton } from "@spectrum-css/clearbutton/stories/template.js"; +import { Template as Picker } from "@spectrum-css/picker/stories/template.js"; +import { Template as Popover } from "@spectrum-css/popover/stories/template.js"; +import { Template as Textfield } from "@spectrum-css/textfield/stories/template.js"; + +import { Template as Menu } from "@spectrum-css/menu/stories/template.js"; + +import "@spectrum-css/textfield/dist/index.css"; + +import "@spectrum-css/searchwithin/dist/index-vars.css"; +import "@spectrum-css/searchwithin/dist/vars.css"; export default { title: "Deprecated/Search within", component: "SearchWithin", argTypes: { - ...Object.entries(PickerStories.argTypes).reduce((acc, [key, value]) => { - if (ignoreProps.includes(key)) return acc; - if (["size"].includes(key)) - value.table = { - ...value.table, - category: "Shared settings", - }; - else - value.table = { - ...value.table, - category: "Picker settings", - }; - return { ...acc, [key]: value }; - }, {}), + size: { + name: "Size", + type: { name: "string", required: true }, + table: { + type: { summary: "string" }, + category: "Component", + }, + options: ["s", "m", "l", "xl"], + control: "select", + }, + label: { + name: "Label", + type: { name: "string" }, + table: { + type: { summary: "string" }, + category: "Content", + }, + control: { type: "text" }, + }, + labelPosition: { + name: "Label position", + type: { name: "string" }, + table: { + type: { summary: "string" }, + category: "Content", + }, + options: ["top", "left"], + control: { type: "select" }, + }, + withSwitch: { + name: "Display with a switch component", + type: { name: "boolean" }, + table: { + type: { summary: "boolean" }, + category: "Component", + }, + control: "boolean", + if: { arg: "labelPosition", eq: "left" }, + }, + placeholder: { + name: "Placeholder", + type: { name: "string" }, + table: { + type: { summary: "string" }, + category: "Content", + }, + control: { type: "text" }, + }, + isQuiet: { + name: "Quiet styling", + type: { name: "boolean" }, + table: { + type: { summary: "boolean" }, + category: "Component", + }, + control: "boolean", + }, + isOpen: { + name: "Open", + type: { name: "boolean" }, + table: { + type: { summary: "boolean" }, + category: "State", + }, + control: "boolean", + }, + isKeyboardFocused: { + name: "Keyboard focused", + type: { name: "boolean" }, + table: { + type: { summary: "boolean" }, + category: "State", + }, + control: "boolean", + }, + isDisabled: { + name: "Disabled", + type: { name: "boolean" }, + table: { + type: { summary: "boolean" }, + category: "State", + }, + control: "boolean", + }, + isLoading: { + name: "Loading", + type: { name: "boolean" }, + table: { + type: { summary: "boolean" }, + category: "State", + }, + control: "boolean", + }, + isInvalid: { + name: "Invalid input", + type: { name: "boolean" }, + table: { + type: { summary: "boolean" }, + category: "State", + }, + control: "boolean", + }, + content: { table: { disable: true } }, }, args: { rootClass: "spectrum-SearchWithin", @@ -30,6 +130,12 @@ export default { isDisabled: false, size: "m", label: "All", + placeholder: "Search", + isKeyboardFocused: false, + isLoading: false, + isDisabled: false, + isInvalid: false, + withSwitch: false, }, parameters: { actions: { @@ -42,5 +148,98 @@ export default { }, }; +const Template = ({ + rootClass = "spectrum-SearchWithin", + customClasses = [], + customStyles = {}, + isQuiet = false, + isOpen = false, + isInvalid = false, + isLoading = false, + isDisabled = false, + withSwitch = false, + isKeyboardFocused = false, + size = "m", + label, + placeholder, + ...globals +}) => html` + + +
({ ...a, [c]: true }), {}), + })} + style=${ifDefined(styleMap(customStyles))} + > + ${Picker({ + ...globals, + size, + placeholder: label, + label: undefined, + isOpen, + isQuiet, + isInvalid, + isLoading, + isDisabled, + withSwitch, + position: "left", + customClasses: [`${rootClass}-picker`], + })} + ${Textfield({ + ...globals, + size, + autocomplete: false, + name: "search", + placeholder, + type: "search", + customInputClasses: [`${rootClass}-input`], + isQuiet, + isInvalid, + isLoading, + isDisabled, + isKeyboardFocused, + })} + ${ClearButton({ + ...globals, + size, + customClasses: [`${rootClass}-clearButton`], + })} + ${Popover({ + ...globals, + isOpen: isOpen, + withTip: false, + position: "bottom", + customStyles: { + position: "absolute", + top: "38px", + left: "0", + }, + content: [ + Menu({ + ...globals, + items: [ + { label: "Deselect" }, + { label: "Select Inverse" }, + { label: "Feather..." }, + { label: "Select and Mask..." }, + { type: "divider" }, + { label: "Save Selection" }, + { label: "Make Work Path", isDisabled: true }, + ], + }), + ], + })} +
+`; + export const Default = Template.bind({}); Default.args = {}; diff --git a/.storybook/deprecated/splitbutton/splitbutton.stories.js b/.storybook/deprecated/splitbutton/splitbutton.stories.js index c355978e896..fea59cee2d2 100644 --- a/.storybook/deprecated/splitbutton/splitbutton.stories.js +++ b/.storybook/deprecated/splitbutton/splitbutton.stories.js @@ -1,4 +1,10 @@ -import { Template } from "@spectrum-css/splitbutton/stories/template.js"; +import { html } from "lit"; +import { classMap } from "lit/directives/class-map.js"; + +import { Template as Button } from "@spectrum-css/button/stories/template.js"; + +import "@spectrum-css/splitbutton/dist/index-vars.css"; +import "@spectrum-css/splitbutton/dist/vars.css"; export default { title: "Deprecated/Split button", @@ -47,7 +53,6 @@ export default { position: "right", label: "Split Button", variant: "accent", - treatment: "fill", iconName: "ChevronDown100", }, parameters: { @@ -61,5 +66,94 @@ export default { }, }; +const Template = ({ + rootClass = "spectrum-SplitButton", + customClasses = [], + customFirstButtonClasses = [], + customLastButtonClasses = [], + size = "m", + variant = "cta", + iconName = "ChevronDown100", + labelIconName = undefined, + position = "right", + label = "Split Button", + ...globals +}) => { + return html` + + +
({ ...a, [c]: true }), {}), + })} + > + ${Button({ + ...globals, + variant, + size, + iconName: position === "right" + ? typeof labelIconName != "undefined" ? labelIconName : undefined + : iconName, + label: position === "right" ? label : undefined, + hideLabel: position === "right" ? false : true, + customClasses: [ + position === "right" + ? "spectrum-SplitButton-action" + : "spectrum-SplitButton-trigger", + ...customFirstButtonClasses + ] + })} + ${Button({ + ...globals, + variant, + size, + iconName: position === "right" + ? iconName + : typeof labelIconName != "undefined" ? labelIconName : undefined, + iconAfterLabel: true, + label: position === "right" ? undefined : label, + hideLabel: position === "right" ? true : false, + customClasses: [ + position === "right" + ? "spectrum-SplitButton-trigger" + : "spectrum-SplitButton-action", + ...customLastButtonClasses + ] + })} +
+ `; +}; + + export const Default = Template.bind({}); Default.args = {}; diff --git a/.storybook/main.js b/.storybook/main.js index 48f390a0278..7b58fc9c9de 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -48,11 +48,11 @@ module.exports = { env: { MIGRATED_PACKAGES: componentPkgs.filter((dir) => { const { - devDependencies = {}, + peerDependencies = {}, } = require(resolve(componentsPath, dir, "package.json")); if ( - devDependencies && - devDependencies["@spectrum-css/component-builder-simple"] + peerDependencies && + peerDependencies["@spectrum-css/tokens"] ) { return true; } @@ -75,7 +75,7 @@ module.exports = { ...config, stats: { /* Suppress autoprefixer warnings from storybook build */ - warningsFilter: [/autoprefixer: /], + warningsFilter: [/autoprefixer: /, /postcss-*/, /stylelint/], }, /* Add support for root node_modules imports */ resolve: { @@ -141,7 +141,7 @@ module.exports = { options: { implementation: require("postcss"), postcssOptions: { - config: resolve(__dirname, "postcss.config.js"), + config: resolve(__dirname, "../postcss.config.js"), }, }, }, @@ -151,10 +151,10 @@ module.exports = { test: /\.js$/, enforce: "pre", use: ["source-map-loader"], - } /* Raw SVG loader */, + } /* Raw loader */, { - test: /\.svg$/i, - loader: "raw-loader", + resourceQuery: /raw/, + type: 'asset/source', }, ], }, diff --git a/.storybook/package.json b/.storybook/package.json index f7dbb0eec80..ae145cdb083 100644 --- a/.storybook/package.json +++ b/.storybook/package.json @@ -20,11 +20,10 @@ "@babel/core": "^7.22.1", "@chromaui/addon-visual-tests": "^1.0.0", "@etchteam/storybook-addon-status": "^4.2.4", - "@spectrum-css/component-builder": "^7.0.2", - "@spectrum-css/component-builder-simple": "^5.0.5", "@storybook/addon-a11y": "^7.6.17", "@storybook/addon-actions": "^7.6.17", "@storybook/addon-console": "^3.0.0", + "@storybook/addon-designs": "^7.0.9", "@storybook/addon-docs": "^7.6.17", "@storybook/addon-essentials": "^7.6.17", "@storybook/addon-interactions": "^7.6.17", @@ -40,24 +39,19 @@ "@storybook/theming": "^7.6.17", "@storybook/web-components-webpack5": "^7.6.17", "@whitespace/storybook-addon-html": "^5.1.6", - "chromatic": "^11.0.0", - "file-loader": "6.2.0", + "chromatic": "^11.0.1", + "file-loader": "^6.2.0", "lit": "^3.1.2", "lodash-es": "^4.17.21", "postcss": "^8.4.35", - "postcss-class-prefix": "^0.3.0", - "postcss-loader": "^4.0.0", - "postcss-prefix-selector": "^1.16.0", - "postcss-selector-replace": "^1.0.2", - "postcss-warn-cleaner": "^0.1.9", + "postcss-loader": "^8.1.1", "prettier": "^2.8.8", - "raw-loader": "^4.0.2", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-syntax-highlighter": "^15.5.0", - "source-map-loader": "^4.0.1", + "source-map-loader": "^5.0.0", "storybook": "^7.6.17", "style-loader": "3.3.4", - "webpack": "^5.83.1" + "webpack": "^5.90.3" } } diff --git a/.storybook/postcss.config.js b/.storybook/postcss.config.js deleted file mode 100644 index d5c1dcc17bb..00000000000 --- a/.storybook/postcss.config.js +++ /dev/null @@ -1,99 +0,0 @@ -const { basename } = require("path"); -const warnCleaner = require("postcss-warn-cleaner"); - -const simpleBuilder = require("@spectrum-css/component-builder-simple/css/processors.js"); -const legacyBuilder = require("@spectrum-css/component-builder/css/processors.js"); - -/** - * Determines the package name from a file path - * @param {string} filePath - * @returns {string} - */ -function getPackageFromPath(filePath) { - return filePath.match(`(components|@spectrum-css)\/(.*?)\/`)?.[2]; -} - -module.exports = (ctx) => { - let plugins = []; - /** @todo put together a more robust fallback determination */ - const folderName = getPackageFromPath(ctx.file) ?? "tokens"; - const pkgPath = require.resolve(`@spectrum-css/${folderName}/package.json`); - - if (!pkgPath) return plugins; - - /** - * For our token libraries, include a little extra parsing to allow duplicate - * token values to exist in parallel and be toggled using args in storybook. - */ - if (["expressvars", "vars", "tokens"].includes(folderName)) { - const isExpress = folderName === "expressvars"; - const modifier = basename(ctx.file, ".css").startsWith("spectrum") - ? basename(ctx.file, ".css") - .replace("spectrum-", "") - .replace("global", "") - : ""; - - plugins = [ - require("postcss-import")(), - require("postcss-selector-replace")({ - before: [":root"], - after: [ - `${isExpress ? ".spectrum--express" : ""}${ - modifier ? `.spectrum--${modifier}` : "" - }${!isExpress && !modifier ? ".spectrum" : ""}`, - ], - }), - ...(isExpress - ? [ - require("postcss-prefix-selector")({ - prefix: ".spectrum--express", - transform(_prefix, selector, prefixedSelector) { - if (selector.startsWith(".spectrum--express")) return selector; - /* Smoosh the selectors together b/c they co-exist */ - return prefixedSelector.replace(" ", ""); - }, - }), - ] - : []), - ]; - } else { - /** - * If a path has a package.json, we can assume it's a component and - * we want to leverage the correct plugins for it. - */ - const { - peerDependencies = {}, - devDependencies = {}, - dependencies = {} - } = require(pkgPath); - - const deps = [...new Set([ - ...Object.keys(peerDependencies), - ...Object.keys(dependencies), - ...Object.keys(devDependencies), - ])]; - - if ( - deps.includes("@spectrum-css/vars") - ) { - plugins.push(...legacyBuilder.processors); - } else { - if (ctx.file.split("/").includes("themes")) { - plugins.push(...simpleBuilder.getProcessors({ noSelectors: false })); - } else { - plugins.push(...simpleBuilder.getProcessors()); - } - } - } - - /** - * For storybook, add a tool to suppress unnecessary warnings - */ - plugins.push( - warnCleaner({ - ignoreFiles: "**/*.css", - }) - ); - - return { plugins }; -}; diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index f99b1fe2082..7369c8c0d8e 100644 --- a/.storybook/preview-head.html +++ b/.storybook/preview-head.html @@ -5,15 +5,9 @@ } body { - font-family: var(--spectrum-sans-font-family-stack); - background-color: var( - --spectrum-alias-background-color-default, - var(--spectrum-global-color-gray-100) - ); - color: var( - --spectrum-alias-text-color-default, - var(--spectrum-global-color-gray-900) - ); + font-family: var(--spectrum-default-font-family); + background-color: var(--spectrum-background-layer-2-color); + color: var(--spectrum-neutral-content-color-default); -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } diff --git a/.storybook/preview.js b/.storybook/preview.js index bfa19b54205..d521ea1a626 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -18,24 +18,6 @@ setConsoleOptions({ panelExclude: [...panelExclude, /deprecated/, /TypeError/, /postcss-dropunusedvars/], }); -import "@spectrum-css/vars/dist/spectrum-large.css"; -import "@spectrum-css/vars/dist/spectrum-medium.css"; - -import "@spectrum-css/vars/dist/spectrum-dark.css"; -import "@spectrum-css/vars/dist/spectrum-darkest.css"; -import "@spectrum-css/vars/dist/spectrum-light.css"; - -import "@spectrum-css/vars/dist/spectrum-global.css"; - -import "@spectrum-css/expressvars/dist/spectrum-large.css"; -import "@spectrum-css/expressvars/dist/spectrum-medium.css"; - -import "@spectrum-css/expressvars/dist/spectrum-dark.css"; -import "@spectrum-css/expressvars/dist/spectrum-darkest.css"; -import "@spectrum-css/expressvars/dist/spectrum-light.css"; - -import "@spectrum-css/expressvars/dist/spectrum-global.css"; - import "@spectrum-css/tokens"; import "./global.js"; diff --git a/.storybook/project.json b/.storybook/project.json index 38e904d6c94..dc081f360dc 100644 --- a/.storybook/project.json +++ b/.storybook/project.json @@ -7,16 +7,8 @@ "{projectRoot}/*.{js,html}" ] }, - "implicitDependencies": [ - "@spectrum-css/*", - "!@spectrum-css/generator", - "!@spectrum-css/bundle-builder", - "!@spectrum-css/component-builder", - "!@spectrum-css/component-builder-simple" - ], "targets": { "clean": { - "cache": true, "inputs": [ "{projectRoot}/storybook-static", { "externalDependencies": ["rimraf"] } @@ -31,8 +23,13 @@ } }, "build": { - "cache": true, - "dependsOn": ["^build"], + "dependsOn": [ + "^build", + { + "target": "build", + "projects": "ui-icons" + } + ], "inputs": [ "{projectRoot}/assets", "{projectRoot}/decorators", @@ -58,7 +55,13 @@ }, "start": { "cache": true, - "dependsOn": ["^build"], + "dependsOn": [ + "^build", + { + "target": "build", + "projects": "ui-icons" + } + ], "inputs": [ "{projectRoot}/assets", "{projectRoot}/decorators", diff --git a/components/README.md b/components/README.md index 89165cbd128..9268bb54ea9 100644 --- a/components/README.md +++ b/components/README.md @@ -13,8 +13,6 @@ Each component has the following files: - `themes/*.css` - The theme-specific styles for the component. - `stories/*.stories.js` and `stories/template.js` - The storybook assets for rendering components in the Storybook tool and eventually to be used for visual regression testing. -See [documentation generation](/tools/bundle-builder/docs/README.md) documentation for more information on the properties available within the `.yml` files. - ## Editing an existing component 1. Run `gulp dev` in the root of the project to begin developing. diff --git a/components/accordion/gulpfile.js b/components/accordion/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/accordion/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/accordion/package.json b/components/accordion/package.json index cf73e02efad..ec17b8f0b87 100644 --- a/components/accordion/package.json +++ b/components/accordion/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/accordion/project.json b/components/accordion/project.json index 7da63b48561..4efba9dd6f4 100644 --- a/components/accordion/project.json +++ b/components/accordion/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/accordion/stories/accordion.stories.js b/components/accordion/stories/accordion.stories.js index 34daf916468..dc3e9f72ae9 100644 --- a/components/accordion/stories/accordion.stories.js +++ b/components/accordion/stories/accordion.stories.js @@ -1,9 +1,9 @@ import { html } from "lit"; import { styleMap } from "lit/directives/style-map.js"; -import { Template } from "@spectrum-css/accordion/stories/template.js"; import { Template as Link } from "@spectrum-css/link/stories/template.js"; import { Template as Typography } from "@spectrum-css/typography/stories/template.js"; +import { Template } from "./template.js"; /** * The accordion element contains a list of items that can be expanded or collapsed to reveal additional content or information associated with each item. There can be zero expanded items, exactly one expanded item, or more than one item expanded at a time, depending on the configuration. This list of items is defined by child accordion item elements. @@ -142,9 +142,7 @@ export default { handles: ["click .spectrum-Accordion-item"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("accordion") - ? "migrated" - : "legacy", + type: "migrated", }, }, }; diff --git a/components/accordion/stories/template.js b/components/accordion/stories/template.js index d0aea636dc1..47378c348fc 100644 --- a/components/accordion/stories/template.js +++ b/components/accordion/stories/template.js @@ -8,7 +8,7 @@ import { useArgs } from "@storybook/client-api"; import { Template as Icon } from "@spectrum-css/icon/stories/template.js"; -import "@spectrum-css/accordion/index.css"; +import "../index.css"; export const AccordionItem = ({ heading, diff --git a/components/actionbar/gulpfile.js b/components/actionbar/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/actionbar/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/actionbar/package.json b/components/actionbar/package.json index 5da677da1f7..87a95a0daab 100644 --- a/components/actionbar/package.json +++ b/components/actionbar/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actiongroup": ">=4", "@spectrum-css/closebutton": ">=4", @@ -21,9 +21,6 @@ "@spectrum-css/popover": ">=6", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/actionbar/project.json b/components/actionbar/project.json index 27f47b86c3d..b3471ebfe40 100644 --- a/components/actionbar/project.json +++ b/components/actionbar/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/actionbar/stories/actionbar.stories.js b/components/actionbar/stories/actionbar.stories.js index 37c3d976929..345c579c438 100644 --- a/components/actionbar/stories/actionbar.stories.js +++ b/components/actionbar/stories/actionbar.stories.js @@ -1,9 +1,9 @@ // Import the component markup template import { Template } from "./template"; -import { default as Popover } from "@spectrum-css/popover/stories/popover.stories.js"; -import { default as CloseButton } from "@spectrum-css/closebutton/stories/closebutton.stories.js"; import { default as ActionButton } from "@spectrum-css/actionbutton/stories/actionbutton.stories.js"; +import { default as CloseButton } from "@spectrum-css/closebutton/stories/closebutton.stories.js"; +import { default as Popover } from "@spectrum-css/popover/stories/popover.stories.js"; export default { title: "Components/Action bar", @@ -73,9 +73,7 @@ export default { ], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("actionbar") - ? "migrated" - : undefined, + type: "migrated", }, // Getting the Figma link: https://help.figma.com/hc/en-us/articles/360045003494-Storybook-and-Figma design: { diff --git a/components/actionbutton/gulpfile.js b/components/actionbutton/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/actionbutton/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/actionbutton/index.css b/components/actionbutton/index.css index 13cfee9db8e..61ca44b8cab 100644 --- a/components/actionbutton/index.css +++ b/components/actionbutton/index.css @@ -11,6 +11,7 @@ governing permissions and limitations under the License. */ @import "@spectrum-css/commons/basebutton.css"; +@import "./themes/express.css"; .spectrum-ActionButton { --spectrum-actionbutton-animation-duration: var(--spectrum-animation-duration-100); diff --git a/components/actionbutton/package.json b/components/actionbutton/package.json index 96d6d149a4b..589b4c19bc1 100644 --- a/components/actionbutton/package.json +++ b/components/actionbutton/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" @@ -24,8 +24,7 @@ } }, "devDependencies": { - "@spectrum-css/commons": "^9.1.2", - "@spectrum-css/component-builder-simple": "^5.0.5" + "@spectrum-css/commons": "^9.1.2" }, "publishConfig": { "access": "public" diff --git a/components/actionbutton/project.json b/components/actionbutton/project.json index 3b01105e7f7..04207f0ca37 100644 --- a/components/actionbutton/project.json +++ b/components/actionbutton/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/actionbutton/stories/actionbutton-quiet.stories.js b/components/actionbutton/stories/actionbutton-quiet.stories.js index 15a55671983..dffccc1e6db 100644 --- a/components/actionbutton/stories/actionbutton-quiet.stories.js +++ b/components/actionbutton/stories/actionbutton-quiet.stories.js @@ -1,4 +1,4 @@ -import { argTypes, ActionButtons } from "./index"; +import { ActionButtons, argTypes } from "./index"; export default { title: "Components/Action button/Quiet", @@ -19,9 +19,7 @@ export default { handles: ["click .spectrum-ActionButton:not([disabled])"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("actionbutton") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/actionbutton/stories/actionbutton-staticblack.stories.js b/components/actionbutton/stories/actionbutton-staticblack.stories.js index d047ed2bacc..b68024d14a7 100644 --- a/components/actionbutton/stories/actionbutton-staticblack.stories.js +++ b/components/actionbutton/stories/actionbutton-staticblack.stories.js @@ -20,9 +20,7 @@ export default { handles: ["click .spectrum-ActionButton:not([disabled])"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("actionbutton") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/actionbutton/stories/actionbutton-staticwhite.stories.js b/components/actionbutton/stories/actionbutton-staticwhite.stories.js index 0a05cb747e6..ad0fc4193a6 100644 --- a/components/actionbutton/stories/actionbutton-staticwhite.stories.js +++ b/components/actionbutton/stories/actionbutton-staticwhite.stories.js @@ -20,9 +20,7 @@ export default { handles: ["click .spectrum-ActionButton:not([disabled])"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("actionbutton") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/actionbutton/stories/actionbutton.stories.js b/components/actionbutton/stories/actionbutton.stories.js index 65c48394201..88fcbe7d64f 100644 --- a/components/actionbutton/stories/actionbutton.stories.js +++ b/components/actionbutton/stories/actionbutton.stories.js @@ -1,4 +1,4 @@ -import { argTypes, ActionButtons } from "./index"; +import { ActionButtons, argTypes } from "./index"; export default { title: "Components/Action button", @@ -19,9 +19,7 @@ export default { handles: ["click .spectrum-ActionButton:not([disabled])"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("actionbutton") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/actionbutton/themes/express.css b/components/actionbutton/themes/express.css index 9950fa47ec4..f56b4e5081b 100644 --- a/components/actionbutton/themes/express.css +++ b/components/actionbutton/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-ActionButton { --spectrum-actionbutton-background-color-default: var(--spectrum-gray-200); diff --git a/components/actiongroup/gulpfile.js b/components/actiongroup/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/actiongroup/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/actiongroup/index.css b/components/actiongroup/index.css index 41578f78807..7f78b2945f1 100644 --- a/components/actiongroup/index.css +++ b/components/actiongroup/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-ActionGroup { --spectrum-actiongroup-button-spacing-reset: 0; --spectrum-actiongroup-border-radius-reset: 0; @@ -36,7 +38,7 @@ governing permissions and limitations under the License. .spectrum-ActionGroup-item { flex-shrink: 0; - + /* Focus indicator should appear above hovered and selected borders */ &:focus-visible { z-index: 3; diff --git a/components/actiongroup/package.json b/components/actiongroup/package.json index a092ab76ee3..2a7831523f0 100644 --- a/components/actiongroup/package.json +++ b/components/actiongroup/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/tokens": ">=13" @@ -23,9 +23,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/actiongroup/project.json b/components/actiongroup/project.json index 31edbdba73f..c0f0f8ed06a 100644 --- a/components/actiongroup/project.json +++ b/components/actiongroup/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/actiongroup/stories/actiongroup.stories.js b/components/actiongroup/stories/actiongroup.stories.js index d967fb38bf2..056eb3d71f9 100644 --- a/components/actiongroup/stories/actiongroup.stories.js +++ b/components/actiongroup/stories/actiongroup.stories.js @@ -65,9 +65,7 @@ export default { handles: [...ActionButton.parameters.actions.handles], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("actiongroup") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/actiongroup/themes/express.css b/components/actiongroup/themes/express.css index c62e104129d..73630a7c0b2 100644 --- a/components/actiongroup/themes/express.css +++ b/components/actiongroup/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-ActionGroup { --spectrum-actiongroup-gap-size-compact: var(--spectrum-spacing-50); diff --git a/components/actionmenu/gulpfile.js b/components/actionmenu/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/actionmenu/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/actionmenu/package.json b/components/actionmenu/package.json index 7113765bb9a..d62624d9b1b 100644 --- a/components/actionmenu/package.json +++ b/components/actionmenu/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/icon": ">=4", @@ -21,9 +21,6 @@ "@spectrum-css/popover": ">=6", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/actionmenu/stories/actionmenu.stories.js b/components/actionmenu/stories/actionmenu.stories.js index 1ef2b13cf23..2b84b47c24b 100644 --- a/components/actionmenu/stories/actionmenu.stories.js +++ b/components/actionmenu/stories/actionmenu.stories.js @@ -1,13 +1,13 @@ -import { within, userEvent } from '@storybook/testing-library'; +import { userEvent, within } from '@storybook/testing-library'; import { html } from "lit"; // Import the component markup template import { Template } from "./template"; import { default as ActionButton } from "@spectrum-css/actionbutton/stories/actionbutton.stories.js"; +import { default as IconStories } from "@spectrum-css/icon/stories/icon.stories.js"; import { default as Menu } from "@spectrum-css/menu/stories/menu.stories.js"; import { default as Popover } from "@spectrum-css/popover/stories/popover.stories.js"; -import { default as IconStories } from "@spectrum-css/icon/stories/icon.stories.js"; export default { title: "Components/Action menu", @@ -50,9 +50,7 @@ export default { ], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("actionmenu") - ? "migrated" - : undefined, + type: "migrated", }, chromatic: { delay: 2000 }, }, diff --git a/components/alertbanner/gulpfile.js b/components/alertbanner/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/alertbanner/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/alertbanner/index.css b/components/alertbanner/index.css index 533789d0fe9..9695f881b16 100644 --- a/components/alertbanner/index.css +++ b/components/alertbanner/index.css @@ -9,6 +9,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-AlertBanner { --spectrum-alert-banner-min-height: var(--spectrum-alert-banner-minimum-height); --spectrum-alert-banner-size: var(--spectrum-alert-banner-width); diff --git a/components/alertbanner/package.json b/components/alertbanner/package.json index bbb6e2f8fc5..8a39aba796b 100644 --- a/components/alertbanner/package.json +++ b/components/alertbanner/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/button": ">=11", "@spectrum-css/closebutton": ">=4", @@ -26,9 +26,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/alertbanner/project.json b/components/alertbanner/project.json index ff998163e66..83f8337e32b 100644 --- a/components/alertbanner/project.json +++ b/components/alertbanner/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/alertbanner/stories/alertbanner.stories.js b/components/alertbanner/stories/alertbanner.stories.js index 73662bf9620..e6d69e4f574 100644 --- a/components/alertbanner/stories/alertbanner.stories.js +++ b/components/alertbanner/stories/alertbanner.stories.js @@ -58,9 +58,7 @@ export default { handles: ["click .spectrum-AlertBanner button"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("alertbanner") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/alertbanner/themes/express.css b/components/alertbanner/themes/express.css index 5604adbb706..6fd182f97c0 100644 --- a/components/alertbanner/themes/express.css +++ b/components/alertbanner/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-AlertBanner { --spectrum-alert-banner-netural-background: var(--spectrum-neutral-background-color-default); diff --git a/components/alertdialog/gulpfile.js b/components/alertdialog/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/alertdialog/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/alertdialog/package.json b/components/alertdialog/package.json index d4104552e38..562d6a6b27f 100644 --- a/components/alertdialog/package.json +++ b/components/alertdialog/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/buttongroup": ">=6", "@spectrum-css/divider": ">=2", @@ -30,9 +30,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/alertdialog/project.json b/components/alertdialog/project.json index 3776106f08a..a5ff25f9db8 100644 --- a/components/alertdialog/project.json +++ b/components/alertdialog/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/alertdialog/stories/alertdialog.stories.js b/components/alertdialog/stories/alertdialog.stories.js index af26b301dea..fe3bccf7345 100644 --- a/components/alertdialog/stories/alertdialog.stories.js +++ b/components/alertdialog/stories/alertdialog.stories.js @@ -44,9 +44,7 @@ export default { handles: ["click .spectrum-AlertDialog button"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("alertdialog") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/asset/gulpfile.js b/components/asset/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/asset/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/asset/package.json b/components/asset/package.json index 02923369cd3..8ccf0fd141c 100644 --- a/components/asset/package.json +++ b/components/asset/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder": "^7.0.2" - }, "publishConfig": { "access": "public" } diff --git a/components/asset/project.json b/components/asset/project.json index c77cad9a3b0..e9a00a3e73a 100644 --- a/components/asset/project.json +++ b/components/asset/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/asset/stories/asset.stories.js b/components/asset/stories/asset.stories.js index 708d01b614a..2a350ef63ec 100644 --- a/components/asset/stories/asset.stories.js +++ b/components/asset/stories/asset.stories.js @@ -43,9 +43,7 @@ export default { }, parameters: { status: { - type: process.env.MIGRATED_PACKAGES.includes("asset") - ? "migrated" - : "legacy", + type: "migrated", }, }, }; diff --git a/components/assetcard/gulpfile.js b/components/assetcard/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/assetcard/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/assetcard/index.css b/components/assetcard/index.css index b828db08d2e..4c2dcaac44b 100644 --- a/components/assetcard/index.css +++ b/components/assetcard/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + /* outer container, unstyled */ .spectrum-AssetCard { /* todo: this isn't quite the size from the XD file as 232px is not a size token, so we use 224px */ diff --git a/components/assetcard/package.json b/components/assetcard/package.json index 96eb6c41b8b..2886e8e11a8 100644 --- a/components/assetcard/package.json +++ b/components/assetcard/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/checkbox": ">=7", "@spectrum-css/tokens": ">=13" @@ -23,9 +23,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/assetcard/project.json b/components/assetcard/project.json index dc43161e097..334d330ec80 100644 --- a/components/assetcard/project.json +++ b/components/assetcard/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/assetcard/stories/assetcard.stories.js b/components/assetcard/stories/assetcard.stories.js index 81e57830723..ac145b8f392 100644 --- a/components/assetcard/stories/assetcard.stories.js +++ b/components/assetcard/stories/assetcard.stories.js @@ -100,9 +100,7 @@ export default { handles: [...Checkbox.parameters.actions.handles], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("assetcard") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/assetcard/themes/express.css b/components/assetcard/themes/express.css index 1835ed3b7b4..18743c5032f 100644 --- a/components/assetcard/themes/express.css +++ b/components/assetcard/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-AssetCard { --spectrum-assetcard-overlay-background-color: rgba(109, 115, 246, 0.2) diff --git a/components/assetlist/gulpfile.js b/components/assetlist/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/assetlist/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/assetlist/package.json b/components/assetlist/package.json index 87fb31cbbc3..827fcf9e129 100644 --- a/components/assetlist/package.json +++ b/components/assetlist/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/checkbox": ">=8", "@spectrum-css/icon": ">=4", @@ -27,9 +27,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/assetlist/project.json b/components/assetlist/project.json index 429768327ec..fc20a14540a 100644 --- a/components/assetlist/project.json +++ b/components/assetlist/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/assetlist/stories/assetlist.stories.js b/components/assetlist/stories/assetlist.stories.js index a9fb4f26049..8abbb2b09ad 100644 --- a/components/assetlist/stories/assetlist.stories.js +++ b/components/assetlist/stories/assetlist.stories.js @@ -19,9 +19,7 @@ export default { handles: [...Checkbox.parameters.actions.handles], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("assetlist") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/avatar/gulpfile.js b/components/avatar/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/avatar/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/avatar/package.json b/components/avatar/package.json index b62ad22f8d7..450a6f78a68 100644 --- a/components/avatar/package.json +++ b/components/avatar/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/avatar/project.json b/components/avatar/project.json index 26bc6fb06d6..7c738583ac2 100644 --- a/components/avatar/project.json +++ b/components/avatar/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/avatar/stories/avatar.stories.js b/components/avatar/stories/avatar.stories.js index 36460aa9242..f05c02784a6 100644 --- a/components/avatar/stories/avatar.stories.js +++ b/components/avatar/stories/avatar.stories.js @@ -65,9 +65,7 @@ export default { }, parameters: { status: { - type: process.env.MIGRATED_PACKAGES.includes("avatar") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/badge/gulpfile.js b/components/badge/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/badge/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/badge/package.json b/components/badge/package.json index a4a10e91d3f..52904522302 100644 --- a/components/badge/package.json +++ b/components/badge/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" @@ -23,9 +23,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/badge/project.json b/components/badge/project.json index dc164c2567f..3740e1c9a26 100644 --- a/components/badge/project.json +++ b/components/badge/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/badge/stories/badge.stories.js b/components/badge/stories/badge.stories.js index e7ec929bc31..8bdb9bc82bb 100644 --- a/components/badge/stories/badge.stories.js +++ b/components/badge/stories/badge.stories.js @@ -73,9 +73,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("badge") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/breadcrumb/gulpfile.js b/components/breadcrumb/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/breadcrumb/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/breadcrumb/package.json b/components/breadcrumb/package.json index aae86a4a8f9..f731fc33958 100644 --- a/components/breadcrumb/package.json +++ b/components/breadcrumb/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/icon": ">=4", @@ -27,9 +27,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/breadcrumb/project.json b/components/breadcrumb/project.json index 8c68edc7e20..25879534aca 100644 --- a/components/breadcrumb/project.json +++ b/components/breadcrumb/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/breadcrumb/stories/breadcrumb.stories.js b/components/breadcrumb/stories/breadcrumb.stories.js index 61e8ee3761e..e2af41cbb37 100644 --- a/components/breadcrumb/stories/breadcrumb.stories.js +++ b/components/breadcrumb/stories/breadcrumb.stories.js @@ -37,9 +37,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("breadcrumb") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/button/gulpfile.js b/components/button/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/button/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/button/index.css b/components/button/index.css index fc4214c7687..e6fc0d85beb 100644 --- a/components/button/index.css +++ b/components/button/index.css @@ -10,6 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; @import "@spectrum-css/commons/basebutton.css"; /* default for all buttons */ diff --git a/components/button/package.json b/components/button/package.json index 4837efd8182..c6934607ef8 100644 --- a/components/button/package.json +++ b/components/button/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=6", "@spectrum-css/progresscircle": ">=2", @@ -28,8 +28,7 @@ } }, "devDependencies": { - "@spectrum-css/commons": "^9.1.2", - "@spectrum-css/component-builder-simple": "^5.0.5" + "@spectrum-css/commons": "^9.1.2" }, "publishConfig": { "access": "public" diff --git a/components/button/project.json b/components/button/project.json index 86675f81153..50526990af3 100644 --- a/components/button/project.json +++ b/components/button/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/button/stories/button.stories.js b/components/button/stories/button.stories.js index 300fe03b630..2ea4df5ff1a 100644 --- a/components/button/stories/button.stories.js +++ b/components/button/stories/button.stories.js @@ -130,9 +130,7 @@ export default { handles: ["click .spectrum-Button"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("button") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/button/themes/express.css b/components/button/themes/express.css index 14d9212723d..495d6cf1fcc 100644 --- a/components/button/themes/express.css +++ b/components/button/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Button { --spectrum-button-background-color-default: var(--spectrum-gray-200); diff --git a/components/buttongroup/gulpfile.js b/components/buttongroup/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/buttongroup/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/buttongroup/package.json b/components/buttongroup/package.json index 53efe262a43..e3c7d312b1c 100644 --- a/components/buttongroup/package.json +++ b/components/buttongroup/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/button": ">=11", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/buttongroup/project.json b/components/buttongroup/project.json index 3270c2875b1..292907f3067 100644 --- a/components/buttongroup/project.json +++ b/components/buttongroup/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/buttongroup/stories/buttongroup.stories.js b/components/buttongroup/stories/buttongroup.stories.js index cea80948a7f..f5a55fe207c 100644 --- a/components/buttongroup/stories/buttongroup.stories.js +++ b/components/buttongroup/stories/buttongroup.stories.js @@ -38,9 +38,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("buttongroup") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/calendar/gulpfile.js b/components/calendar/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/calendar/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/calendar/package.json b/components/calendar/package.json index 7febd85403b..118d39edd3a 100644 --- a/components/calendar/package.json +++ b/components/calendar/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/calendar/project.json b/components/calendar/project.json index f2f06162d83..edcea257062 100644 --- a/components/calendar/project.json +++ b/components/calendar/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/calendar/stories/calendar.stories.js b/components/calendar/stories/calendar.stories.js index ecceff612ad..52fc7dc2eb6 100644 --- a/components/calendar/stories/calendar.stories.js +++ b/components/calendar/stories/calendar.stories.js @@ -97,9 +97,7 @@ export default { handles: [...(ActionButtonStories.parameters.actions.handles ?? [])], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("calendar") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/card/gulpfile.js b/components/card/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/card/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/card/package.json b/components/card/package.json index 2c6b97540c5..71774429e13 100644 --- a/components/card/package.json +++ b/components/card/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/asset": ">=3", @@ -42,9 +42,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/card/project.json b/components/card/project.json index 663a36cc91d..e9c0a827569 100644 --- a/components/card/project.json +++ b/components/card/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/card/stories/card.stories.js b/components/card/stories/card.stories.js index a4a4b6758d5..de3ee20c8e7 100644 --- a/components/card/stories/card.stories.js +++ b/components/card/stories/card.stories.js @@ -115,9 +115,7 @@ export default { ], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("card") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/checkbox/gulpfile.js b/components/checkbox/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/checkbox/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/checkbox/index.css b/components/checkbox/index.css index e3aa4bc80f2..759fc11e8cf 100644 --- a/components/checkbox/index.css +++ b/components/checkbox/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + /* checkbox/index.css * * .spectrum-Checkbox-box::before is the Checkbox "box" @@ -571,7 +573,7 @@ governing permissions and limitations under the License. outline-style: auto; outline-offset: var(--highcontrast-checkbox-focus-indicator-gap, var(--mod-checkbox-focus-indicator-gap, var(--spectrum-checkbox-focus-indicator-gap))); /* stylelint-disable-next-line declaration-block-no-redundant-longhand-properties */ - outline-width: var(--mod-focus-indicator-thickness, var(--spectrum-focus-indicator-thickness)); + outline-width: var(--mod-focus-indicator-thickness, var(--spectrum-focus-indicator-thickness)); &::after { box-shadow: diff --git a/components/checkbox/package.json b/components/checkbox/package.json index 009ac54179a..81fa66f1cbc 100644 --- a/components/checkbox/package.json +++ b/components/checkbox/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/checkbox/project.json b/components/checkbox/project.json index 94ca9513dd1..b6cd2ec451c 100644 --- a/components/checkbox/project.json +++ b/components/checkbox/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/checkbox/stories/checkbox.stories.js b/components/checkbox/stories/checkbox.stories.js index f540227f111..29a6400fd78 100644 --- a/components/checkbox/stories/checkbox.stories.js +++ b/components/checkbox/stories/checkbox.stories.js @@ -98,9 +98,7 @@ export default { handles: ['click input[type="checkbox"]'], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("checkbox") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/checkbox/themes/express.css b/components/checkbox/themes/express.css index 56ba74040bd..02ceeaf5a85 100644 --- a/components/checkbox/themes/express.css +++ b/components/checkbox/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Checkbox { --spectrum-checkbox-control-color-default: var(--spectrum-gray-800); diff --git a/components/clearbutton/gulpfile.js b/components/clearbutton/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/clearbutton/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/clearbutton/index.css b/components/clearbutton/index.css index ebab996700e..c85c8b9c9ac 100644 --- a/components/clearbutton/index.css +++ b/components/clearbutton/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-ClearButton { --spectrum-clear-button-height: var(--spectrum-component-height-100); --spectrum-clear-button-width: var(--spectrum-component-height-100); @@ -51,10 +53,10 @@ governing permissions and limitations under the License. --mod-clear-button-background-color: var(--spectrum-clear-button-background-color-over-background, transparent); --mod-clear-button-background-color-hover: var(--spectrum-clear-button-background-color-hover-over-background, var(--spectrum-transparent-white-300)); --mod-clear-button-background-color-down: var(--spectrum-clear-button-background-color-hover-over-background, var(--spectrum-transparent-white-400)); - --mod-clear-button-background-color-key-focus: var(--spectrum-clear-button-background-color-hover-over-background, var(--spectrum-transparent-white-300)); + --mod-clear-button-background-color-key-focus: var(--spectrum-clear-button-background-color-hover-over-background, var(--spectrum-transparent-white-300)); } - &:disabled, + &:disabled, &.is-disabled { --mod-clear-button-icon-color: var(--mod-clear-button-icon-color-disabled, var(--spectrum-disabled-content-color)); --mod-clear-button-icon-color-hover: var(--spectrum-clear-button-icon-color-hover-disabled, var(--spectrum-disabled-content-color)); @@ -109,7 +111,7 @@ governing permissions and limitations under the License. } .spectrum-ClearButton-fill { - background-color: var(--mod-clear-button-background-color, var(--spectrum-clear-button-background-color)); + background-color: var(--mod-clear-button-background-color, var(--spectrum-clear-button-background-color)); inline-size: 100%; block-size: 100%; diff --git a/components/clearbutton/package.json b/components/clearbutton/package.json index 463b06e945b..5ad41f95b47 100644 --- a/components/clearbutton/package.json +++ b/components/clearbutton/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/clearbutton/project.json b/components/clearbutton/project.json index 9da5b728a06..b19c5421ec1 100644 --- a/components/clearbutton/project.json +++ b/components/clearbutton/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/clearbutton/stories/clearbutton.stories.js b/components/clearbutton/stories/clearbutton.stories.js index d932311a43b..a9c60481105 100644 --- a/components/clearbutton/stories/clearbutton.stories.js +++ b/components/clearbutton/stories/clearbutton.stories.js @@ -38,9 +38,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("clearbutton") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/clearbutton/themes/express.css b/components/clearbutton/themes/express.css index 0ef428de427..b7e935e3ec7 100644 --- a/components/clearbutton/themes/express.css +++ b/components/clearbutton/themes/express.css @@ -9,6 +9,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-ClearButton { --spectrum-clear-button-background-color: var(--spectrum-gray-200); diff --git a/components/closebutton/gulpfile.js b/components/closebutton/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/closebutton/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/closebutton/index.css b/components/closebutton/index.css index dbc0a115129..74409297c65 100644 --- a/components/closebutton/index.css +++ b/components/closebutton/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + /* closebutton/index.css * * .spectrum-Closebutton::after is the Focus ring diff --git a/components/closebutton/package.json b/components/closebutton/package.json index 58e736023f9..483efd44e47 100644 --- a/components/closebutton/package.json +++ b/components/closebutton/package.json @@ -13,14 +13,13 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, "devDependencies": { - "@spectrum-css/commons": "^9.1.2", - "@spectrum-css/component-builder-simple": "^5.0.5" + "@spectrum-css/commons": "^9.1.2" }, "publishConfig": { "access": "public" diff --git a/components/closebutton/project.json b/components/closebutton/project.json index 835a4527881..a979b578d09 100644 --- a/components/closebutton/project.json +++ b/components/closebutton/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/closebutton/stories/closebutton.stories.js b/components/closebutton/stories/closebutton.stories.js index 70e176fb84b..2354d519670 100644 --- a/components/closebutton/stories/closebutton.stories.js +++ b/components/closebutton/stories/closebutton.stories.js @@ -46,9 +46,7 @@ export default { handles: ["click .spectrum-CloseButton"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("closebutton") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/closebutton/themes/express.css b/components/closebutton/themes/express.css index 8b4b57162bc..482625bd921 100644 --- a/components/closebutton/themes/express.css +++ b/components/closebutton/themes/express.css @@ -9,6 +9,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-CloseButton { --spectrum-closebutton-background-color-default: transparent; diff --git a/components/coachindicator/gulpfile.js b/components/coachindicator/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/coachindicator/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/coachindicator/package.json b/components/coachindicator/package.json index 9556b241247..170b07793b3 100644 --- a/components/coachindicator/package.json +++ b/components/coachindicator/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/coachindicator/project.json b/components/coachindicator/project.json index dff92ef4229..8b5cb3bb3a4 100644 --- a/components/coachindicator/project.json +++ b/components/coachindicator/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/coachindicator/stories/coachindicator.stories.js b/components/coachindicator/stories/coachindicator.stories.js index a87ee82917b..c24cf12aad9 100644 --- a/components/coachindicator/stories/coachindicator.stories.js +++ b/components/coachindicator/stories/coachindicator.stories.js @@ -41,9 +41,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("coachindicator") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/coachmark/gulpfile.js b/components/coachmark/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/coachmark/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/coachmark/package.json b/components/coachmark/package.json index 92f9adbb242..59fae6860d1 100644 --- a/components/coachmark/package.json +++ b/components/coachmark/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/actionmenu": ">=5", @@ -28,9 +28,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/coachmark/project.json b/components/coachmark/project.json index 78fbc889762..935c9ce18ca 100644 --- a/components/coachmark/project.json +++ b/components/coachmark/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/coachmark/stories/coachmark.stories.js b/components/coachmark/stories/coachmark.stories.js index 69815b6cb0e..1c064af80f0 100644 --- a/components/coachmark/stories/coachmark.stories.js +++ b/components/coachmark/stories/coachmark.stories.js @@ -52,9 +52,7 @@ export default { ], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("coachmark") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/colorarea/gulpfile.js b/components/colorarea/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/colorarea/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/colorarea/package.json b/components/colorarea/package.json index a92e27b3d1d..e5487b961c8 100644 --- a/components/colorarea/package.json +++ b/components/colorarea/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/colorhandle": ">=7", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/colorarea/project.json b/components/colorarea/project.json index b3e40f51fb5..f65d3e75ac4 100644 --- a/components/colorarea/project.json +++ b/components/colorarea/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/colorarea/stories/colorarea.stories.js b/components/colorarea/stories/colorarea.stories.js index 18e7b2c5067..d3ca434e16c 100644 --- a/components/colorarea/stories/colorarea.stories.js +++ b/components/colorarea/stories/colorarea.stories.js @@ -40,9 +40,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("colorarea") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/colorhandle/gulpfile.js b/components/colorhandle/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/colorhandle/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/colorhandle/package.json b/components/colorhandle/package.json index 247c50a2701..390f87673f5 100644 --- a/components/colorhandle/package.json +++ b/components/colorhandle/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/colorloupe": ">=4", "@spectrum-css/opacitycheckerboard": ">=1", @@ -24,9 +24,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/colorhandle/project.json b/components/colorhandle/project.json index 535b98aa67f..ba3b769a417 100644 --- a/components/colorhandle/project.json +++ b/components/colorhandle/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/colorhandle/stories/colorhandle.stories.js b/components/colorhandle/stories/colorhandle.stories.js index 5a5eb535c1d..e8a3ea21bf8 100644 --- a/components/colorhandle/stories/colorhandle.stories.js +++ b/components/colorhandle/stories/colorhandle.stories.js @@ -37,9 +37,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("colorhandle") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/colorloupe/gulpfile.js b/components/colorloupe/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/colorloupe/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/colorloupe/package.json b/components/colorloupe/package.json index d17283aba2d..9085be8637a 100644 --- a/components/colorloupe/package.json +++ b/components/colorloupe/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/colorloupe/project.json b/components/colorloupe/project.json index d467828c6f4..e3d9f20ab22 100644 --- a/components/colorloupe/project.json +++ b/components/colorloupe/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/colorloupe/stories/colorloupe.stories.js b/components/colorloupe/stories/colorloupe.stories.js index 321126d19af..5f4062a94cc 100644 --- a/components/colorloupe/stories/colorloupe.stories.js +++ b/components/colorloupe/stories/colorloupe.stories.js @@ -29,9 +29,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("colorloupe") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/colorslider/gulpfile.js b/components/colorslider/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/colorslider/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/colorslider/package.json b/components/colorslider/package.json index 585a09dcf13..280c458bb65 100644 --- a/components/colorslider/package.json +++ b/components/colorslider/package.json @@ -13,15 +13,12 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/colorhandle": ">=7", "@spectrum-css/opacitycheckerboard": ">=1", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/colorslider/project.json b/components/colorslider/project.json index 2d91a554e83..f67f14802db 100644 --- a/components/colorslider/project.json +++ b/components/colorslider/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/colorslider/stories/colorslider.stories.js b/components/colorslider/stories/colorslider.stories.js index 9cbedb95f4a..feabde74393 100644 --- a/components/colorslider/stories/colorslider.stories.js +++ b/components/colorslider/stories/colorslider.stories.js @@ -57,9 +57,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("colorslider") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/colorwheel/gulpfile.js b/components/colorwheel/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/colorwheel/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/colorwheel/package.json b/components/colorwheel/package.json index 48e28192255..4e9dfd2807a 100644 --- a/components/colorwheel/package.json +++ b/components/colorwheel/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/colorarea": ">=4", "@spectrum-css/colorhandle": ">=7", @@ -28,9 +28,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/colorwheel/project.json b/components/colorwheel/project.json index 7da09775c6f..c863ec83bb9 100644 --- a/components/colorwheel/project.json +++ b/components/colorwheel/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/colorwheel/stories/colorwheel.stories.js b/components/colorwheel/stories/colorwheel.stories.js index 2d4e6cb7904..ae5475a799c 100644 --- a/components/colorwheel/stories/colorwheel.stories.js +++ b/components/colorwheel/stories/colorwheel.stories.js @@ -37,9 +37,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("colorwheel") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/combobox/gulpfile.js b/components/combobox/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/combobox/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/combobox/index.css b/components/combobox/index.css index ac0d549921c..22cad837bc8 100644 --- a/components/combobox/index.css +++ b/components/combobox/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-Combobox { --spectrum-combobox-inline-size: var(--spectrum-field-width); --spectrum-combobox-block-size: var(--spectrum-component-height-100); @@ -329,7 +331,7 @@ governing permissions and limitations under the License. (var(--mod-combobox-border-width, var(--spectrum-combobox-border-width)) * 2) ); backface-visibility: hidden; - line-height: var(--mod-combobox-line-height, var(--spectrum-combobox-line-height)); + line-height: var(--mod-combobox-line-height, var(--spectrum-combobox-line-height)); font-size: var(--mod-combobox-font-size, var(--spectrum-combobox-font-size)); font-style: var(--mod-combobox-font-style, var(--spectrum-combobox-font-style)); diff --git a/components/combobox/package.json b/components/combobox/package.json index 640f4b52206..0142af81225 100644 --- a/components/combobox/package.json +++ b/components/combobox/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/menu": ">=5", "@spectrum-css/pickerbutton": ">=4", @@ -27,9 +27,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/combobox/project.json b/components/combobox/project.json index 6510acc69e4..1acccb9f7ec 100644 --- a/components/combobox/project.json +++ b/components/combobox/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/combobox/stories/combobox.stories.js b/components/combobox/stories/combobox.stories.js index 176222200b5..aad2d96a61d 100644 --- a/components/combobox/stories/combobox.stories.js +++ b/components/combobox/stories/combobox.stories.js @@ -160,9 +160,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("combobox") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/combobox/themes/express.css b/components/combobox/themes/express.css index a61b40cb167..698df728eb0 100644 --- a/components/combobox/themes/express.css +++ b/components/combobox/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Combobox { --spectrum-combobox-border-color-default: var(--spectrum-gray-400); diff --git a/components/commons/project.json b/components/commons/project.json index b93d59752c0..161c24aa84b 100644 --- a/components/commons/project.json +++ b/components/commons/project.json @@ -13,10 +13,9 @@ "executor": "nx:noop" }, "lint": {}, - "validate": {}, - "test": { "executor": "nx:noop" - } + }, + "validate": {} } } diff --git a/components/contextualhelp/gulpfile.js b/components/contextualhelp/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/contextualhelp/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/contextualhelp/package.json b/components/contextualhelp/package.json index 9afe8a4348a..6d497a1b562 100644 --- a/components/contextualhelp/package.json +++ b/components/contextualhelp/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/link": ">=4", @@ -25,9 +25,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/contextualhelp/project.json b/components/contextualhelp/project.json index 81bab416731..521bf0e3905 100644 --- a/components/contextualhelp/project.json +++ b/components/contextualhelp/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/contextualhelp/stories/contextualhelp.stories.js b/components/contextualhelp/stories/contextualhelp.stories.js index e5c88083e2c..5618ccc49c4 100644 --- a/components/contextualhelp/stories/contextualhelp.stories.js +++ b/components/contextualhelp/stories/contextualhelp.stories.js @@ -86,9 +86,7 @@ export default { handles: [...(ActionButtonStories?.parameters?.actions?.handles ?? [])], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("contextualhelp") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/datepicker/gulpfile.js b/components/datepicker/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/datepicker/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/datepicker/index.css b/components/datepicker/index.css index 0071420ac44..b0b53ee308e 100644 --- a/components/datepicker/index.css +++ b/components/datepicker/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-DatePicker { --spectrum-datepicker-border-radius: var(--spectrum-corner-radius-100); --spectrum-datepicker-border-radius-quiet: 0; @@ -302,4 +304,4 @@ governing permissions and limitations under the License. --highcontrast-datepicker-pickerbutton-border-color: Highlight; --highcontrast-datepicker-invalid-quiet-color: Highlight; } -} \ No newline at end of file +} diff --git a/components/datepicker/package.json b/components/datepicker/package.json index e0c1cd8e1c8..f50c9656ebc 100644 --- a/components/datepicker/package.json +++ b/components/datepicker/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/calendar": ">=4", "@spectrum-css/pickerbutton": ">=4", @@ -21,9 +21,6 @@ "@spectrum-css/textfield": ">=6", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/datepicker/project.json b/components/datepicker/project.json index 62a5d8afb69..a7b26e9e1bf 100644 --- a/components/datepicker/project.json +++ b/components/datepicker/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/datepicker/stories/datepicker.stories.js b/components/datepicker/stories/datepicker.stories.js index 7a11a7866d2..4384c9f7c84 100644 --- a/components/datepicker/stories/datepicker.stories.js +++ b/components/datepicker/stories/datepicker.stories.js @@ -110,9 +110,7 @@ export default { handles: [...(CalendarStories.parameters.actions.handles ?? [])], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("datepicker") - ? "migrated" - : undefined, + type: "migrated", }, }, }; @@ -143,4 +141,4 @@ Range.args = { content: [{}], isRange: true, isOpen: false, -}; \ No newline at end of file +}; diff --git a/components/datepicker/themes/express.css b/components/datepicker/themes/express.css index 76ac09f0cf1..b292b5b103a 100644 --- a/components/datepicker/themes/express.css +++ b/components/datepicker/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-DatePicker { --spectrum-datepicker-initial-height: var(--spectrum-component-height-75); diff --git a/components/dial/gulpfile.js b/components/dial/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/dial/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/dial/package.json b/components/dial/package.json index 5bfeb6100ef..10b1fddd73b 100644 --- a/components/dial/package.json +++ b/components/dial/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/dial/project.json b/components/dial/project.json index bad8765535b..6df36fb529b 100644 --- a/components/dial/project.json +++ b/components/dial/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/dial/stories/dial.stories.js b/components/dial/stories/dial.stories.js index c05244394a4..39ed0fbaecd 100644 --- a/components/dial/stories/dial.stories.js +++ b/components/dial/stories/dial.stories.js @@ -64,9 +64,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("dial") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/dialog/gulpfile.js b/components/dialog/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/dialog/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/dialog/package.json b/components/dialog/package.json index c95c96c2f4d..ce068945e0b 100644 --- a/components/dialog/package.json +++ b/components/dialog/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/closebutton": ">=4", "@spectrum-css/divider": ">=2", @@ -32,9 +32,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/dialog/project.json b/components/dialog/project.json index 3f66284bb7c..0ead42ba155 100644 --- a/components/dialog/project.json +++ b/components/dialog/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/dialog/stories/dialog.stories.js b/components/dialog/stories/dialog.stories.js index 0a6207acd57..9bc21bda085 100644 --- a/components/dialog/stories/dialog.stories.js +++ b/components/dialog/stories/dialog.stories.js @@ -61,9 +61,7 @@ export default { }, }, status: { - type: process.env.MIGRATED_PACKAGES.includes("dialog") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/divider/gulpfile.js b/components/divider/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/divider/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/divider/package.json b/components/divider/package.json index b5e9888e71a..058ed4fee03 100644 --- a/components/divider/package.json +++ b/components/divider/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/divider/project.json b/components/divider/project.json index 0ece6f8f5fb..7465c1787dd 100644 --- a/components/divider/project.json +++ b/components/divider/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/divider/stories/divider.stories.js b/components/divider/stories/divider.stories.js index c2e977c8500..3574c046a36 100644 --- a/components/divider/stories/divider.stories.js +++ b/components/divider/stories/divider.stories.js @@ -45,9 +45,7 @@ export default { }, parameters: { status: { - type: process.env.MIGRATED_PACKAGES.includes("divider") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/dropindicator/gulpfile.js b/components/dropindicator/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/dropindicator/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/dropindicator/package.json b/components/dropindicator/package.json index 92eab445780..dd83cddfef0 100644 --- a/components/dropindicator/package.json +++ b/components/dropindicator/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/dropindicator/project.json b/components/dropindicator/project.json index 69ea1834c40..889cb9cf5d7 100644 --- a/components/dropindicator/project.json +++ b/components/dropindicator/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/dropindicator/stories/dropindicator.stories.js b/components/dropindicator/stories/dropindicator.stories.js index 7a6aa9419ee..136ccec28e9 100644 --- a/components/dropindicator/stories/dropindicator.stories.js +++ b/components/dropindicator/stories/dropindicator.stories.js @@ -39,9 +39,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("dropindicator") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/dropzone/gulpfile.js b/components/dropzone/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/dropzone/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/dropzone/package.json b/components/dropzone/package.json index ceb83a2b21e..f456c34cf6f 100644 --- a/components/dropzone/package.json +++ b/components/dropzone/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/illustratedmessage": ">=6", @@ -28,9 +28,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/dropzone/project.json b/components/dropzone/project.json index c8ad085444b..aa634bf6516 100644 --- a/components/dropzone/project.json +++ b/components/dropzone/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/dropzone/stories/dropzone.stories.js b/components/dropzone/stories/dropzone.stories.js index 186cc946b86..c57e2725a96 100644 --- a/components/dropzone/stories/dropzone.stories.js +++ b/components/dropzone/stories/dropzone.stories.js @@ -38,9 +38,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("dropzone") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/fieldgroup/gulpfile.js b/components/fieldgroup/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/fieldgroup/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/fieldgroup/package.json b/components/fieldgroup/package.json index 35d639553f8..342b252768c 100644 --- a/components/fieldgroup/package.json +++ b/components/fieldgroup/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/checkbox": ">=8", "@spectrum-css/helptext": ">=4", @@ -31,9 +31,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/fieldgroup/project.json b/components/fieldgroup/project.json index 69eab0d7b35..a900e1d8a0d 100644 --- a/components/fieldgroup/project.json +++ b/components/fieldgroup/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/fieldgroup/stories/fieldgroup.stories.js b/components/fieldgroup/stories/fieldgroup.stories.js index e68a5aab349..5baf47af6f3 100644 --- a/components/fieldgroup/stories/fieldgroup.stories.js +++ b/components/fieldgroup/stories/fieldgroup.stories.js @@ -48,9 +48,7 @@ export default { handles: [...Radio.parameters.actions.handles], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("fieldgroup") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/fieldlabel/gulpfile.js b/components/fieldlabel/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/fieldlabel/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/fieldlabel/package.json b/components/fieldlabel/package.json index f51e65d0510..ac7b9c8293d 100644 --- a/components/fieldlabel/package.json +++ b/components/fieldlabel/package.json @@ -18,9 +18,6 @@ "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/fieldlabel/project.json b/components/fieldlabel/project.json index 259f8c937a4..eaf5b1ac86c 100644 --- a/components/fieldlabel/project.json +++ b/components/fieldlabel/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/fieldlabel/stories/fieldlabel.stories.js b/components/fieldlabel/stories/fieldlabel.stories.js index be21243b3e0..59d60bbeb22 100644 --- a/components/fieldlabel/stories/fieldlabel.stories.js +++ b/components/fieldlabel/stories/fieldlabel.stories.js @@ -67,9 +67,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("fieldlabel") - ? "migrated" - : undefined, + type: "migrated", }, }, }; @@ -100,4 +98,4 @@ WrappingAndRequired.args = { alignment: "left", isRequired: true, style: { width: "200px" }, -}; \ No newline at end of file +}; diff --git a/components/fieldlabel/stories/form.stories.js b/components/fieldlabel/stories/form.stories.js index 6d5e80382e2..f72f7372b73 100644 --- a/components/fieldlabel/stories/form.stories.js +++ b/components/fieldlabel/stories/form.stories.js @@ -24,9 +24,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("fieldlabel") - ? "migrated" - : undefined, + type: "migrated", }, }, }; @@ -39,4 +37,4 @@ Standard.args = { export const LabelsAbove = Template.bind({}); LabelsAbove.args = { labelsAbove: true, -}; \ No newline at end of file +}; diff --git a/components/floatingactionbutton/gulpfile.js b/components/floatingactionbutton/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/floatingactionbutton/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/floatingactionbutton/package.json b/components/floatingactionbutton/package.json index a53370988c2..6fe4e1b8748 100644 --- a/components/floatingactionbutton/package.json +++ b/components/floatingactionbutton/package.json @@ -14,13 +14,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/floatingactionbutton/project.json b/components/floatingactionbutton/project.json index 40c1824daa4..dd2f3d7ef44 100644 --- a/components/floatingactionbutton/project.json +++ b/components/floatingactionbutton/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/floatingactionbutton/stories/floatingactionbutton.stories.js b/components/floatingactionbutton/stories/floatingactionbutton.stories.js index a6ef593d5ed..2c2517de799 100644 --- a/components/floatingactionbutton/stories/floatingactionbutton.stories.js +++ b/components/floatingactionbutton/stories/floatingactionbutton.stories.js @@ -38,9 +38,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("floatingactionbutton") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/helptext/gulpfile.js b/components/helptext/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/helptext/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/helptext/package.json b/components/helptext/package.json index bd692ca26a9..fb5427812c3 100644 --- a/components/helptext/package.json +++ b/components/helptext/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/helptext/project.json b/components/helptext/project.json index 86b97d1812d..280df27d6a7 100644 --- a/components/helptext/project.json +++ b/components/helptext/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/helptext/stories/helptext.stories.js b/components/helptext/stories/helptext.stories.js index f294ab284c1..d34ade0c8cc 100644 --- a/components/helptext/stories/helptext.stories.js +++ b/components/helptext/stories/helptext.stories.js @@ -82,9 +82,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("helptext") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/icon/gulpfile.js b/components/icon/gulpfile.js deleted file mode 100644 index 003183efc5a..00000000000 --- a/components/icon/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); \ No newline at end of file diff --git a/components/icon/package.json b/components/icon/package.json index 002c753fb2e..0110e4a652d 100644 --- a/components/icon/package.json +++ b/components/icon/package.json @@ -17,9 +17,6 @@ "peerDependencies": { "@spectrum-css/tokens": ">=13.1" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/icon/project.json b/components/icon/project.json index 387ee167f2a..7142b0993f5 100644 --- a/components/icon/project.json +++ b/components/icon/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/icon/stories/icon.stories.js b/components/icon/stories/icon.stories.js index 907502068e7..54b6f9189f5 100644 --- a/components/icon/stories/icon.stories.js +++ b/components/icon/stories/icon.stories.js @@ -95,9 +95,7 @@ export default { }, parameters: { status: { - type: process.env.MIGRATED_PACKAGES.includes("icon") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/icon/stories/template.js b/components/icon/stories/template.js index 3cb9648617b..b191c5412e2 100644 --- a/components/icon/stories/template.js +++ b/components/icon/stories/template.js @@ -77,10 +77,10 @@ export const Template = ({ /** * Fallback UI Icon sizing number. - * + * * If the icon name includes its scale, we want to leave that scale. This is preferred, * as UI icons do not use workflow icon sizing. - * + * * If the UI icon name does not include scale, reformat it to match the provided sizing. * E.g. with a size of "s", the icon name "ChevronRight" would become "ChevronRight75". */ @@ -170,10 +170,10 @@ export const Template = ({ try { import( - /* webpackPrefetch: true */ `!!raw-loader!@adobe/spectrum-css-workflow-icons/dist/spectrum-icons.svg` + /* webpackPrefetch: true */ `@adobe/spectrum-css-workflow-icons/dist/spectrum-icons.svg?raw` ); import( - /* webpackPrefetch: true */ `!!raw-loader!@spectrum-css/ui-icons/dist/spectrum-css-icons.svg` + /* webpackPrefetch: true */ `@spectrum-css/ui-icons/dist/spectrum-css-icons.svg?raw` ); } catch (e) { console.warn(e); diff --git a/components/icon/stories/utilities.js b/components/icon/stories/utilities.js index 98e711c2704..22323ebc453 100644 --- a/components/icon/stories/utilities.js +++ b/components/icon/stories/utilities.js @@ -48,8 +48,8 @@ export const uiIconsWithDirections = [ /** * Retrieve SVG markup from contents of loaded SVG file, pulling from * either the set of Workflow icons or UI icons. - * - * @param {object} + * + * @param {object} * @returns {string} SVG HTML markup */ export const fetchIconSVG = ({ @@ -65,18 +65,18 @@ export const fetchIconSVG = ({ // Check "Workflow icons" first. if (setName === "workflow") { try { - icon = require(`!!raw-loader!@adobe/spectrum-css-workflow-icons/dist/${ + icon = require(`@adobe/spectrum-css-workflow-icons/dist/${ scale !== "medium" ? `24` : `18` - }/${iconName}.svg`); + }/${iconName}.svg?raw`); if (icon) return (icon.default ?? icon).trim(); } catch (e) {} } // Check "UI icons" for icon set if not yet found. try { - icon = require(`!!raw-loader!@spectrum-css/ui-icons/dist/${ + icon = require(`@spectrum-css/ui-icons/dist/${ scale ? scale : "medium" - }/${iconName}.svg`); + }/${iconName}.svg?raw`); if (icon) return (icon.default ?? icon).trim(); } catch (e) {} diff --git a/components/illustratedmessage/gulpfile.js b/components/illustratedmessage/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/illustratedmessage/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/illustratedmessage/package.json b/components/illustratedmessage/package.json index d25e912528a..99848b3dcdd 100644 --- a/components/illustratedmessage/package.json +++ b/components/illustratedmessage/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13", "@spectrum-css/typography": ">=5" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/illustratedmessage/project.json b/components/illustratedmessage/project.json index 19bc3922b53..1d0cad33afa 100644 --- a/components/illustratedmessage/project.json +++ b/components/illustratedmessage/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/illustratedmessage/stories/illustratedmessage.stories.js b/components/illustratedmessage/stories/illustratedmessage.stories.js index bb90ee11df1..fd7ed93220b 100644 --- a/components/illustratedmessage/stories/illustratedmessage.stories.js +++ b/components/illustratedmessage/stories/illustratedmessage.stories.js @@ -44,9 +44,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("illustratedmessage") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/infieldbutton/gulpfile.js b/components/infieldbutton/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/infieldbutton/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/infieldbutton/index.css b/components/infieldbutton/index.css index 156bca542c7..0af0407db26 100644 --- a/components/infieldbutton/index.css +++ b/components/infieldbutton/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-InfieldButton { /* Medium size is the default */ --spectrum-infield-button-height: var(--spectrum-component-height-100); diff --git a/components/infieldbutton/package.json b/components/infieldbutton/package.json index eef91fffff1..32638a14f55 100644 --- a/components/infieldbutton/package.json +++ b/components/infieldbutton/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" @@ -23,9 +23,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/infieldbutton/project.json b/components/infieldbutton/project.json index 633f0385562..b5dc4e79c40 100644 --- a/components/infieldbutton/project.json +++ b/components/infieldbutton/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/infieldbutton/themes/express.css b/components/infieldbutton/themes/express.css index ed17ec812b7..d08bbd8cc6c 100644 --- a/components/infieldbutton/themes/express.css +++ b/components/infieldbutton/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-InfieldButton { --spectrum-infield-button-border-width: 0; diff --git a/components/inlinealert/gulpfile.js b/components/inlinealert/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/inlinealert/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/inlinealert/package.json b/components/inlinealert/package.json index 5c774991e6d..8f0e819462c 100644 --- a/components/inlinealert/package.json +++ b/components/inlinealert/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/button": ">=11", "@spectrum-css/icon": ">=4", @@ -24,9 +24,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/inlinealert/project.json b/components/inlinealert/project.json index 0786a1efeba..64bdac57eea 100644 --- a/components/inlinealert/project.json +++ b/components/inlinealert/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/inlinealert/stories/inlinealert.stories.js b/components/inlinealert/stories/inlinealert.stories.js index cc1fcb6c6da..b0b478caeca 100644 --- a/components/inlinealert/stories/inlinealert.stories.js +++ b/components/inlinealert/stories/inlinealert.stories.js @@ -59,9 +59,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("inlinealert") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/link/gulpfile.js b/components/link/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/link/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/link/package.json b/components/link/package.json index 77499b835d4..dc95a3887e6 100644 --- a/components/link/package.json +++ b/components/link/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/link/project.json b/components/link/project.json index a1a40494a90..c677a289dbb 100644 --- a/components/link/project.json +++ b/components/link/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/link/stories/link.stories.js b/components/link/stories/link.stories.js index 6aab9eb6a4e..d29a536ac8f 100644 --- a/components/link/stories/link.stories.js +++ b/components/link/stories/link.stories.js @@ -66,9 +66,7 @@ export default { handles: ["click .spectrum-Link"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("link") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/logicbutton/gulpfile.js b/components/logicbutton/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/logicbutton/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/logicbutton/package.json b/components/logicbutton/package.json index 4f8a79d1860..c39d012ae3f 100644 --- a/components/logicbutton/package.json +++ b/components/logicbutton/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/logicbutton/project.json b/components/logicbutton/project.json index e2e8f1db600..9b363849c62 100644 --- a/components/logicbutton/project.json +++ b/components/logicbutton/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/logicbutton/stories/logicbutton.stories.js b/components/logicbutton/stories/logicbutton.stories.js index 20fe57c9622..5c7106b38c0 100644 --- a/components/logicbutton/stories/logicbutton.stories.js +++ b/components/logicbutton/stories/logicbutton.stories.js @@ -37,9 +37,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("logicbutton") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/menu/gulpfile.js b/components/menu/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/menu/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/menu/package.json b/components/menu/package.json index 8078649eea4..ed695d14675 100644 --- a/components/menu/package.json +++ b/components/menu/package.json @@ -36,9 +36,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/menu/project.json b/components/menu/project.json index a008cfaad5c..e57b296291b 100644 --- a/components/menu/project.json +++ b/components/menu/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/menu/stories/menu.stories.js b/components/menu/stories/menu.stories.js index 5855a125a20..5529746b595 100644 --- a/components/menu/stories/menu.stories.js +++ b/components/menu/stories/menu.stories.js @@ -60,9 +60,7 @@ export default { handles: ["click .spectrum-Menu-item"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("menu") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/miller/gulpfile.js b/components/miller/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/miller/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/miller/package.json b/components/miller/package.json index ae35be2410c..0e3c9264967 100644 --- a/components/miller/package.json +++ b/components/miller/package.json @@ -13,16 +13,13 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/assetlist": ">=5", "@spectrum-css/checkbox": ">=8", "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/miller/project.json b/components/miller/project.json index 5f1b32f79e7..a4e8ebbba94 100644 --- a/components/miller/project.json +++ b/components/miller/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/miller/stories/miller.stories.js b/components/miller/stories/miller.stories.js index 913aa274ea6..a59b3ab6094 100644 --- a/components/miller/stories/miller.stories.js +++ b/components/miller/stories/miller.stories.js @@ -17,9 +17,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("miller") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/modal/gulpfile.js b/components/modal/gulpfile.js deleted file mode 100644 index 003183efc5a..00000000000 --- a/components/modal/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); \ No newline at end of file diff --git a/components/modal/package.json b/components/modal/package.json index 63279c101ea..bc5a911a262 100644 --- a/components/modal/package.json +++ b/components/modal/package.json @@ -13,13 +13,12 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, "devDependencies": { - "@spectrum-css/commons": "^9.1.2", - "@spectrum-css/component-builder-simple": "^5.0.5" + "@spectrum-css/commons": "^9.1.2" }, "publishConfig": { "access": "public" diff --git a/components/modal/project.json b/components/modal/project.json index 80f12cea34d..4d86de17206 100644 --- a/components/modal/project.json +++ b/components/modal/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/modal/stories/modal.stories.js b/components/modal/stories/modal.stories.js index 75fabc662e4..0e03911dd1e 100644 --- a/components/modal/stories/modal.stories.js +++ b/components/modal/stories/modal.stories.js @@ -40,9 +40,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("modal") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/opacitycheckerboard/gulpfile.js b/components/opacitycheckerboard/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/opacitycheckerboard/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/opacitycheckerboard/package.json b/components/opacitycheckerboard/package.json index 9b6419edba3..f59a5a61cd2 100644 --- a/components/opacitycheckerboard/package.json +++ b/components/opacitycheckerboard/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/opacitycheckerboard/project.json b/components/opacitycheckerboard/project.json index bf51088874e..539b63a832f 100644 --- a/components/opacitycheckerboard/project.json +++ b/components/opacitycheckerboard/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/opacitycheckerboard/stories/opacitycheckerboard.stories.js b/components/opacitycheckerboard/stories/opacitycheckerboard.stories.js index 86252d1ec62..afb8ded5291 100644 --- a/components/opacitycheckerboard/stories/opacitycheckerboard.stories.js +++ b/components/opacitycheckerboard/stories/opacitycheckerboard.stories.js @@ -29,9 +29,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("opacitycheckerboard") - ? "migrated" - : undefined, + type: "migrated", }, }, decorators: [ diff --git a/components/page/gulpfile.js b/components/page/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/page/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/page/package.json b/components/page/package.json index ce3fc24e20a..f46d65f5cfe 100644 --- a/components/page/package.json +++ b/components/page/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/page/project.json b/components/page/project.json index e04e727077a..44ed0247a9e 100644 --- a/components/page/project.json +++ b/components/page/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/pagination/gulpfile.js b/components/pagination/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/pagination/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/pagination/package.json b/components/pagination/package.json index 54cb5f06d39..06b336b1613 100644 --- a/components/pagination/package.json +++ b/components/pagination/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/button": ">=11", @@ -22,9 +22,6 @@ "@spectrum-css/textfield": ">=6", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/pagination/project.json b/components/pagination/project.json index ad0f89c1a92..b90c0dc9261 100644 --- a/components/pagination/project.json +++ b/components/pagination/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/pagination/stories/pagination.stories.js b/components/pagination/stories/pagination.stories.js index 6abc78d8ec0..85fde362086 100644 --- a/components/pagination/stories/pagination.stories.js +++ b/components/pagination/stories/pagination.stories.js @@ -34,9 +34,7 @@ export default { handles: [...ActionButton.parameters.actions.handles], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("pagination") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/picker/gulpfile.js b/components/picker/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/picker/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/picker/index.css b/components/picker/index.css index 8ed083ea0f2..8d9ba48d327 100644 --- a/components/picker/index.css +++ b/components/picker/index.css @@ -10,6 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; @import "@spectrum-css/commons/basebutton.css"; .spectrum-Picker { diff --git a/components/picker/package.json b/components/picker/package.json index b9f70fcdcfc..0b4b6f6ec28 100644 --- a/components/picker/package.json +++ b/components/picker/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/helptext": ">=4", "@spectrum-css/icon": ">=4", @@ -30,9 +30,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/picker/project.json b/components/picker/project.json index 2fc6d0828dc..433cb214a14 100644 --- a/components/picker/project.json +++ b/components/picker/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/picker/stories/picker.stories.js b/components/picker/stories/picker.stories.js index 46fcf39d88b..caedc32e24f 100644 --- a/components/picker/stories/picker.stories.js +++ b/components/picker/stories/picker.stories.js @@ -129,9 +129,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("picker") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/picker/themes/express.css b/components/picker/themes/express.css index a92203cc2d2..4b305b4846f 100644 --- a/components/picker/themes/express.css +++ b/components/picker/themes/express.css @@ -9,6 +9,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Picker { --spectrum-picker-background-color-default: var(--spectrum-gray-200); diff --git a/components/pickerbutton/gulpfile.js b/components/pickerbutton/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/pickerbutton/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/pickerbutton/index.css b/components/pickerbutton/index.css index ba7482d1408..5fc34abfdf0 100644 --- a/components/pickerbutton/index.css +++ b/components/pickerbutton/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-PickerButton { --spectrum-picker-button-height: var(--spectrum-component-height-100); --spectrum-picker-button-width: var(--spectrum-component-height-100); diff --git a/components/pickerbutton/package.json b/components/pickerbutton/package.json index f4bd20c762b..576ea35d962 100644 --- a/components/pickerbutton/package.json +++ b/components/pickerbutton/package.json @@ -13,16 +13,13 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/menu": ">=5", "@spectrum-css/popover": ">=5 <=6", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/pickerbutton/project.json b/components/pickerbutton/project.json index 92a43b577c9..6fb8cdaa075 100644 --- a/components/pickerbutton/project.json +++ b/components/pickerbutton/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/pickerbutton/stories/pickerbutton.stories.js b/components/pickerbutton/stories/pickerbutton.stories.js index df8f4a99324..9086cea43bc 100644 --- a/components/pickerbutton/stories/pickerbutton.stories.js +++ b/components/pickerbutton/stories/pickerbutton.stories.js @@ -118,9 +118,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("pickerbutton") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/pickerbutton/themes/express.css b/components/pickerbutton/themes/express.css index 42db9ddedef..76d7a370cfa 100644 --- a/components/pickerbutton/themes/express.css +++ b/components/pickerbutton/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-PickerButton { --spectrum-picker-button-background-color: var(--spectrum-gray-200); diff --git a/components/popover/gulpfile.js b/components/popover/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/popover/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/popover/index.css b/components/popover/index.css index e97e7e8fd15..adabb786875 100644 --- a/components/popover/index.css +++ b/components/popover/index.css @@ -10,6 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; @import "@spectrum-css/commons/overlay.css"; .spectrum-Popover { diff --git a/components/popover/package.json b/components/popover/package.json index d6c19c108af..d4f94a0aa14 100644 --- a/components/popover/package.json +++ b/components/popover/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/alertdialog": ">=1", "@spectrum-css/dialog": ">=9", @@ -30,8 +30,7 @@ } }, "devDependencies": { - "@spectrum-css/commons": "^9.1.2", - "@spectrum-css/component-builder-simple": "^5.0.5" + "@spectrum-css/commons": "^9.1.2" }, "publishConfig": { "access": "public" diff --git a/components/popover/project.json b/components/popover/project.json index 8de848fe4b7..dcf31d1b784 100644 --- a/components/popover/project.json +++ b/components/popover/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/popover/stories/popover.stories.js b/components/popover/stories/popover.stories.js index e8160854dc4..4a1a7ff47b0 100644 --- a/components/popover/stories/popover.stories.js +++ b/components/popover/stories/popover.stories.js @@ -73,9 +73,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("popover") - ? "migrated" - : undefined, + type: "migrated", }, chromatic: { delay: 2000 }, }, diff --git a/components/popover/themes/express.css b/components/popover/themes/express.css index 47da2d7557c..d32007014d2 100644 --- a/components/popover/themes/express.css +++ b/components/popover/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Popover { --spectrum-popover-border-width: 0; diff --git a/components/progressbar/gulpfile.js b/components/progressbar/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/progressbar/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/progressbar/package.json b/components/progressbar/package.json index b9aa5ef0e26..6a85c2dfeee 100644 --- a/components/progressbar/package.json +++ b/components/progressbar/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/fieldlabel": ">=7", "@spectrum-css/tokens": ">=13" @@ -23,9 +23,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/progressbar/project.json b/components/progressbar/project.json index c8a4f3e70d3..b385c5d55a8 100644 --- a/components/progressbar/project.json +++ b/components/progressbar/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/progressbar/stories/meter.stories.js b/components/progressbar/stories/meter.stories.js index 4798d4be84b..80e15e16587 100644 --- a/components/progressbar/stories/meter.stories.js +++ b/components/progressbar/stories/meter.stories.js @@ -57,9 +57,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("progressbar") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/progressbar/stories/progressbar.stories.js b/components/progressbar/stories/progressbar.stories.js index 2bca2d723d7..74cd389ae33 100644 --- a/components/progressbar/stories/progressbar.stories.js +++ b/components/progressbar/stories/progressbar.stories.js @@ -62,9 +62,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("progressbar") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/progresscircle/gulpfile.js b/components/progresscircle/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/progresscircle/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/progresscircle/package.json b/components/progresscircle/package.json index 84161ebe13d..650bdf0f5e7 100644 --- a/components/progresscircle/package.json +++ b/components/progresscircle/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/progresscircle/project.json b/components/progresscircle/project.json index a6be94cfa31..9130e3efce4 100644 --- a/components/progresscircle/project.json +++ b/components/progresscircle/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/progresscircle/stories/progresscircle.stories.js b/components/progresscircle/stories/progresscircle.stories.js index 1b4bef3efb4..82a80b03dbf 100644 --- a/components/progresscircle/stories/progresscircle.stories.js +++ b/components/progresscircle/stories/progresscircle.stories.js @@ -48,9 +48,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("progresscircle") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/radio/gulpfile.js b/components/radio/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/radio/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/radio/index.css b/components/radio/index.css index 4eb8a11695b..b68b3bfde77 100644 --- a/components/radio/index.css +++ b/components/radio/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + /* radio/index.css * * ::before is to style the input circle diff --git a/components/radio/package.json b/components/radio/package.json index 65e86d5c73f..3850ee287b0 100644 --- a/components/radio/package.json +++ b/components/radio/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/radio/project.json b/components/radio/project.json index f17fe3de0d0..aa92c9ee702 100644 --- a/components/radio/project.json +++ b/components/radio/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/radio/stories/radio.stories.js b/components/radio/stories/radio.stories.js index b5360ea76aa..11b4ea319ea 100644 --- a/components/radio/stories/radio.stories.js +++ b/components/radio/stories/radio.stories.js @@ -87,9 +87,7 @@ export default { }, status: { - type: process.env.MIGRATED_PACKAGES.includes("radio") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/radio/themes/express.css b/components/radio/themes/express.css index a4cbd592be2..513b6a4f3d8 100644 --- a/components/radio/themes/express.css +++ b/components/radio/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Radio { /* selection indicator */ diff --git a/components/rating/gulpfile.js b/components/rating/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/rating/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/rating/index.css b/components/rating/index.css index 0734c9aad21..e3827eff6e4 100644 --- a/components/rating/index.css +++ b/components/rating/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-Rating { /* Icon */ --spectrum-rating-icon-height: var(--spectrum-workflow-icon-size-100); @@ -142,7 +144,7 @@ governing permissions and limitations under the License. content: ''; block-size: var(--mod-rating-indicator-height, var(--spectrum-rating-indicator-height)); inline-size: var(--spectrum-rating-indicator-width); - + /* position the indicator relative to the element's total bottom size (including bottom padding) */ inset-block-end: calc((var(--mod-rating-focus-indicator-gap, var(--spectrum-rating-focus-indicator-gap)) * 2) - 1px); position: absolute; @@ -188,7 +190,7 @@ governing permissions and limitations under the License. .spectrum-Rating-icon { color: var(--highcontrast-rating-icon-color-default, var(--mod-rating-icon-color-default, var(--spectrum-rating-icon-color-default))); - + &.is-selected { color: var(--highcontrast-rating-emphasized-icon-color-default, var(--mod-rating-emphasized-icon-color-default, var(--spectrum-rating-emphasized-icon-color-default))); } diff --git a/components/rating/package.json b/components/rating/package.json index 12a455160ce..f4cb14cb405 100644 --- a/components/rating/package.json +++ b/components/rating/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/rating/project.json b/components/rating/project.json index a9e0ab46b9f..a11aafe2cea 100644 --- a/components/rating/project.json +++ b/components/rating/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/rating/stories/rating.stories.js b/components/rating/stories/rating.stories.js index f7c3644c892..6539d422882 100644 --- a/components/rating/stories/rating.stories.js +++ b/components/rating/stories/rating.stories.js @@ -75,9 +75,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("rating") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/rating/themes/express.css b/components/rating/themes/express.css index 4d3a747430d..bb636626d0c 100644 --- a/components/rating/themes/express.css +++ b/components/rating/themes/express.css @@ -9,6 +9,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Rating { --spectrum-rating-icon-color-default: var(--spectrum-neutral-content-color-default); diff --git a/components/search/gulpfile.js b/components/search/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/search/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/search/index.css b/components/search/index.css index df541c9c757..fcc63db8858 100644 --- a/components/search/index.css +++ b/components/search/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-Search { /* Size / Spacing */ --spectrum-search-inline-size: var(--spectrum-field-width); diff --git a/components/search/package.json b/components/search/package.json index 644790691e5..0872aac8feb 100644 --- a/components/search/package.json +++ b/components/search/package.json @@ -13,16 +13,13 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/clearbutton": ">=5", "@spectrum-css/icon": ">=4", "@spectrum-css/textfield": ">=6", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/search/project.json b/components/search/project.json index 3650f352a07..51467f5a891 100644 --- a/components/search/project.json +++ b/components/search/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/search/stories/search.stories.js b/components/search/stories/search.stories.js index d17ecb49f8f..5c2e23730dd 100644 --- a/components/search/stories/search.stories.js +++ b/components/search/stories/search.stories.js @@ -49,9 +49,7 @@ export default { ], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("search") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/search/themes/express.css b/components/search/themes/express.css index 041488af875..84cff57a925 100644 --- a/components/search/themes/express.css +++ b/components/search/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Search { --spectrum-search-border-radius: calc( diff --git a/components/sidenav/gulpfile.js b/components/sidenav/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/sidenav/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/sidenav/package.json b/components/sidenav/package.json index 04a6c254d20..6968e7816c8 100644 --- a/components/sidenav/package.json +++ b/components/sidenav/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" @@ -23,9 +23,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/sidenav/project.json b/components/sidenav/project.json index 252fac0e2d5..3ab187192a7 100644 --- a/components/sidenav/project.json +++ b/components/sidenav/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/site/gulpfile.js b/components/site/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/site/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/site/package.json b/components/site/package.json index 1c084684e1c..ad8bfe21a91 100644 --- a/components/site/package.json +++ b/components/site/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/site/project.json b/components/site/project.json index f638d8ecc60..e94ba1089cc 100644 --- a/components/site/project.json +++ b/components/site/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/slider/gulpfile.js b/components/slider/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/slider/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/slider/index.css b/components/slider/index.css index 479cc67b92d..fd2ccb25784 100644 --- a/components/slider/index.css +++ b/components/slider/index.css @@ -10,6 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; .spectrum-Slider { /* default sizing, matches t-shirt size M */ diff --git a/components/slider/package.json b/components/slider/package.json index 816b1e86aa6..74b31e01fcd 100644 --- a/components/slider/package.json +++ b/components/slider/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/stepper": ">=5", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/slider/project.json b/components/slider/project.json index b203e2eb3d3..d2e82ba87e9 100644 --- a/components/slider/project.json +++ b/components/slider/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/slider/stories/slider.stories.js b/components/slider/stories/slider.stories.js index 243dd8d651b..57f6100b509 100644 --- a/components/slider/stories/slider.stories.js +++ b/components/slider/stories/slider.stories.js @@ -130,9 +130,7 @@ export default { ], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("slider") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/slider/themes/express.css b/components/slider/themes/express.css index 1d88288dfcf..1df5f6ef8ee 100644 --- a/components/slider/themes/express.css +++ b/components/slider/themes/express.css @@ -9,6 +9,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Slider { --spectrum-slider-track-color: var(--spectrum-gray-200); diff --git a/components/splitview/gulpfile.js b/components/splitview/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/splitview/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/splitview/package.json b/components/splitview/package.json index b7ed68227b5..05b4a925f14 100644 --- a/components/splitview/package.json +++ b/components/splitview/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/splitview/project.json b/components/splitview/project.json index 15bc20a3fa6..1ca90fa7966 100644 --- a/components/splitview/project.json +++ b/components/splitview/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/splitview/stories/splitview.stories.js b/components/splitview/stories/splitview.stories.js index 5153638e5b0..11b2a239cee 100644 --- a/components/splitview/stories/splitview.stories.js +++ b/components/splitview/stories/splitview.stories.js @@ -76,9 +76,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("splitview") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/statuslight/gulpfile.js b/components/statuslight/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/statuslight/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/statuslight/package.json b/components/statuslight/package.json index 5e5d6ff018b..96f792e8b9b 100644 --- a/components/statuslight/package.json +++ b/components/statuslight/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/statuslight/project.json b/components/statuslight/project.json index f2a798a06cf..31600db1cf2 100644 --- a/components/statuslight/project.json +++ b/components/statuslight/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/statuslight/stories/statuslight.stories.js b/components/statuslight/stories/statuslight.stories.js index 79df8e1e3de..20984be239d 100644 --- a/components/statuslight/stories/statuslight.stories.js +++ b/components/statuslight/stories/statuslight.stories.js @@ -68,9 +68,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("statuslight") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/steplist/gulpfile.js b/components/steplist/gulpfile.js deleted file mode 100644 index 003183efc5a..00000000000 --- a/components/steplist/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); \ No newline at end of file diff --git a/components/steplist/package.json b/components/steplist/package.json index 035d7c5c1b5..01c50af63e4 100644 --- a/components/steplist/package.json +++ b/components/steplist/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13", @@ -24,9 +24,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/steplist/project.json b/components/steplist/project.json index a0f169da68f..b92a79b37fa 100644 --- a/components/steplist/project.json +++ b/components/steplist/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/steplist/stories/steplist.stories.js b/components/steplist/stories/steplist.stories.js index 0aae19fc95c..3db83987362 100644 --- a/components/steplist/stories/steplist.stories.js +++ b/components/steplist/stories/steplist.stories.js @@ -55,9 +55,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("steplist") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/stepper/gulpfile.js b/components/stepper/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/stepper/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/stepper/index.css b/components/stepper/index.css index 9b2ab7adf16..1f3df985605 100644 --- a/components/stepper/index.css +++ b/components/stepper/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-Stepper { /* Set defaults to medium size */ --spectrum-stepper-height: var(--spectrum-component-height-100); diff --git a/components/stepper/package.json b/components/stepper/package.json index 261b762cb23..55995c3a546 100644 --- a/components/stepper/package.json +++ b/components/stepper/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/actionbutton": ">=5", "@spectrum-css/icon": ">=4", @@ -26,9 +26,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/stepper/project.json b/components/stepper/project.json index 00867ba4bd1..f61e2278d99 100644 --- a/components/stepper/project.json +++ b/components/stepper/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/stepper/stories/stepper.stories.js b/components/stepper/stories/stepper.stories.js index 68f7d16acad..6bbd2d8d5bd 100644 --- a/components/stepper/stories/stepper.stories.js +++ b/components/stepper/stories/stepper.stories.js @@ -87,9 +87,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("stepper") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/stepper/themes/express.css b/components/stepper/themes/express.css index f5b575d2439..835ebeb952b 100644 --- a/components/stepper/themes/express.css +++ b/components/stepper/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Stepper { --spectrum-stepper-border-width: var(--spectrum-border-width-200); diff --git a/components/swatch/gulpfile.js b/components/swatch/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/swatch/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/swatch/package.json b/components/swatch/package.json index 70a255a974f..c2b1fff2979 100644 --- a/components/swatch/package.json +++ b/components/swatch/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/opacitycheckerboard": ">=1", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/swatch/project.json b/components/swatch/project.json index 8922fa471bf..782fc29fe40 100644 --- a/components/swatch/project.json +++ b/components/swatch/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/swatch/stories/swatch.stories.js b/components/swatch/stories/swatch.stories.js index ab3a7c8da62..9501f5fb10d 100644 --- a/components/swatch/stories/swatch.stories.js +++ b/components/swatch/stories/swatch.stories.js @@ -67,9 +67,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("swatch") - ? "migrated" - : "legacy", + type: "migrated", }, }, }; diff --git a/components/swatchgroup/gulpfile.js b/components/swatchgroup/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/swatchgroup/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/swatchgroup/package.json b/components/swatchgroup/package.json index ea16dbd246a..4f44370bae9 100644 --- a/components/swatchgroup/package.json +++ b/components/swatchgroup/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/swatch": ">=5", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/swatchgroup/project.json b/components/swatchgroup/project.json index 81d1d610215..14d28a6c19a 100644 --- a/components/swatchgroup/project.json +++ b/components/swatchgroup/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/swatchgroup/stories/swatchgroup.stories.js b/components/swatchgroup/stories/swatchgroup.stories.js index f0b382967bb..219e8cdd61b 100644 --- a/components/swatchgroup/stories/swatchgroup.stories.js +++ b/components/swatchgroup/stories/swatchgroup.stories.js @@ -63,9 +63,7 @@ export default { ], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("swatchgroup") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/switch/gulpfile.js b/components/switch/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/switch/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/switch/index.css b/components/switch/index.css index 1c5329ea6d9..3dd7debec89 100644 --- a/components/switch/index.css +++ b/components/switch/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-Switch { --spectrum-switch-label-color-default: var(--spectrum-neutral-content-color-default); --spectrum-switch-label-color-hover: var(--spectrum-neutral-content-color-hover); diff --git a/components/switch/package.json b/components/switch/package.json index 49e158207e1..07ad33f6f1c 100644 --- a/components/switch/package.json +++ b/components/switch/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/switch/project.json b/components/switch/project.json index eb427980265..184ed596b72 100644 --- a/components/switch/project.json +++ b/components/switch/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/switch/stories/switch.stories.js b/components/switch/stories/switch.stories.js index f9acd729a4e..822e1b67061 100644 --- a/components/switch/stories/switch.stories.js +++ b/components/switch/stories/switch.stories.js @@ -67,9 +67,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("switch") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/switch/themes/express.css b/components/switch/themes/express.css index ab4f852cd52..24bcac61171 100644 --- a/components/switch/themes/express.css +++ b/components/switch/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Switch { --spectrum-switch-handle-border-color-default: var(--spectrum-gray-800); diff --git a/components/table/gulpfile.js b/components/table/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/table/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/table/package.json b/components/table/package.json index 3698171d4cf..eabd6c52eae 100644 --- a/components/table/package.json +++ b/components/table/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/button": ">=11", "@spectrum-css/checkbox": ">=8", @@ -32,9 +32,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/table/project.json b/components/table/project.json index 5857149dde7..32dfb2045d2 100644 --- a/components/table/project.json +++ b/components/table/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/table/stories/table.stories.js b/components/table/stories/table.stories.js index e3dee9a959a..35a6aeff2a8 100644 --- a/components/table/stories/table.stories.js +++ b/components/table/stories/table.stories.js @@ -105,9 +105,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("table") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/tabs/gulpfile.js b/components/tabs/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/tabs/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/tabs/index.css b/components/tabs/index.css index f3488cb950b..160c80a90bf 100644 --- a/components/tabs/index.css +++ b/components/tabs/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-Tabs { /* Default is Medium sizing */ --spectrum-tabs-item-height: var(--spectrum-tab-item-height-medium); diff --git a/components/tabs/package.json b/components/tabs/package.json index 860bab99c96..afc34e0dc89 100644 --- a/components/tabs/package.json +++ b/components/tabs/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/menu": ">=5", @@ -25,9 +25,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/tabs/project.json b/components/tabs/project.json index 90a8656cf3e..644d96d8a94 100644 --- a/components/tabs/project.json +++ b/components/tabs/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/tabs/themes/express.css b/components/tabs/themes/express.css index b8ec53a709b..522a35a183a 100644 --- a/components/tabs/themes/express.css +++ b/components/tabs/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Tabs { --spectrum-tabs-font-weight: var(--spectrum-bold-font-weight); diff --git a/components/tag/gulpfile.js b/components/tag/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/tag/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/tag/index.css b/components/tag/index.css index ec3eca02f85..cc93e1d5bf7 100644 --- a/components/tag/index.css +++ b/components/tag/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-Tag { /* TODO - replace placeholder disabled avatar opacity with correct token once avatar is migrated */ --spectrum-avatar-opacity-disabled: 0.3; diff --git a/components/tag/package.json b/components/tag/package.json index aca7d1f99ed..d741dc84bb2 100644 --- a/components/tag/package.json +++ b/components/tag/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/avatar": ">=6", "@spectrum-css/clearbutton": ">=5", @@ -28,9 +28,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/tag/project.json b/components/tag/project.json index ea28c7c3e04..72b140ccc6d 100644 --- a/components/tag/project.json +++ b/components/tag/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/tag/stories/tag.stories.js b/components/tag/stories/tag.stories.js index 16da6dba697..e2ada2a28c0 100644 --- a/components/tag/stories/tag.stories.js +++ b/components/tag/stories/tag.stories.js @@ -129,9 +129,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("tag") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/tag/themes/express.css b/components/tag/themes/express.css index c6e8d7f8d6b..720c1b53f71 100644 --- a/components/tag/themes/express.css +++ b/components/tag/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Tag { /* border */ diff --git a/components/taggroup/gulpfile.js b/components/taggroup/gulpfile.js deleted file mode 100644 index a225c256bfc..00000000000 --- a/components/taggroup/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); \ No newline at end of file diff --git a/components/taggroup/package.json b/components/taggroup/package.json index cdcde8a3270..e0c3335675e 100644 --- a/components/taggroup/package.json +++ b/components/taggroup/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tag": ">=8", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/taggroup/project.json b/components/taggroup/project.json index ff9187166e7..0e77d9e3202 100644 --- a/components/taggroup/project.json +++ b/components/taggroup/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/taggroup/stories/taggroup.stories.js b/components/taggroup/stories/taggroup.stories.js index f1ecd4b89bc..d4ec6b5945d 100644 --- a/components/taggroup/stories/taggroup.stories.js +++ b/components/taggroup/stories/taggroup.stories.js @@ -56,9 +56,7 @@ export default { handles: [...(TagStories.parameters.actions.handles ?? [])], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("taggroup") - ? "migrated" - : undefined, + type: "migrated", }, }, }; @@ -134,4 +132,4 @@ OverflowItems.args = { label: "Tag 7", }, ], -}; \ No newline at end of file +}; diff --git a/components/textfield/gulpfile.js b/components/textfield/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/textfield/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/textfield/index.css b/components/textfield/index.css index b8e1d608ae5..e97e5944319 100644 --- a/components/textfield/index.css +++ b/components/textfield/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-Textfield { /* set input line-height to the height of the textfield - prevents the cutting off of diacritics in some languages */ /* disallow mod for max compatibility */ diff --git a/components/textfield/package.json b/components/textfield/package.json index f724fb6f72c..7145c10b893 100644 --- a/components/textfield/package.json +++ b/components/textfield/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/helptext": ">=4", "@spectrum-css/tokens": ">=13" @@ -23,9 +23,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/textfield/project.json b/components/textfield/project.json index 66b912ff263..8dec3935394 100644 --- a/components/textfield/project.json +++ b/components/textfield/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/textfield/stories/template.js b/components/textfield/stories/template.js index e7794944d6b..d1df00615d2 100644 --- a/components/textfield/stories/template.js +++ b/components/textfield/stories/template.js @@ -5,9 +5,9 @@ import { ifDefined } from "lit/directives/if-defined.js"; import { styleMap } from "lit/directives/style-map.js"; import { when } from "lit/directives/when.js"; +import { Template as FieldLabel } from "@spectrum-css/fieldlabel/stories/template.js"; import { Template as Icon } from "@spectrum-css/icon/stories/template.js"; import { Template as ProgressCircle } from "@spectrum-css/progresscircle/stories/template.js"; -import { Template as FieldLabel } from "@spectrum-css/fieldlabel/stories/template.js"; import "../index.css"; diff --git a/components/textfield/stories/textfield.stories.js b/components/textfield/stories/textfield.stories.js index c9adf82a9d5..a0be21a132f 100644 --- a/components/textfield/stories/textfield.stories.js +++ b/components/textfield/stories/textfield.stories.js @@ -1,6 +1,6 @@ // Import the component markup template -import { Template } from "./template"; import { html } from "lit"; +import { Template } from "./template"; export default { title: "Components/Text field", @@ -190,9 +190,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("textfield") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/textfield/themes/express.css b/components/textfield/themes/express.css index 83f29107f34..498873727aa 100644 --- a/components/textfield/themes/express.css +++ b/components/textfield/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Textfield { --spectrum-textfield-border-color: var(--spectrum-gray-400); diff --git a/components/thumbnail/gulpfile.js b/components/thumbnail/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/thumbnail/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/thumbnail/package.json b/components/thumbnail/package.json index 1d7b3491e14..2131baf79e6 100644 --- a/components/thumbnail/package.json +++ b/components/thumbnail/package.json @@ -13,14 +13,11 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/opacitycheckerboard": ">=1", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/thumbnail/project.json b/components/thumbnail/project.json index d145a9e03f3..7e50ee14987 100644 --- a/components/thumbnail/project.json +++ b/components/thumbnail/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/thumbnail/stories/thumbnail.stories.js b/components/thumbnail/stories/thumbnail.stories.js index 6ae2d11d3c7..4c03da5aae2 100644 --- a/components/thumbnail/stories/thumbnail.stories.js +++ b/components/thumbnail/stories/thumbnail.stories.js @@ -127,9 +127,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("thumbnail") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/toast/gulpfile.js b/components/toast/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/toast/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/toast/index.css b/components/toast/index.css index 9641fd35db3..c3be10e1ed3 100644 --- a/components/toast/index.css +++ b/components/toast/index.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; + .spectrum-Toast { /* Hardcoded variables */ --spectrum-toast-font-weight: var(--spectrum-regular-font-weight); diff --git a/components/toast/package.json b/components/toast/package.json index 9433e609569..aacec17d585 100644 --- a/components/toast/package.json +++ b/components/toast/package.json @@ -13,16 +13,13 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/button": ">=11", "@spectrum-css/closebutton": ">=4", "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/toast/project.json b/components/toast/project.json index e57ace6cc78..faf7a629ae3 100644 --- a/components/toast/project.json +++ b/components/toast/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/toast/stories/toast.stories.js b/components/toast/stories/toast.stories.js index dc4c3893385..b8a73bbbf29 100644 --- a/components/toast/stories/toast.stories.js +++ b/components/toast/stories/toast.stories.js @@ -43,9 +43,7 @@ export default { handles: ["click .spectrum-Toast button"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("toast") - ? "migrated" - : undefined, + type: "migrated", }, }, }; @@ -75,4 +73,4 @@ Positive.args = { variant: "positive", message: "Copied to clipboard", inlineButtonLabel: "Eject", -}; \ No newline at end of file +}; diff --git a/components/toast/themes/express.css b/components/toast/themes/express.css index 954a0b2ccb3..86cf741f932 100644 --- a/components/toast/themes/express.css +++ b/components/toast/themes/express.css @@ -9,6 +9,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Toast { --spectrum-toast-background-color-default: var(--spectrum-neutral-background-color-default); diff --git a/components/tooltip/gulpfile.js b/components/tooltip/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/tooltip/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/tooltip/index.css b/components/tooltip/index.css index c58b3633dc6..ddce2cf72e0 100644 --- a/components/tooltip/index.css +++ b/components/tooltip/index.css @@ -10,6 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./themes/express.css"; @import "@spectrum-css/commons/overlay.css"; .spectrum-Tooltip { diff --git a/components/tooltip/package.json b/components/tooltip/package.json index d27b6daac39..f1043ae9bd8 100644 --- a/components/tooltip/package.json +++ b/components/tooltip/package.json @@ -13,14 +13,13 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/tokens": ">=13" }, "devDependencies": { - "@spectrum-css/commons": "^9.1.2", - "@spectrum-css/component-builder-simple": "^5.0.5" + "@spectrum-css/commons": "^9.1.2" }, "publishConfig": { "access": "public" diff --git a/components/tooltip/project.json b/components/tooltip/project.json index 8a03dfb47d0..a2b90862f4c 100644 --- a/components/tooltip/project.json +++ b/components/tooltip/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/tooltip/stories/tooltip.stories.js b/components/tooltip/stories/tooltip.stories.js index 67b42112d6e..088c27e4a79 100644 --- a/components/tooltip/stories/tooltip.stories.js +++ b/components/tooltip/stories/tooltip.stories.js @@ -103,9 +103,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("tooltip") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/tooltip/themes/express.css b/components/tooltip/themes/express.css index b155922bd1b..f9afd07d738 100644 --- a/components/tooltip/themes/express.css +++ b/components/tooltip/themes/express.css @@ -10,6 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ +@import "./spectrum.css"; + @container (--system: express) { .spectrum-Tooltip { --spectrum-tooltip-backgound-color-default-neutral: var(--spectrum-neutral-background-color-default); diff --git a/components/tray/gulpfile.js b/components/tray/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/tray/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/tray/package.json b/components/tray/package.json index b6f4981bdc4..cf10d1cf91f 100644 --- a/components/tray/package.json +++ b/components/tray/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/button": ">=11", "@spectrum-css/dialog": ">=9", @@ -30,9 +30,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/tray/project.json b/components/tray/project.json index ae847680917..ed556e40d3c 100644 --- a/components/tray/project.json +++ b/components/tray/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/tray/stories/tray.stories.js b/components/tray/stories/tray.stories.js index d02cff4e6f6..bebbda4f704 100644 --- a/components/tray/stories/tray.stories.js +++ b/components/tray/stories/tray.stories.js @@ -36,9 +36,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("tray") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/treeview/gulpfile.js b/components/treeview/gulpfile.js deleted file mode 100644 index f13104999f1..00000000000 --- a/components/treeview/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/components/treeview/package.json b/components/treeview/package.json index f29907a0595..0273a6c66ce 100644 --- a/components/treeview/package.json +++ b/components/treeview/package.json @@ -13,7 +13,7 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/icon": ">=4", "@spectrum-css/thumbnail": ">=5", @@ -24,9 +24,6 @@ "optional": true } }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/treeview/project.json b/components/treeview/project.json index 6af6d530313..391154158d4 100644 --- a/components/treeview/project.json +++ b/components/treeview/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/treeview/stories/treeview.stories.js b/components/treeview/stories/treeview.stories.js index 4bfe2c8285c..3919a34e0c0 100644 --- a/components/treeview/stories/treeview.stories.js +++ b/components/treeview/stories/treeview.stories.js @@ -51,9 +51,7 @@ export default { handles: ["click .spectrum-TreeView-itemLink"], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("treeview") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/typography/gulpfile.js b/components/typography/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/typography/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/typography/package.json b/components/typography/package.json index ab93db015ef..74f8422bb63 100644 --- a/components/typography/package.json +++ b/components/typography/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/typography/project.json b/components/typography/project.json index 3b650e6d4e4..7bfa9d07ef7 100644 --- a/components/typography/project.json +++ b/components/typography/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/typography/stories/typography.stories.js b/components/typography/stories/typography.stories.js index a13c33ea9c6..16e3052b3b1 100644 --- a/components/typography/stories/typography.stories.js +++ b/components/typography/stories/typography.stories.js @@ -64,9 +64,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("typography") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/components/underlay/gulpfile.js b/components/underlay/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/underlay/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/underlay/package.json b/components/underlay/package.json index 9e372e0b67d..5e67197d6c7 100644 --- a/components/underlay/package.json +++ b/components/underlay/package.json @@ -13,13 +13,12 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, "devDependencies": { - "@spectrum-css/commons": "^9.1.2", - "@spectrum-css/component-builder-simple": "^5.0.5" + "@spectrum-css/commons": "^9.1.2" }, "publishConfig": { "access": "public" diff --git a/components/underlay/project.json b/components/underlay/project.json index a5927845a1c..759ea17f42c 100644 --- a/components/underlay/project.json +++ b/components/underlay/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/well/gulpfile.js b/components/well/gulpfile.js deleted file mode 100644 index aff190165b0..00000000000 --- a/components/well/gulpfile.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@spectrum-css/component-builder-simple"); diff --git a/components/well/package.json b/components/well/package.json index 21feed8eb50..93c010a293d 100644 --- a/components/well/package.json +++ b/components/well/package.json @@ -13,13 +13,10 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", + "main": "dist/index.css", "peerDependencies": { "@spectrum-css/tokens": ">=13" }, - "devDependencies": { - "@spectrum-css/component-builder-simple": "^5.0.5" - }, "publishConfig": { "access": "public" } diff --git a/components/well/project.json b/components/well/project.json index 87ce0c9c999..bb5128ff815 100644 --- a/components/well/project.json +++ b/components/well/project.json @@ -7,10 +7,9 @@ "clean": {}, "compare": {}, "lint": {}, - "validate": {}, - "test": { "defaultConfiguration": "scope" - } + }, + "validate": {} } } diff --git a/components/well/stories/well.stories.js b/components/well/stories/well.stories.js index 107eb67c5c7..13add7bdb61 100644 --- a/components/well/stories/well.stories.js +++ b/components/well/stories/well.stories.js @@ -18,9 +18,7 @@ export default { handles: [], }, status: { - type: process.env.MIGRATED_PACKAGES.includes("well") - ? "migrated" - : undefined, + type: "migrated", }, }, }; diff --git a/generator/package.json b/generator/package.json index c58eb991c40..15e59f68da5 100644 --- a/generator/package.json +++ b/generator/package.json @@ -20,11 +20,9 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "cheerio": "^1.0.0-rc.12", "fuzzy": "^0.1.3", "inquirer": "^9.2.10", "inquirer-autocomplete-prompt": "^3.0.0", - "js-yaml": "^4.1.0", "plop": "^3.1.1" } } diff --git a/generator/plopfile.js b/generator/plopfile.js index 5efff98c661..1ba8dc94967 100644 --- a/generator/plopfile.js +++ b/generator/plopfile.js @@ -1,11 +1,8 @@ import { spawn } from 'child_process'; -import { existsSync, readdirSync, readFileSync } from 'fs'; +import { readdirSync } from 'fs'; import { readFile } from 'fs/promises'; import { dirname, resolve } from 'path'; -import cheerio from 'cheerio'; -import yaml from 'js-yaml'; - import fuzzy from 'fuzzy'; import autocompletePrompt from 'inquirer-autocomplete-prompt'; @@ -23,7 +20,6 @@ export default async (plop) => { const pkg = await fetchPackage(rootFolder); const tokens = await fetchPackage(dirname(require.resolve('@spectrum-css/tokens/package.json'))); - const builder = await fetchPackage(resolve(process.cwd(), '../tools/component-builder-simple')); /* Fetch the project name */ plop.setWelcomeMessage(`Welcome to the ${projectName} component generator!\n To get started, answer a few short questions about your component.`); @@ -40,26 +36,6 @@ export default async (plop) => { return array.slice(start, end).join(sep); }); - function getExistingMarkupExample(metadataPath, name, plop) { - if (existsSync(`${metadataPath}/${name}.yml`) === false) return; - - const r = readFileSync(`${metadataPath}/${name}.yml`, { encoding: 'utf8' }); - const result = yaml.load(r); - if (!result) return; - - const examples = result.examples || []; - if (examples.length === 0 || !examples[0].markup) return; - - const $ = cheerio.load(examples[0].markup); - - const className = plop.renderString('spectrum-{{ pascalCase name }}', { name }); - const $example = $(`.${className}`); - - if (!$example) return; - - return $example.first().toString(); - } - plop.setActionType('install', (_, config) => new Promise((resolve, reject) => { const install = spawn('yarn', ['install'], { cwd: config.root, @@ -102,7 +78,6 @@ export default async (plop) => { data.folderName = plop.renderString('{{ lowerCase (camelCase name) }}', data); data.pkg = pkg; data.tokens = { name: tokens.name, version: tokens.version }; - data.builder = { name: builder.name, version: builder.version }; return [ { @@ -141,10 +116,6 @@ export default async (plop) => { ], actions: (data) => { data.name = plop.renderString('{{ sentenceCase folderName }}', data); - data.description = `The ${data.name} component is...`; - - const metadataPath = plop.renderString(`${srcPath}/{{ folderName }}/metadata`, data); - data.example = getExistingMarkupExample(metadataPath, data.name, plop); return [ { @@ -158,7 +129,7 @@ export default async (plop) => { type: 'install', root: rootFolder, }, - (data, config, plop) => plop.renderString(`Successfully updated {{ folderName }}. To preview your component, run \`yarn dev\` and navigate to the {{ folderName }} story.`, data), + (data, _, plop) => plop.renderString(`Successfully updated {{ folderName }}. To preview your component, run \`yarn dev\` and navigate to the {{ folderName }} story.`, data), ]; }, }); diff --git a/generator/templates/.npmignore.hbs b/generator/templates/.npmignore.hbs deleted file mode 100644 index ce21a0ac1f8..00000000000 --- a/generator/templates/.npmignore.hbs +++ /dev/null @@ -1 +0,0 @@ -/dist/docs/ diff --git a/generator/templates/gulpfile.js.hbs b/generator/templates/gulpfile.js.hbs deleted file mode 100644 index f13104999f1..00000000000 --- a/generator/templates/gulpfile.js.hbs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@spectrum-css/component-builder-simple'); diff --git a/generator/templates/index.js.hbs b/generator/templates/index.js.hbs new file mode 100644 index 00000000000..0f305eb6685 --- /dev/null +++ b/generator/templates/index.js.hbs @@ -0,0 +1,3 @@ +const builder = require("@spectrum-css/component-builder-simple"); + +builder.default({ cwd: __dirname }); diff --git a/generator/templates/package.json.hbs b/generator/templates/package.json.hbs index 22936b09491..811064306a9 100644 --- a/generator/templates/package.json.hbs +++ b/generator/templates/package.json.hbs @@ -1,6 +1,6 @@ { "name": "@spectrum-css/{{ folderName }}", - "version": "1.0.0-alpha.0", + "version": "0.0.0", "description": "The Spectrum CSS {{ folderName }} component", "license": "Apache-2.0", "author": "Adobe", @@ -13,21 +13,20 @@ "bugs": { "url": "https://github.com/adobe/spectrum-css/issues" }, - "main": "dist/index-vars.css", - "scripts": { - "build": "gulp", - "clean": "rimraf dist" - }, + "main": "dist/index.css", "peerDependencies": { "{{ tokens.name }}": ">={{ parse tokens.version '.' 0 1 }}" }, "devDependencies": { - "{{ builder.name }}": "^{{ builder.version }}", - "{{ tokens.name }}": "^{{ tokens.version }}", - "nx": "{{ pkg.devDependencies.nx }}", - "rimraf": "{{ pkg.devDependencies.rimraf }}", - "gulp": "{{ pkg.devDependencies.gulp }}" + "{{ tokens.name }}": "^{{ tokens.version }}" }, + "files": [ + "dist", + "metadata", + "stories" + "*.md", + "package.json" + ], "publishConfig": { "access": "public" } diff --git a/generator/templates/project.json.hbs b/generator/templates/project.json.hbs new file mode 100644 index 00000000000..477fd114be5 --- /dev/null +++ b/generator/templates/project.json.hbs @@ -0,0 +1,15 @@ +{ + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "name": "{{ folderName }}", + "tags": ["component"], + "targets": { + "build": {}, + "clean": {}, + "compare": {}, + "lint": {}, + "test": { + "defaultConfiguration": "scope" + }, + "validate": {} + } +} diff --git a/generator/templates/stories/template.js.hbs b/generator/templates/stories/template.js.hbs index d8bfa3bbf69..63b73b8a1dc 100644 --- a/generator/templates/stories/template.js.hbs +++ b/generator/templates/stories/template.js.hbs @@ -2,28 +2,27 @@ import { html } from 'lit'; import { classMap } from 'lit/directives/class-map.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import "../index.css"; +import "@spectrum-css/{{ folderName }}//index.css"; -// More on component templates: https://storybook.js.org/docs/web-components/writing-stories/introduction#using-args export const Template = ({ rootClass = "spectrum-{{ pascalCase name }}", - size, + size = "m", id, customClasses = [], + customStyles = {}, ...globals }) => { return html` -
({ ...a, [c]: true }), {}), - })} id=${ifDefined(id)}> +
({ ...a, [c]: true }), {}), + })} + id=${ifDefined(id)} + style=${ifDefined(styleMap(customStyles))} + > -
{{#if example}} - - - {{/if}} +
`; } diff --git a/generator/templates/stories/{{ folderName }}.stories.js.hbs b/generator/templates/stories/{{ folderName }}.stories.js.hbs index 18a3f829db7..b99d115d872 100644 --- a/generator/templates/stories/{{ folderName }}.stories.js.hbs +++ b/generator/templates/stories/{{ folderName }}.stories.js.hbs @@ -1,10 +1,10 @@ -// Import the component markup template -import { Template } from "./template"; +import { Template } from "@spectrum-css/{{ folderName }}/stories/template.js"; -// More on default export: https://storybook.js.org/docs/web-components/writing-stories/introduction#default-export +/** + * {{ description }} + */ export default { title: "Components/{{ name }}", - description: "{{ description }}", component: "{{ pascalCase name }}", argTypes: { size: { @@ -20,7 +20,6 @@ export default { control: "select" }, }, - // More on args: https://storybook.js.org/docs/web-components/writing-stories/args args: { rootClass: "spectrum-{{ pascalCase name }}", size: "m", @@ -30,15 +29,32 @@ export default { handles: [] }, status: { - type: process.env.MIGRATED_PACKAGES.includes('{{ folderName }}') ? 'migrated' : undefined + type: process.env.MIGRATED_PACKAGES.includes('{{ folderName }}') ? 'migrated' : 'legacy' + }, + design: { + type: "figma", + url: "", }, - // Getting the Figma link: https://help.figma.com/hc/en-us/articles/360045003494-Storybook-and-Figma - // design: { - // type: "figma", - // url: "https://www.figma.com/file/LKQ4FJ4bTnCSjedbRpk931/Sample-File", - // }, } }; -export const Default = Template.bind({}); +const {{ pascalCase name }}Group = (args) => html` + ${window.isChromatic() ? html` +
+ ${Template(args)} + ${Template({ + ...args, + })} + ${Template({ + ...args, + })} +
+ ` : Template(args)} +`; + +export const Default = {{ pascalCase name }}Group.bind({}); Default.args = {}; diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index 8c70b0f1e94..00000000000 --- a/gulpfile.js +++ /dev/null @@ -1,17 +0,0 @@ -const gulp = require("gulp"); -const builder = require("./tools/bundle-builder"); -const site = require("./site/gulpfile.js"); - -Object.assign(exports, builder); -Object.assign(exports, site); - -exports.dev = gulp.series(exports.copySiteResources, exports.dev); - -exports.devHeavy = gulp.series(exports.copySiteResources, exports.devHeavy); - -exports["watch-relaunch"] = function () { - process.env["BROWSERSYNC_OPEN"] = true; - exports.watch(); -}; - -exports.buildDocs = gulp.series(builder.buildDocs, site.copySiteResources); diff --git a/nx.json b/nx.json index b0239e7ad22..08d437b021b 100644 --- a/nx.json +++ b/nx.json @@ -47,16 +47,14 @@ "core", "tools", "!{projectRoot}/stories/*.js", - "{workspaceRoot}/tasks/mod-extractor.js", - { "externalDependencies": ["gulp", "postcss"] }, + { "externalDependencies": ["postcss"] }, { "env": "NODE_ENV" } ], "outputs": ["{projectRoot}/dist", "{projectRoot}/metadata/mods.md"], "executor": "nx:run-commands", "options": { "commands": [ - "gulp --gulpfile {projectRoot}/gulpfile.js", - "node ./tasks/mod-extractor.js {projectRoot}" + "node -e 'require(\"./tasks/component-builder.js\").default()'" ], "forwardAllArgs": true, "parallel": false @@ -81,7 +79,8 @@ "diff2html", "colors" ] - } + }, + { "env": "NODE_ENV" } ], "outputs": ["{workspaceRoot}/.diff-output"], "executor": "nx:run-commands", diff --git a/package.json b/package.json index 27169d2d827..004784485f9 100644 --- a/package.json +++ b/package.json @@ -16,17 +16,17 @@ "build": "yarn builder tag:component", "build:all": "run-s build:preview build:site migrate:preview", "build:preview": "nx build storybook", - "build:site": "yarn builder tag:component,ui-icons && gulp buildDocs -LLL", + "build:site": "nx build docs", "builder": "nx run-many --target build --projects", "cache:clean": "nx reset", - "ci": "yarn build:all", - "ci:storybook": "nx run storybook:build:ci", + "ci": "cross-env NODE_ENV=production yarn build:all", + "ci:storybook": "cross-env NODE_ENV=production nx run storybook:build:ci", "clean": "yarn cleaner tag:component", "clean:docs": "rimraf dist", "clean:preview": "nx clean storybook", "cleaner": "nx run-many --target clean --projects", - "compare": "node ./tasks/compare-compiled-output.js", - "dev": "nx run-many --projects ui-icons,tokens --target build && NODE_ENV=development BROWSERSYNC_OPEN=true gulp devHeavy", + "compare": "cross-env NODE_ENV=production node ./tasks/compare-compiled-output.js", + "dev": "cross-env NODE_ENV=production nx start docs", "preinstall": "command -v nvm >/dev/null 2>&1 && nvm use || exit 0", "lint": "yarn linter tag:component", "linter": "nx run-many --target lint --verbose --projects", @@ -37,28 +37,27 @@ "refresh:config": "test -n $BASH_VERSION && bash ./tasks/chromatic-config-creation.sh || exit 0", "refresh:directory": "test -n $BASH_VERSION && bash ./tasks/clean-up-after-migration.sh || exit 0", "refresh:env": "test -n $BASH_VERSION && bash ./tasks/copy-env-from-root.sh || exit 0", - "release": "nx reset && yarn builder tag:component,ui-icons && lerna publish --no-private", + "release": "cross-env NODE_ENV=production nx reset && yarn builder tag:component,ui-icons && lerna publish --no-private", "release:beta-from-package": "yarn release from-package --conventional-prerelease --preid beta --pre-dist-tag beta", - "release:site": "yarn build:site && gh-pages -d dist/ -f -e .", - "start": "NODE_ENV=development nx start storybook", - "test": "nx test storybook", - "test:plugins": "nx run-many --target test --projects tag:stylelint", - "tester": "nx run storybook:test:scope", + "release:site": "cross-env NODE_ENV=production yarn build:site && gh-pages -d dist/ -f -e .", + "start": "cross-env NODE_ENV=development nx start storybook", + "test": "cross-env NODE_ENV=production nx test storybook", + "test:plugins": "cross-env NODE_ENV=production nx run-many --target test --projects tag:stylelint", + "tester": "cross-env NODE_ENV=production nx run storybook:test:scope", "validate": "yarn validator tag:component", "validator": "nx run-many --target validate --verbose --projects" }, "workspaces": [ "components/*", - "tools/*", "plugins/*", "tokens", "ui-icons", + "site", "generator", ".storybook", ".github/actions/*" ], "devDependencies": { - "@adobe/focus-ring-polyfill": "^0.1.5", "@commitlint/cli": "^19.0.3", "@commitlint/config-conventional": "^19.0.3", "@nx/devkit": "^18.0.4", @@ -69,33 +68,40 @@ "@spectrum-css/splitbutton": "^8.1.2", "@spectrum-css/tokens": "^13.2.0", "@spectrum-css/vars": "^9.0.8", + "at-rule-packer": "^0.4.2", + "autoprefixer": "^10.4.17", "colors": "^1.4.0", "conventional-changelog-spectrum": "^1.0.2", + "cross-env": "^7.0.3", "diff": "^5.1.0", "diff2html": "^3.4.45", "fast-glob": "^3.3.2", "gh-pages": "^6.1.1", - "gulp": "^4.0.0", - "gulp-replace": "^1.0.0", - "gulplog": "^1.0.0", "husky": "^8.0.3", "lerna": "^6.6.2", "lint-staged": "^14.0.0", - "loadicons": "^1.0.0", "lodash": "^4.17.21", - "lunr": "^2.3.6", - "markdown-it": "^12.3.2", "npm-registry-fetch": "^16.1.0", "npm-run-all": "^4.1.5", "nunjucks": "^3.2.4", "nx": "^18.0.4", "open": "^10.0.3", "pajv": "^1.2.0", + "postcss": "^8.4.35", + "postcss-calc": "^9.0.1", + "postcss-combininator": "^2.0.0", + "postcss-discard-comments": "^6.0.1", + "postcss-discard-empty": "^6.0.1", + "postcss-extend": "^1.0.5", + "postcss-hover-media-feature": "1.0.2", + "postcss-import": "^16.0.1", + "postcss-load-config": "^5.0.3", + "postcss-nested": "^6.0.1", + "postcss-reporter": "^7.1.0", + "postcss-splitinator": "^2.0.0", "prettier": "^2.8.8", "prettier-package-json": "^2.8.0", - "prismjs": "^1.23.0", "rimraf": "^5.0.5", - "semver": "^7.5.1", "stylelint": "^15.11.0", "stylelint-config-clean-order": "^5.4.1", "stylelint-config-standard": "^34.0.0", @@ -104,7 +110,6 @@ "stylelint-selector-bem-pattern": "^3.0.1", "stylelint-use-logical": "^2.1.0", "tar": "^6.2.0", - "through2": "^3.0.1", "yargs": "^17.7.2" }, "engines": { diff --git a/plugins/legacy-postcss-dropdupedvars/CHANGELOG.md b/plugins/legacy-postcss-dropdupedvars/CHANGELOG.md deleted file mode 100644 index 0bc2f11b804..00000000000 --- a/plugins/legacy-postcss-dropdupedvars/CHANGELOG.md +++ /dev/null @@ -1,14 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - - - -## 2.0.0 - -🗓 2024-01-29 • 📝 [Commits](https://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) - -### 🛑 BREAKING CHANGES - -Upgrade to PostCSS v8 [bd6c40e](https://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) diff --git a/plugins/legacy-postcss-dropdupedvars/README.md b/plugins/legacy-postcss-dropdupedvars/README.md deleted file mode 100644 index 043dc9babb9..00000000000 --- a/plugins/legacy-postcss-dropdupedvars/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# legacy-postcss-dropdupedvars - -> Drop duplicate vars - -## Installation - -```sh -npm install legacy-postcss-dropdupedvars -postcss -u legacy-postcss-dropdupedvars -o dist/index.css src/index.css -``` - -## Usage - -Assuming you have some variables defined that are overridden in the same rule: - -```css -:root { - --prefix-component-background-color: blue; - - --prefix-component-width: 10px; - --prefix-component-height: 10px; - --prefix-component-size: 10px; - - --prefix-component-width: 12px; - --prefix-component-height: 12px; -} -``` - -The the overridden definitions will be removed from output: - -```css -:root { - --prefix-component-background-color: blue; - --prefix-component-size: 10px; - - --prefix-component-width: 12px; - --prefix-component-height: 12px; -} -``` diff --git a/plugins/legacy-postcss-dropdupedvars/expected/dupes.css b/plugins/legacy-postcss-dropdupedvars/expected/dupes.css deleted file mode 100644 index 3161b329c02..00000000000 --- a/plugins/legacy-postcss-dropdupedvars/expected/dupes.css +++ /dev/null @@ -1,7 +0,0 @@ -:root { - --prefix-component-background-color: blue; - --prefix-component-size: 10px; - - --prefix-component-width: 12px; - --prefix-component-height: 12px; -} diff --git a/plugins/legacy-postcss-dropdupedvars/fixtures/dupes.css b/plugins/legacy-postcss-dropdupedvars/fixtures/dupes.css deleted file mode 100644 index 7f8e7ae5046..00000000000 --- a/plugins/legacy-postcss-dropdupedvars/fixtures/dupes.css +++ /dev/null @@ -1,10 +0,0 @@ -:root { - --prefix-component-background-color: blue; - - --prefix-component-width: 10px; - --prefix-component-height: 10px; - --prefix-component-size: 10px; - - --prefix-component-width: 12px; - --prefix-component-height: 12px; -} diff --git a/plugins/legacy-postcss-dropdupedvars/index.js b/plugins/legacy-postcss-dropdupedvars/index.js deleted file mode 100644 index 78edca0c980..00000000000 --- a/plugins/legacy-postcss-dropdupedvars/index.js +++ /dev/null @@ -1,37 +0,0 @@ -/*! -Copyright 2023 Adobe. All rights reserved. -This file is licensed to you under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. You may obtain a copy -of the License at http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under -the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS -OF ANY KIND, either express or implied. See the License for the specific language -governing permissions and limitations under the License. -*/ - -/** - * @typedef Options - */ - -/** @type import('postcss').PluginCreator */ -module.exports = () => { - return { - postcssPlugin: "legacy-postcss-dropdupedvars", - OnceExit(root) { - root.walkRules((rule) => { - const seen = {}; - - rule.walkDecls(/^--/, (decl) => { - if (seen[decl.prop]) { - seen[decl.prop].remove(); - } - - seen[decl.prop] = decl; - }); - }); - }, - }; -}; - -module.exports.postcss = true; diff --git a/plugins/legacy-postcss-dropdupedvars/package.json b/plugins/legacy-postcss-dropdupedvars/package.json deleted file mode 100644 index 3e6a1ab69ee..00000000000 --- a/plugins/legacy-postcss-dropdupedvars/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "private": true, - "name": "legacy-postcss-dropdupedvars", - "version": "2.0.0", - "description": "Legacy drop duplicate vars", - "license": "Apache-2.0", - "author": "Adobe", - "main": "index.js", - "scripts": { - "test": "ava" - }, - "peerDependencies": { - "postcss": ">=8" - }, - "devDependencies": { - "ava": "^6.1.0", - "postcss": "^8.4.35" - } -} diff --git a/plugins/legacy-postcss-dropdupedvars/test.js b/plugins/legacy-postcss-dropdupedvars/test.js deleted file mode 100644 index fb981ac9b80..00000000000 --- a/plugins/legacy-postcss-dropdupedvars/test.js +++ /dev/null @@ -1,25 +0,0 @@ -const fs = require("fs"); -const test = require("ava"); -const postcss = require("postcss"); -const plugin = require("./index.js"); - -function compare(t, fixtureFilePath, expectedFilePath, options = {}) { - return postcss([plugin(options)]) - .process(readFile(`./fixtures/${fixtureFilePath}`), { - from: fixtureFilePath, - }) - .then((result) => { - const expected = result.css; - const actual = readFile(`./expected/${expectedFilePath}`); - t.is(expected, actual); - t.is(result.warnings().length, 0); - }); -} - -function readFile(filename) { - return fs.readFileSync(filename, "utf8"); -} - -test("legacy drop duplicate vars", (t) => { - return compare(t, "dupes.css", "dupes.css"); -}); diff --git a/plugins/legacy-postcss-dropunusedvars/CHANGELOG.md b/plugins/legacy-postcss-dropunusedvars/CHANGELOG.md deleted file mode 100644 index 0bc2f11b804..00000000000 --- a/plugins/legacy-postcss-dropunusedvars/CHANGELOG.md +++ /dev/null @@ -1,14 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - - - -## 2.0.0 - -🗓 2024-01-29 • 📝 [Commits](https://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) - -### 🛑 BREAKING CHANGES - -Upgrade to PostCSS v8 [bd6c40e](https://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) diff --git a/plugins/legacy-postcss-dropunusedvars/README.md b/plugins/legacy-postcss-dropunusedvars/README.md deleted file mode 100644 index d9588947048..00000000000 --- a/plugins/legacy-postcss-dropunusedvars/README.md +++ /dev/null @@ -1,47 +0,0 @@ -# legacy-postcss-dropunusedvars - -> Remove unused variable definitions - -## Installation - -```sh -npm install legacy-postcss-dropunusedvars -postcss -u legacy-postcss-dropunusedvars -o dist/index.css src/index.css -``` - -## Usage - -Assuming you have some variables defined and rule(s) that use them: - -```css -:root { - --prefix-component-background-color: blue; - --prefix-component-width: 10px; - --prefix-component-height: 10px; - --prefix-component-size: 10px; -} - -.component { - background-color: var(--prefix-component-background-color); - - width: var(--prefix-component-width); - height: var(--prefix-component-height); -} -``` - -The variables that are not used in any rule will be removed from the output: - -```css -:root { - --prefix-component-background-color: blue; - --prefix-component-width: 10px; - --prefix-component-height: 10px; -} - -.component { - background-color: var(--prefix-component-background-color); - - width: var(--prefix-component-width); - height: var(--prefix-component-height); -} -``` diff --git a/plugins/legacy-postcss-dropunusedvars/expected/unused.css b/plugins/legacy-postcss-dropunusedvars/expected/unused.css deleted file mode 100644 index 51d98fee4f3..00000000000 --- a/plugins/legacy-postcss-dropunusedvars/expected/unused.css +++ /dev/null @@ -1,15 +0,0 @@ -:root { - --prefix-component-background-color: blue; - --prefix-component-border-color: blue; - --prefix-component-width: 10px; - --prefix-component-height: 10px; -} - -.component { - background-color: var(--prefix-component-background-color); - - border-color: var(--other-color, var(--prefix-component-border-color)); - - width: var(--prefix-component-width); - height: var(--prefix-component-height); -} diff --git a/plugins/legacy-postcss-dropunusedvars/expected/varRefs.css b/plugins/legacy-postcss-dropunusedvars/expected/varRefs.css deleted file mode 100644 index beeaf019316..00000000000 --- a/plugins/legacy-postcss-dropunusedvars/expected/varRefs.css +++ /dev/null @@ -1,19 +0,0 @@ -:root { - --gray: gray; - --blue: blue; - --orange: orange; - --default: var(--gray); - --focus: var(--blue); -} - -.component { - background-color: var(--default); -} - -.component:focus { - background-color: var(--focus); -} - -.component:active { - background-color: var(--orange); -} diff --git a/plugins/legacy-postcss-dropunusedvars/fixtures/unused.css b/plugins/legacy-postcss-dropunusedvars/fixtures/unused.css deleted file mode 100644 index 0dafb503fe0..00000000000 --- a/plugins/legacy-postcss-dropunusedvars/fixtures/unused.css +++ /dev/null @@ -1,16 +0,0 @@ -:root { - --prefix-component-background-color: blue; - --prefix-component-border-color: blue; - --prefix-component-width: 10px; - --prefix-component-height: 10px; - --prefix-component-size: 10px; -} - -.component { - background-color: var(--prefix-component-background-color); - - border-color: var(--other-color, var(--prefix-component-border-color)); - - width: var(--prefix-component-width); - height: var(--prefix-component-height); -} diff --git a/plugins/legacy-postcss-dropunusedvars/fixtures/varRefs.css b/plugins/legacy-postcss-dropunusedvars/fixtures/varRefs.css deleted file mode 100644 index 0cff75dc488..00000000000 --- a/plugins/legacy-postcss-dropunusedvars/fixtures/varRefs.css +++ /dev/null @@ -1,22 +0,0 @@ -:root { - --gray: gray; - --blue: blue; - --green: green; - --orange: orange; - --default: var(--gray); - --focus: var(--blue); - --selected: var(--green); - --active: var(--orange); -} - -.component { - background-color: var(--default); -} - -.component:focus { - background-color: var(--focus); -} - -.component:active { - background-color: var(--orange); -} diff --git a/plugins/legacy-postcss-dropunusedvars/index.js b/plugins/legacy-postcss-dropunusedvars/index.js deleted file mode 100644 index 3b6d158a064..00000000000 --- a/plugins/legacy-postcss-dropunusedvars/index.js +++ /dev/null @@ -1,90 +0,0 @@ -/*! -Copyright 2023 Adobe. All rights reserved. -This file is licensed to you under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. You may obtain a copy -of the License at http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under -the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS -OF ANY KIND, either express or implied. See the License for the specific language -governing permissions and limitations under the License. -*/ - -/** - * @typedef Options -*/ - -const valueParser = require("postcss-value-parser"); - -/** @type import('postcss').PluginCreator */ -module.exports = () => { - return { - postcssPlugin: "legacy-postcss-dropunusedvars", - OnceExit(root) { - // Find all used variables - const usedAnywhere = []; - const usedInProps = []; - const variableRelationships = {}; - - root.walkDecls((decl) => { - const usedInDecl = []; - - const isVar = decl.prop.startsWith("--"); - const matches = decl.value.match(/var\(.*?\)/g); - - if (matches) { - // Parse value and get a list of variables used - valueParser(decl.value).walk((node) => { - if (node.type === "function" && node.value === "var") { - if (node.nodes.length) { - const varName = node.nodes[0].value; - usedInDecl.push(varName); - usedAnywhere.push(varName); - if (!isVar) { - usedInProps.push(varName); - } - } - } - }); - } - - // Store every variable referenced by this var - if (!isVar || !usedInDecl.length) return; - - for (let varName of usedInDecl) { - variableRelationships[varName] = variableRelationships[varName] || []; - variableRelationships[varName].push(decl.prop); - } - }); - - // Drop unused variable definitions - root.walkDecls(/^--/, (decl) => { - const varName = decl.prop; - - // Definitely drop it if it's never used - if (!usedAnywhere.includes(varName)) { - decl.remove(); - } else if (!usedInProps.includes(varName)) { - // Drop a variable if everything that references it has been removed - let relatedVars = variableRelationships[varName]; - - if (relatedVars && relatedVars.length) { - let keep = false; - - // Check if everything that references this variable has been removed - for (let relatedVar of relatedVars) { - if (usedAnywhere.includes(relatedVar)) { - keep = true; - break; - } - } - - if (!keep) decl.remove(); - } - } - }); - }, - }; -}; - -module.exports.postcss = true; diff --git a/plugins/legacy-postcss-dropunusedvars/package.json b/plugins/legacy-postcss-dropunusedvars/package.json deleted file mode 100644 index b23458025d7..00000000000 --- a/plugins/legacy-postcss-dropunusedvars/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "private": true, - "name": "legacy-postcss-dropunusedvars", - "version": "2.0.0", - "description": "Legacy remove unused variable definitions", - "license": "Apache-2.0", - "author": "Adobe", - "main": "index.js", - "scripts": { - "test": "ava" - }, - "dependencies": { - "postcss-value-parser": "^4.2.0" - }, - "peerDependencies": { - "postcss": ">=8" - }, - "devDependencies": { - "ava": "^6.1.0", - "postcss": "^8.4.35" - } -} diff --git a/plugins/legacy-postcss-dropunusedvars/test.js b/plugins/legacy-postcss-dropunusedvars/test.js deleted file mode 100644 index fb50515f617..00000000000 --- a/plugins/legacy-postcss-dropunusedvars/test.js +++ /dev/null @@ -1,29 +0,0 @@ -const fs = require("fs"); -const test = require("ava"); -const postcss = require("postcss"); -const plugin = require("./index.js"); - -function compare(t, fixtureFilePath, expectedFilePath, options = {}) { - return postcss([plugin(options)]) - .process(readFile(`./fixtures/${fixtureFilePath}`), { - from: fixtureFilePath, - }) - .then((result) => { - const expected = result.css; - const actual = readFile(`./expected/${expectedFilePath}`); - t.is(expected, actual); - t.is(result.warnings().length, 0); - }); -} - -function readFile(filename) { - return fs.readFileSync(filename, "utf8"); -} - -test("legacy drop unused vars", (t) => { - return compare(t, "unused.css", "unused.css"); -}); - -test("legacy drop unused vars, even if referenced by other vars", (t) => { - return compare(t, "varRefs.css", "varRefs.css"); -}); diff --git a/plugins/postcss-droproot/CHANGELOG.md b/plugins/postcss-droproot/CHANGELOG.md deleted file mode 100644 index e320ffeaa5d..00000000000 --- a/plugins/postcss-droproot/CHANGELOG.md +++ /dev/null @@ -1,48 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - - - -## 2.0.0 - -🗓 2024-01-29 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-droproot@1.0.3...postcss-droproot@2.0.0) - -### 🛑 BREAKING CHANGES - -Upgrade to PostCSS v8 [bd6c40e](https://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) - - - -## 1.0.3 - -🗓 2021-09-29 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-droproot@1.0.3-alpha.0...postcss-droproot@1.0.3) - -**Note:** Version bump only for package postcss-droproot - - - -## 1.0.3-alpha.0 - -🗓 2021-04-27 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-droproot@1.0.2...postcss-droproot@1.0.3-alpha.0) - -**Note:** Version bump only for package postcss-droproot - - - -## 1.0.2 - -🗓 2021-03-10 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-droproot@1.0.1...postcss-droproot@1.0.2) - -### 🐛 Bug fixes - -- correct PostCSS plugin names ([81ad868](https://github.com/adobe/spectrum-css/commit/81ad868)) - - - -## 1.0.1 - -🗓 2021-02-02 - -**Note:** Version bump only for package postcss-droproot diff --git a/plugins/postcss-droproot/README.md b/plugins/postcss-droproot/README.md deleted file mode 100644 index dcf1de564ce..00000000000 --- a/plugins/postcss-droproot/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# postcss-droproot - -> Remove :root rules - -## Installation - -```sh -npm install postcss-droproot -postcss -u postcss-droproot -o dist/index.css src/index.css -``` - -## Usage - -Let's say you have `:root {}` rules you want gone. This plugin turns this: - -```css -:root { - --prefix-component-background-color: blue; -} -``` - -Into this: - -``` - -``` diff --git a/plugins/postcss-droproot/index.js b/plugins/postcss-droproot/index.js deleted file mode 100644 index cc262707bcd..00000000000 --- a/plugins/postcss-droproot/index.js +++ /dev/null @@ -1,28 +0,0 @@ -/*! -Copyright 2023 Adobe. All rights reserved. -This file is licensed to you under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. You may obtain a copy -of the License at http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under -the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS -OF ANY KIND, either express or implied. See the License for the specific language -governing permissions and limitations under the License. -*/ - -/** - * @typedef Options -*/ - -/** @type import('postcss').PluginCreator */ -module.exports = () => { - return { - postcssPlugin: "postcss-droproot", - Rule(root) { - if (root.selector !== ":root") return; - rule.remove(); - }, - }; -}; - -module.exports.postcss = true; diff --git a/plugins/postcss-droproot/package.json b/plugins/postcss-droproot/package.json deleted file mode 100644 index dcf95387750..00000000000 --- a/plugins/postcss-droproot/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "private": true, - "name": "postcss-droproot", - "version": "2.0.0", - "description": "Remove :root rules", - "license": "Apache-2.0", - "author": "Adobe", - "main": "index.js", - "scripts": { - "test": "ava" - }, - "dependencies": { - "postcss": "^8.4.35" - } -} diff --git a/plugins/postcss-notnested/CHANGELOG.md b/plugins/postcss-notnested/CHANGELOG.md deleted file mode 100644 index bcd5096fbee..00000000000 --- a/plugins/postcss-notnested/CHANGELOG.md +++ /dev/null @@ -1,14 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - - - -## 2.0.0 - -🗓 2024-01-29 • 📝 [Commits](ttps://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) - -### 🛑 BREAKING CHANGES - -Upgrade to PostCSS v8 [bd6c40e](https://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) diff --git a/plugins/postcss-notnested/README.md b/plugins/postcss-notnested/README.md deleted file mode 100644 index d642e1679f1..00000000000 --- a/plugins/postcss-notnested/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# postcss-notnested - -## Installation - -```sh -npm install postcss-notnested -postcss -u postcss-notnested -o dist/index.css src/index.css -``` diff --git a/plugins/postcss-notnested/index.js b/plugins/postcss-notnested/index.js deleted file mode 100644 index 3d5331e0885..00000000000 --- a/plugins/postcss-notnested/index.js +++ /dev/null @@ -1,71 +0,0 @@ -/*! -Copyright 2023 Adobe. All rights reserved. -This file is licensed to you under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. You may obtain a copy -of the License at http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under -the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS -OF ANY KIND, either express or implied. See the License for the specific language -governing permissions and limitations under the License. -*/ - -/** - * @typedef {Object} Options - * @property {string} [replace] - */ - -/** @type import('postcss').PluginCreator */ -module.exports = ({ replace } = {}) => { - return { - postcssPlugin: "postcss-notnested", - Rule(rule) { - if (!rule.selectors) return; - - let selectors; - if (replace) { - let replaced = false; - selectors = rule.selectors.map((selector) => { - if (!selector) return; - - if (/^&/.test(selector)) { - replaced = true; - // Handle special case where the replacement selector === the existing selector - if (selector.replace(/^&/, "") === replace) { - return replace; - } - - return selector.replace(/^&/, replace); - } - - return selector; - }); - - if (!replaced) return; - - // De-dupe selectors - selectors = selectors.filter((selector, index) => { - return selectors.indexOf(selector) === index; - }); - - rule.selectors = selectors; - return; - } - - selectors = rule.selectors.filter((selector) => { - // Kill the selector with the stray ampersand -- it's not nested! - return !/^&/.test(selector); - }); - - if (selectors.length == 0) { - // If no selectors remain, remove the rule completely - rule.remove(); - } else if (selectors.length != rule.selectors.length) { - // Only replace the selectors if we changed something (avoids extra work for every selector) - rule.selectors = selectors; - } - }, - }; -}; - -module.exports.postcss = true; diff --git a/plugins/postcss-notnested/package.json b/plugins/postcss-notnested/package.json deleted file mode 100644 index 35b6ffc89b2..00000000000 --- a/plugins/postcss-notnested/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "private": true, - "name": "postcss-notnested", - "version": "2.0.0", - "description": "", - "license": "Apache-2.0", - "author": "Adobe", - "main": "index.js", - "peerDependencies": { - "postcss": ">=8" - }, - "devDependencies": { - "postcss": "^8.4.35" - } -} diff --git a/plugins/postcss-transformselectors/CHANGELOG.md b/plugins/postcss-transformselectors/CHANGELOG.md deleted file mode 100644 index 36b1bb02a85..00000000000 --- a/plugins/postcss-transformselectors/CHANGELOG.md +++ /dev/null @@ -1,54 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - - - -## 3.0.0 - -🗓 2024-01-29 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-transformselectors@2.0.1...postcss-transformselectors@3.0.0) - -### 🛑 BREAKING CHANGES - -Upgrade to PostCSS v8 [bd6c40e](https://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) - - - -## 2.0.1 - -🗓 2022-03-17 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-transformselectors@2.0.0-alpha.0...postcss-transformselectors@2.0.1) - -**Note:** Version bump only for package postcss-transformselectors - - - -# 2.0.0 - -🗓 2021-09-29 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-transformselectors@2.0.0-alpha.0...postcss-transformselectors@2.0.0) - -**Note:** Version bump only for package postcss-transformselectors - - - -# 2.0.0-alpha.0 - -🗓 2021-04-27 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-transformselectors@1.1.0...postcss-transformselectors@2.0.0-alpha.0) - -### ✨ Features - -- updated typography token names to use standardorder ([50145fe](https://github.com/adobe/spectrum-css/commit/50145fe)) - -### 🛑 BREAKING CHANGES - -- realigned classnames - - - -# 1.1.0 - -🗓 2021-03-10 - -### ✨ Features - -- add postcss-transformselectors ([728854d](https://github.com/adobe/spectrum-css/commit/728854d)) diff --git a/plugins/postcss-transformselectors/README.md b/plugins/postcss-transformselectors/README.md deleted file mode 100644 index 13e3d3a8fc8..00000000000 --- a/plugins/postcss-transformselectors/README.md +++ /dev/null @@ -1,41 +0,0 @@ -# postcss-transformselectors - -> Re-map and transform selectors - -## Installation - -```sh -npm install postcss-transformselectors -``` - -## Usage - -In your `postcss.config.js`, pass `options` to the plugin: - -```js -module.exports = { - plugins: [ - require("postcss-transformselectors")({ - replace: [ - // replace all instaces of .button in a selector with .btn (will catch .button:hover) - // when search is a string, replaces are automatically made global - { search: ".button", replace: ".btn" }, - // replace all double dashes in classnames with an underscore - // note the g flag (global) is used to ensure every instance in a selector is replaced - { search: /\.(.*?)--([^ ]*?)/g, replace: ".$1_$2" }, - ], - // lowercase all classnames - // you can use the PostCSS Rule object to determine the new selector (i.e. based off rule.parent) - transform: (selector, rule) => selector.toLowerCase(), - }), - ], -}; -``` - -### `options.replace` - -An array of objects with `{ search: RegExp | string, replace: string }`. - -### `options.transform` - -A function that takes `(selector, rule)` and returns a new selector. diff --git a/plugins/postcss-transformselectors/expected/complex.css b/plugins/postcss-transformselectors/expected/complex.css deleted file mode 100644 index 2399b7e215c..00000000000 --- a/plugins/postcss-transformselectors/expected/complex.css +++ /dev/null @@ -1,114 +0,0 @@ -h1 { - font-size: var( - --spectrum-heading-xxl-text-size, - var(--spectrum-alias-heading-xxl-text-size) - ); - font-weight: var( - --spectrum-heading-xxl-text-font-weight, - var(--spectrum-alias-heading-text-font-weight-regular) - ); - line-height: var( - --spectrum-heading-xxl-text-line-height, - var(--spectrum-alias-heading-text-line-height) - ); - font-style: var( - --spectrum-heading-xxl-text-font-style, - var(--spectrum-global-font-style-regular) - ); - letter-spacing: var( - --spectrum-heading-xxl-text-letter-spacing, - var(--spectrum-global-font-letter-spacing-none) - ); - text-transform: var(--spectrum-heading-xxl-text-transform, none); - margin-top: 0; - margin-bottom: 0; -} - -h2 { - font-size: var( - --spectrum-heading-xl-text-size, - var(--spectrum-alias-heading-xl-text-size) - ); - font-weight: var( - --spectrum-heading-xl-text-font-weight, - var(--spectrum-alias-heading-text-font-weight-regular) - ); - line-height: var( - --spectrum-heading-xl-text-line-height, - var(--spectrum-alias-heading-text-line-height) - ); - font-style: var( - --spectrum-heading-xl-text-font-style, - var(--spectrum-global-font-style-regular) - ); - letter-spacing: var( - --spectrum-heading-xl-text-letter-spacing, - var(--spectrum-global-font-letter-spacing-none) - ); - text-transform: var(--spectrum-heading-xl-text-transform, none); - margin-top: 0; - margin-bottom: 0; -} - -h3 { - font-size: var( - --spectrum-heading-l-text-size, - var(--spectrum-alias-heading-l-text-size) - ); - font-weight: var( - --spectrum-heading-l-text-font-weight, - var(--spectrum-alias-heading-text-font-weight-regular) - ); - line-height: var( - --spectrum-heading-l-text-line-height, - var(--spectrum-alias-heading-text-line-height) - ); - font-style: var( - --spectrum-heading-l-text-font-style, - var(--spectrum-global-font-style-regular) - ); - letter-spacing: var( - --spectrum-heading-l-text-letter-spacing, - var(--spectrum-global-font-letter-spacing-none) - ); - text-transform: var(--spectrum-heading-l-text-transform, none); - margin-top: 0; - margin-bottom: 0; -} - -h1, -h2, -h3 { - font-family: var( - --spectrum-heading-m-text-font-family, - var(--spectrum-alias-body-text-font-family) - ); - font-weight: var( - --spectrum-heading-m-text-font-weight, - var(--spectrum-alias-heading-text-font-weight-regular) - ); -} - -h1 em, -h2 em, -h3 em, -h1 .spectrum-Heading-emphasized, -h2 .spectrum-Heading-emphasized, -h3 .spectrum-Heading-emphasized { - font-style: var( - --spectrum-heading-m-emphasized-text-font-style, - var(--spectrum-global-font-style-italic) - ); -} - -h1 strong, -h2 strong, -h3 strong, -h1 .spectrum-Heading-strong, -h2 .spectrum-Heading-strong, -h3 .spectrum-Heading-strong { - font-weight: var( - --spectrum-heading-m-strong-text-font-weight, - var(--spectrum-global-font-weight-black) - ); -} diff --git a/plugins/postcss-transformselectors/expected/regex.css b/plugins/postcss-transformselectors/expected/regex.css deleted file mode 100644 index 7f11a455d52..00000000000 --- a/plugins/postcss-transformselectors/expected/regex.css +++ /dev/null @@ -1,21 +0,0 @@ -.button { - border-width: 2px; -} - -.button_cta { - background-color: blue; -} - -.button_cta:hover { - background-color: darkblue; -} - -.light .button_cta .button-icon, -.lightest .button_cta .button-icon { - color: black; -} - -.dark .button_cta .button-icon, -.darkest .button_cta .button-icon { - color: white; -} diff --git a/plugins/postcss-transformselectors/expected/replace.css b/plugins/postcss-transformselectors/expected/replace.css deleted file mode 100644 index c79e03a5462..00000000000 --- a/plugins/postcss-transformselectors/expected/replace.css +++ /dev/null @@ -1,16 +0,0 @@ -.btn { - border-width: 2px; -} - -.btn:hover { - color: black; -} - -.crd .btn, -.btn--green { - color: green; -} - -.crd { - border-width: 1px; -} diff --git a/plugins/postcss-transformselectors/expected/transform.css b/plugins/postcss-transformselectors/expected/transform.css deleted file mode 100644 index e3414c9caf5..00000000000 --- a/plugins/postcss-transformselectors/expected/transform.css +++ /dev/null @@ -1,7 +0,0 @@ -.button { - border-width: 2px; -} - -.card { - border-width: 1px; -} diff --git a/plugins/postcss-transformselectors/fixtures/complex.css b/plugins/postcss-transformselectors/fixtures/complex.css deleted file mode 100644 index 487ffde9eb7..00000000000 --- a/plugins/postcss-transformselectors/fixtures/complex.css +++ /dev/null @@ -1,104 +0,0 @@ -.spectrum-Heading--sizeXXL { - font-size: var( - --spectrum-heading-xxl-text-size, - var(--spectrum-alias-heading-xxl-text-size) - ); - font-weight: var( - --spectrum-heading-xxl-text-font-weight, - var(--spectrum-alias-heading-text-font-weight-regular) - ); - line-height: var( - --spectrum-heading-xxl-text-line-height, - var(--spectrum-alias-heading-text-line-height) - ); - font-style: var( - --spectrum-heading-xxl-text-font-style, - var(--spectrum-global-font-style-regular) - ); - letter-spacing: var( - --spectrum-heading-xxl-text-letter-spacing, - var(--spectrum-global-font-letter-spacing-none) - ); - text-transform: var(--spectrum-heading-xxl-text-transform, none); - margin-top: 0; - margin-bottom: 0; -} - -.spectrum-Heading--sizeXL { - font-size: var( - --spectrum-heading-xl-text-size, - var(--spectrum-alias-heading-xl-text-size) - ); - font-weight: var( - --spectrum-heading-xl-text-font-weight, - var(--spectrum-alias-heading-text-font-weight-regular) - ); - line-height: var( - --spectrum-heading-xl-text-line-height, - var(--spectrum-alias-heading-text-line-height) - ); - font-style: var( - --spectrum-heading-xl-text-font-style, - var(--spectrum-global-font-style-regular) - ); - letter-spacing: var( - --spectrum-heading-xl-text-letter-spacing, - var(--spectrum-global-font-letter-spacing-none) - ); - text-transform: var(--spectrum-heading-xl-text-transform, none); - margin-top: 0; - margin-bottom: 0; -} - -.spectrum-Heading--sizeL { - font-size: var( - --spectrum-heading-l-text-size, - var(--spectrum-alias-heading-l-text-size) - ); - font-weight: var( - --spectrum-heading-l-text-font-weight, - var(--spectrum-alias-heading-text-font-weight-regular) - ); - line-height: var( - --spectrum-heading-l-text-line-height, - var(--spectrum-alias-heading-text-line-height) - ); - font-style: var( - --spectrum-heading-l-text-font-style, - var(--spectrum-global-font-style-regular) - ); - letter-spacing: var( - --spectrum-heading-l-text-letter-spacing, - var(--spectrum-global-font-letter-spacing-none) - ); - text-transform: var(--spectrum-heading-l-text-transform, none); - margin-top: 0; - margin-bottom: 0; -} - -.spectrum-Heading { - font-family: var( - --spectrum-heading-m-text-font-family, - var(--spectrum-alias-body-text-font-family) - ); - font-weight: var( - --spectrum-heading-m-text-font-weight, - var(--spectrum-alias-heading-text-font-weight-regular) - ); -} - -.spectrum-Heading em, -.spectrum-Heading .spectrum-Heading-emphasis { - font-style: var( - --spectrum-heading-m-emphasis-text-font-style, - var(--spectrum-global-font-style-italic) - ); -} - -.spectrum-Heading strong, -.spectrum-Heading .spectrum-Heading-strong { - font-weight: var( - --spectrum-heading-m-strong-text-font-weight, - var(--spectrum-global-font-weight-black) - ); -} diff --git a/plugins/postcss-transformselectors/fixtures/regex.css b/plugins/postcss-transformselectors/fixtures/regex.css deleted file mode 100644 index 51fcc262c7b..00000000000 --- a/plugins/postcss-transformselectors/fixtures/regex.css +++ /dev/null @@ -1,21 +0,0 @@ -.button { - border-width: 2px; -} - -.button--cta { - background-color: blue; -} - -.button--cta:hover { - background-color: darkblue; -} - -.light .button--cta .button-icon, -.lightest .button--cta .button-icon { - color: black; -} - -.dark .button--cta .button-icon, -.darkest .button--cta .button-icon { - color: white; -} diff --git a/plugins/postcss-transformselectors/fixtures/replace.css b/plugins/postcss-transformselectors/fixtures/replace.css deleted file mode 100644 index f4cda4ba75c..00000000000 --- a/plugins/postcss-transformselectors/fixtures/replace.css +++ /dev/null @@ -1,16 +0,0 @@ -.button { - border-width: 2px; -} - -.button:hover { - color: black; -} - -.card .button, -.button--green { - color: green; -} - -.card { - border-width: 1px; -} diff --git a/plugins/postcss-transformselectors/fixtures/transform.css b/plugins/postcss-transformselectors/fixtures/transform.css deleted file mode 100644 index dbefd31d29a..00000000000 --- a/plugins/postcss-transformselectors/fixtures/transform.css +++ /dev/null @@ -1,7 +0,0 @@ -.Button { - border-width: 2px; -} - -.Card { - border-width: 1px; -} diff --git a/plugins/postcss-transformselectors/index.js b/plugins/postcss-transformselectors/index.js deleted file mode 100644 index 5e7053d8a07..00000000000 --- a/plugins/postcss-transformselectors/index.js +++ /dev/null @@ -1,45 +0,0 @@ -/*! -Copyright 2023 Adobe. All rights reserved. -This file is licensed to you under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. You may obtain a copy -of the License at http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under -the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS -OF ANY KIND, either express or implied. See the License for the specific language -governing permissions and limitations under the License. -*/ - -/** - * @typedef {object} Options - * @property {{ search: string | RegExp, replace: string }[]} replace - * @property {(selector: string, rule: import('postcss').Rule) => string} transform - */ - -/** @type import('postcss').PluginCreator */ -module.exports = ({ - replace, - transform, -}) => { - return { - postcssPlugin: "postcss-transformselectors", - Rule(rule) { - if (replace && Array.isArray(replace)) { - for (let { search, replace } of replace) { - // always replace globally for strings - if (typeof search === "string") { - search = new RegExp(search, "g"); - } - - rule.selector = rule.selector.replace(search, replace); - } - } - - if (typeof transform === "function") { - rule.selector = transform(rule.selector, rule); - } - }, - }; -}; - -module.exports.postcss = true; diff --git a/plugins/postcss-transformselectors/package.json b/plugins/postcss-transformselectors/package.json deleted file mode 100644 index 0f9e4824256..00000000000 --- a/plugins/postcss-transformselectors/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "private": true, - "name": "postcss-transformselectors", - "version": "3.0.0", - "description": "Re-map and transform selectors", - "license": "Apache-2.0", - "author": "Adobe", - "main": "index.js", - "scripts": { - "test": "ava" - }, - "peerDependencies": { - "postcss": ">=8" - }, - "devDependencies": { - "ava": "^6.1.0", - "postcss": "^8.4.35" - } -} diff --git a/plugins/postcss-transformselectors/test.js b/plugins/postcss-transformselectors/test.js deleted file mode 100644 index ff2c7d50f8a..00000000000 --- a/plugins/postcss-transformselectors/test.js +++ /dev/null @@ -1,70 +0,0 @@ -const fs = require("fs"); -const test = require("ava"); -const postcss = require("postcss"); -const plugin = require("./index.js"); - -function compare(t, fixtureFilePath, expectedFilePath, options = {}) { - return postcss([plugin(options)]) - .process(readFile(`./fixtures/${fixtureFilePath}`), { - from: fixtureFilePath, - }) - .then((result) => { - const expected = result.css; - const actual = readFile(`./expected/${expectedFilePath}`); - t.is(expected, actual); - t.is(result.warnings().length, 0); - }); -} - -function readFile(filename) { - return fs.readFileSync(filename, "utf8"); -} - -test("support options.replace", (t) => { - return compare(t, "replace.css", "replace.css", { - replace: [ - { search: ".button", replace: ".btn" }, - { search: ".card", replace: ".crd" }, - ], - }); -}); - -test("support options.replace with regex", (t) => { - return compare(t, "regex.css", "regex.css", { - replace: [{ search: /\.(.*?)--([^ ]*?)/g, replace: ".$1_$2" }], - }); -}); - -test("support options.transform", (t) => { - return compare(t, "transform.css", "transform.css", { - transform: (selector, rule) => { - return selector.toLowerCase(); - }, - }); -}); - -test("support complex examples", (t) => { - return compare(t, "complex.css", "complex.css", { - replace: [ - { search: ".spectrum-Heading--sizeXXL", replace: "h1" }, - { search: ".spectrum-Heading--sizeXL", replace: "h2" }, - { search: ".spectrum-Heading--sizeL", replace: "h3" }, - ], - transform: (selector) => { - if (selector.startsWith(".spectrum-Heading")) { - return selector - .split(",") - .map((selectorPart) => { - return ["h1", "h2", "h3"] - .map((h) => { - return selectorPart.replace(".spectrum-Heading", h); - }) - .join(","); - }) - .join(","); - } - - return selector; - }, - }); -}); diff --git a/plugins/postcss-varfallback/CHANGELOG.md b/plugins/postcss-varfallback/CHANGELOG.md deleted file mode 100644 index d61b47f38d1..00000000000 --- a/plugins/postcss-varfallback/CHANGELOG.md +++ /dev/null @@ -1,56 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - - - -## 2.0.0 - -🗓 2024-01-29 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-varfallback@1.1.3...postcss-varfallback@2.0.0) - -### 🛑 BREAKING CHANGES - -Upgrade to PostCSS v8 [bd6c40e](https://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) - - - -## 1.1.3 - -🗓 2022-06-16 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-varfallback@1.1.2...postcss-varfallback@1.1.3) - -**Note:** Version bump only for package postcss-varfallback - - - -## 1.1.2 - -🗓 2022-03-17 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-varfallback@1.1.1-alpha.0...postcss-varfallback@1.1.2) - -**Note:** Version bump only for package postcss-varfallback - - - -## 1.1.1 - -🗓 2021-09-29 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-varfallback@1.1.1-alpha.0...postcss-varfallback@1.1.1) - -**Note:** Version bump only for package postcss-varfallback - - - -## 1.1.1-alpha.0 - -🗓 2021-04-27 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/postcss-varfallback@1.1.0...postcss-varfallback@1.1.1-alpha.0) - -**Note:** Version bump only for package postcss-varfallback - - - -# 1.1.0 - -🗓 2021-03-10 - -### ✨ Features - -- add postcss-varfallback ([3f1b97f](https://github.com/adobe/spectrum-css/commit/3f1b97f)) diff --git a/plugins/postcss-varfallback/README.md b/plugins/postcss-varfallback/README.md deleted file mode 100644 index 729ce3da50d..00000000000 --- a/plugins/postcss-varfallback/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# postcss-varfallback - -> Use the fallback value of any var reference - -## Installation - -```sh -npm install postcss-varfallback -postcss -u postcss-varfallback -o dist/index.css src/index.css -``` - -## Usage - -Assuming you have some CSS defined that uses fallback variables: - -```css -:root { - --component-background-color: blue; -} - -.component { - background-color: var( - --mod-background-color, - var(--component-background-color) - ); -} -``` - -Running it through this plugin will produce: - -```css -:root { - --component-background-color: blue; -} - -.component { - background-color: var(--component-background-color); -} -``` diff --git a/plugins/postcss-varfallback/expected/basic.css b/plugins/postcss-varfallback/expected/basic.css deleted file mode 100644 index 51bf2cb622e..00000000000 --- a/plugins/postcss-varfallback/expected/basic.css +++ /dev/null @@ -1,7 +0,0 @@ -:root { - --component-background-color: blue; -} - -.component { - background-color: var(--component-background-color); -} diff --git a/plugins/postcss-varfallback/expected/functions.css b/plugins/postcss-varfallback/expected/functions.css deleted file mode 100644 index 645a4ea79d7..00000000000 --- a/plugins/postcss-varfallback/expected/functions.css +++ /dev/null @@ -1,8 +0,0 @@ -:root { - --component-width: 12px; - --component-border-width: 12px; -} - -.component { - width: calc(var(--component-width) - var(--component-border-width)); -} diff --git a/plugins/postcss-varfallback/expected/nested.css b/plugins/postcss-varfallback/expected/nested.css deleted file mode 100644 index 1251485c9cf..00000000000 --- a/plugins/postcss-varfallback/expected/nested.css +++ /dev/null @@ -1,8 +0,0 @@ -:root { - --color-blue: blue; - --component-background-color: var(--color-blue); -} - -.component { - background-color: var(--color-blue); -} diff --git a/plugins/postcss-varfallback/fixtures/basic.css b/plugins/postcss-varfallback/fixtures/basic.css deleted file mode 100644 index 301c4517e32..00000000000 --- a/plugins/postcss-varfallback/fixtures/basic.css +++ /dev/null @@ -1,10 +0,0 @@ -:root { - --component-background-color: blue; -} - -.component { - background-color: var( - --mod-background-color, - var(--component-background-color) - ); -} diff --git a/plugins/postcss-varfallback/fixtures/functions.css b/plugins/postcss-varfallback/fixtures/functions.css deleted file mode 100644 index cc7df5487c2..00000000000 --- a/plugins/postcss-varfallback/fixtures/functions.css +++ /dev/null @@ -1,11 +0,0 @@ -:root { - --component-width: 12px; - --component-border-width: 12px; -} - -.component { - width: calc( - var(--mod-width, var(--component-width)) - - var(--mod-border-width, var(--component-border-width)) - ); -} diff --git a/plugins/postcss-varfallback/fixtures/nested.css b/plugins/postcss-varfallback/fixtures/nested.css deleted file mode 100644 index 3cdf01521ff..00000000000 --- a/plugins/postcss-varfallback/fixtures/nested.css +++ /dev/null @@ -1,11 +0,0 @@ -:root { - --color-blue: blue; - --component-background-color: var(--color-blue); -} - -.component { - background-color: var( - --mod-background-color, - var(--component-background-color, var(--color-blue)) - ); -} diff --git a/plugins/postcss-varfallback/index.js b/plugins/postcss-varfallback/index.js deleted file mode 100644 index 5f7da7c3034..00000000000 --- a/plugins/postcss-varfallback/index.js +++ /dev/null @@ -1,59 +0,0 @@ -/*! -Copyright 2023 Adobe. All rights reserved. -This file is licensed to you under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. You may obtain a copy -of the License at http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under -the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS -OF ANY KIND, either express or implied. See the License for the specific language -governing permissions and limitations under the License. -*/ - -/** - * @typedef Options -*/ - -const valueParser = require("postcss-value-parser"); - -/** @type import('postcss').PluginCreator */ -module.exports = () => { - return { - postcssPlugin: "postcss-varfallback", - Declaration(decl) { - function getFallbackNode(node) { - const nodes = node.nodes; - if (nodes && nodes.length === 3) { - // It's got a fallback, go deeper - return getFallbackNode(nodes[2]); - } - - return node; - } - - const parsed = valueParser(decl.value); - if (!parsed.nodes || !parsed.nodes.length) { - return node.value; - } - - parsed.walk((node) => { - if (node.type === "function" && node.value === "var") { - // If it's a var, recursively find the fallback - const fallbackNode = getFallbackNode(node); - - // Replace node properties with the fallback - node.type = fallbackNode.type; - node.value = fallbackNode.value; - node.nodes = fallbackNode.nodes; - - // Do not investigate children - return false; - } - }); - - decl.value = valueParser.stringify(parsed); - }, - }; -}; - -module.exports.postcss = true; diff --git a/plugins/postcss-varfallback/package.json b/plugins/postcss-varfallback/package.json deleted file mode 100644 index 384f62615a4..00000000000 --- a/plugins/postcss-varfallback/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "private": true, - "name": "postcss-varfallback", - "version": "2.0.0", - "description": "Use the fallback value of any var reference", - "license": "Apache-2.0", - "author": "Adobe", - "main": "index.js", - "scripts": { - "test": "ava" - }, - "dependencies": { - "postcss-value-parser": "^4.2.0" - }, - "peerDependencies": { - "postcss": ">=8" - }, - "devDependencies": { - "ava": "^6.1.0", - "postcss": "^8.4.35" - } -} diff --git a/plugins/postcss-varfallback/test.js b/plugins/postcss-varfallback/test.js deleted file mode 100644 index ccaf660be64..00000000000 --- a/plugins/postcss-varfallback/test.js +++ /dev/null @@ -1,33 +0,0 @@ -const fs = require("fs"); -const test = require("ava"); -const postcss = require("postcss"); -const plugin = require("./index.js"); - -function compare(t, fixtureFilePath, expectedFilePath, options = {}) { - return postcss([plugin(options)]) - .process(readFile(`./fixtures/${fixtureFilePath}`), { - from: fixtureFilePath, - }) - .then((result) => { - const expected = result.css; - const actual = readFile(`./expected/${expectedFilePath}`); - t.is(expected, actual); - t.is(result.warnings().length, 0); - }); -} - -function readFile(filename) { - return fs.readFileSync(filename, "utf8"); -} - -test("basic fallbacks", (t) => { - return compare(t, "basic.css", "basic.css"); -}); - -test("nested fallbacks", (t) => { - return compare(t, "nested.css", "nested.css"); -}); - -test("function arguments", (t) => { - return compare(t, "functions.css", "functions.css"); -}); diff --git a/plugins/postcss-varsonly/CHANGELOG.md b/plugins/postcss-varsonly/CHANGELOG.md deleted file mode 100644 index bcd5096fbee..00000000000 --- a/plugins/postcss-varsonly/CHANGELOG.md +++ /dev/null @@ -1,14 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - - - -## 2.0.0 - -🗓 2024-01-29 • 📝 [Commits](ttps://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) - -### 🛑 BREAKING CHANGES - -Upgrade to PostCSS v8 [bd6c40e](https://github.com/adobe/spectrum-css/commit/bd6c40eb5a4b43df94dff1f325502e5cd08b7f5f) diff --git a/plugins/postcss-varsonly/README.md b/plugins/postcss-varsonly/README.md deleted file mode 100644 index 2255d733950..00000000000 --- a/plugins/postcss-varsonly/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# postcss-varsonly - -## Installation - -```sh -npm install postcss-varsonly -postcss -u postcss-varsonly -o dist/index.css src/index.css -``` diff --git a/plugins/postcss-varsonly/index.js b/plugins/postcss-varsonly/index.js deleted file mode 100644 index 1f14543cd3a..00000000000 --- a/plugins/postcss-varsonly/index.js +++ /dev/null @@ -1,51 +0,0 @@ -/*! -Copyright 2023 Adobe. All rights reserved. -This file is licensed to you under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. You may obtain a copy -of the License at http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under -the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS -OF ANY KIND, either express or implied. See the License for the specific language -governing permissions and limitations under the License. -*/ - -/** - * @typedef {Object} Options - */ - -/** @type import('postcss').PluginCreator */ -module.exports = () => { - return { - postcssPlugin: "postcss-varsonly", - OnceExit(root) { - // Delete all comments - root.walkComments((comment) => { - comment.remove(); - }); - - // Process each rule - root.walkRules((rule) => { - // Don't break variable declarations - if (rule.selector === ":root") { - return; - } - - // Check every declaration - rule.walkDecls((decl) => { - // Remove if not variable - if (!decl.value.match("var(.*?)")) { - decl.remove(); - } - }); - - // Delete the rule if it's empty - if (rule.nodes.length === 0) { - rule.remove(); - } - }); - }, - }; -}; - -module.exports.postcss = true; diff --git a/plugins/postcss-varsonly/package.json b/plugins/postcss-varsonly/package.json deleted file mode 100644 index e19dde17e46..00000000000 --- a/plugins/postcss-varsonly/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "private": true, - "name": "postcss-varsonly", - "version": "2.0.0", - "description": "", - "license": "Apache-2.0", - "author": "Adobe", - "main": "index.js", - "peerDependencies": { - "postcss": ">=8" - }, - "devDependencies": { - "postcss": "^8.4.35" - } -} diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 00000000000..f75bc3afa74 --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,93 @@ +/*! +Copyright 2023 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +const { join, sep, basename } = require("path"); + +module.exports = ({ + file, + to, + cwd = process.cwd(), + splitinatorOptions = { + noSelectors: false, + noFlatVariables: false, + }, + combine = false, + keepComments = false, + lint = true, + verbose = true, + additionalPlugins = {}, + env = process.env.NODE_ENV ?? "development", + ...options +} = {}) => { + if (env === "development" && !options.map) { + options.map = { inline: false }; + } else options.map = false; + + /* themes/*.css */ + if ( + (to && to.split(sep)?.includes("themes")) || + (file && file.split(sep)?.includes("themes")) + ) { + splitinatorOptions.noSelectors = true; + + /* themes/express.css */ + if ( + (to && basename(to, ".css") === "express") || + (file && basename(file, ".css") === "express") + ) { + combine = true; + } + } + + /* index-theme.css */ + if ( + (to && basename(to, ".css") === "index-theme") || + (file && basename(file, ".css") === "index-theme") + ) { + splitinatorOptions.noSelectors = true; + } + + /* index-base.css */ + if ( + to && basename(to, ".css") === "index-base" || + file && basename(file, ".css") === "index-base" + ) { + splitinatorOptions.noFlatVariables = true; + } + + return { + ...options, + plugins: { + "postcss-import": {}, + "postcss-extend": {}, + "postcss-nested": {}, + "postcss-splitinator": { + processIdentifier: (identifier) => identifier === "express" ? "spectrum--express" : identifier, + ...splitinatorOptions, + }, + "postcss-hover-media-feature": {}, + "postcss-calc": {}, + "postcss-combininator": combine ? {} : false, + ...additionalPlugins, + "postcss-discard-empty": {}, + "at-rule-packer": {}, + "postcss-discard-comments": !keepComments ? { removeAllButFirst: true } : false, + "autoprefixer": {}, + "stylelint": lint ? { + cache: true, + configFile: join(__dirname, "stylelint.config.js"), + quiet: !verbose, + } : false, + "postcss-reporter": verbose ? {} : false, + }, + }; +} diff --git a/site/README.md b/site/README.md index a2eb8092bf4..b7c32be97a2 100644 --- a/site/README.md +++ b/site/README.md @@ -66,7 +66,7 @@ cp getting-started.pug new-page.pug ```pug include includes/dependencies.pug - link(rel='stylesheet', type='text/css', href='../components/table/index-vars.css') + link(rel='stylesheet', type='text/css', href='../components/table/index.css') ``` ## Adding a one-off example page diff --git a/site/get-started.pug b/site/get-started.pug index 8f942a34d76..f9da380fd0b 100644 --- a/site/get-started.pug +++ b/site/get-started.pug @@ -73,8 +73,8 @@ html(lang='en-US' dir="ltr").spectrum.spectrum--light.spectrum--medium - - + + `, util.Prism.languages.markup, 'markup'); pre.spectrum-CodeBlock code.spectrum-Code.spectrum-Code--sizeS.language-markup!=htmlMarkup @@ -96,8 +96,8 @@ html(lang='en-US' dir="ltr").spectrum.spectrum--light.spectrum--medium - - + +