From 0625d3b8a1d28570e4f446ec61df1d1221ef95ee Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 27 Oct 2022 15:32:44 -0700 Subject: [PATCH] Refactor scss (#1397) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 💡 upgrade sass and ember-cli-sass * refactor: 💡 rose becomes dev dep of core * refactor: 💡 migrate rose styles to rose/app/styles * chore: 🤖 disable sass linting until stylelint can be installed --- addons/core/package.json | 4 +- addons/rose/.sasslintrc | 2 +- .../rose/form/radio/group/index.stories.mdx | 1 - .../{addon => app}/styles/rose/_index.scss | 0 .../{addon => app}/styles/rose/_reset.scss | 0 .../styles/rose/_typography.scss | 0 .../styles/rose/components/_badge.scss | 0 .../styles/rose/components/_button.scss | 0 .../styles/rose/components/_cards.scss | 0 .../styles/rose/components/_frame.scss | 0 .../styles/rose/components/_icon.scss | 0 .../styles/rose/components/_index.scss | 0 .../styles/rose/components/_link-button.scss | 0 .../styles/rose/components/_message.scss | 0 .../styles/rose/components/_notification.scss | 0 .../styles/rose/components/_separator.scss | 0 .../styles/rose/components/card/_index.scss | 0 .../styles/rose/components/card/_link.scss | 0 .../rose/components/code-editor/_index.scss | 0 .../styles/rose/components/dialog/_cover.scss | 0 .../rose/components/dialog/_dialog.scss | 0 .../styles/rose/components/dialog/_index.scss | 0 .../rose/components/dropdown/_button.scss | 0 .../rose/components/dropdown/_dropdown.scss | 0 .../rose/components/dropdown/_index.scss | 0 .../rose/components/dropdown/_item.scss | 0 .../rose/components/dropdown/_key-value.scss | 0 .../rose/components/dropdown/_link.scss | 0 .../rose/components/dropdown/_section.scss | 0 .../styles/rose/components/footer/_brand.scss | 0 .../styles/rose/components/footer/_index.scss | 0 .../styles/rose/components/footer/_link.scss | 0 .../styles/rose/components/footer/_nav.scss | 0 .../styles/rose/components/footer/_text.scss | 0 .../rose/components/form/_checkbox.scss | 0 .../rose/components/form/_fieldset.scss | 0 .../rose/components/form/_helper-text.scss | 0 .../styles/rose/components/form/_index.scss | 0 .../styles/rose/components/form/_input.scss | 0 .../styles/rose/components/form/_label.scss | 0 .../rose/components/form/_radio-card.scss | 0 .../styles/rose/components/form/_radio.scss | 0 .../styles/rose/components/form/_select.scss | 0 .../rose/components/form/errors/_index.scss | 0 .../rose/components/form/errors/_message.scss | 0 .../styles/rose/components/header/_brand.scss | 0 .../rose/components/header/_dropdown.scss | 0 .../styles/rose/components/header/_index.scss | 0 .../styles/rose/components/header/_link.scss | 0 .../styles/rose/components/header/_nav.scss | 0 .../rose/components/header/_utilities.scss | 0 .../rose/components/layout/_centered.scss | 0 .../rose/components/layout/_global.scss | 0 .../styles/rose/components/layout/_index.scss | 0 .../styles/rose/components/layout/_page.scss | 0 .../rose/components/layout/_sidebar.scss | 0 .../styles/rose/components/list/_index.scss | 0 .../rose/components/list/_key-value.scss | 0 .../rose/components/nav/_breadcrumbs.scss | 0 .../styles/rose/components/nav/_index.scss | 0 .../styles/rose/components/nav/_sidebar.scss | 0 .../styles/rose/components/nav/_tabs.scss | 0 .../rose/components/page-header/_index.scss | 0 .../rose/components/page-header/_title.scss | 0 .../components/page-header/_utilities.scss | 0 .../styles/rose/components/table/_index.scss | 0 .../styles/rose/components/table/_table.scss | 0 .../rose/components/toolbar/_index.scss | 0 .../styles/rose/components/toolbar/_info.scss | 0 .../rose/components/toolbar/_toolbar.scss | 0 .../styles/rose/utilities/_button.scss | 0 .../styles/rose/utilities/_index.scss | 0 .../styles/rose/utilities/_type.scss | 0 .../styles/rose/variables/_index.scss | 0 .../styles/rose/variables/_media.scss | 0 .../styles/rose/variables/_opacity.scss | 0 .../styles/rose/variables/_sizing.scss | 0 .../styles/rose/variables/_typography.scss | 0 .../styles/rose/variables/color/_css.scss | 0 .../styles/rose/variables/color/_index.scss | 0 .../styles/rose/variables/color/_sass.scss | 0 addons/rose/ember-cli-build.js | 3 -- addons/rose/index.js | 30 ++------------- addons/rose/package.json | 11 +++--- ui/admin/ember-cli-build.js | 3 -- ui/admin/package.json | 4 +- ui/desktop/ember-cli-build.js | 3 -- ui/desktop/package.json | 4 +- yarn.lock | 37 +++++++++++-------- 89 files changed, 37 insertions(+), 65 deletions(-) rename addons/rose/{addon => app}/styles/rose/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/_reset.scss (100%) rename addons/rose/{addon => app}/styles/rose/_typography.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_badge.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_button.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_cards.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_frame.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_icon.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_link-button.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_message.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_notification.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/_separator.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/card/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/card/_link.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/code-editor/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dialog/_cover.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dialog/_dialog.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dialog/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dropdown/_button.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dropdown/_dropdown.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dropdown/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dropdown/_item.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dropdown/_key-value.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dropdown/_link.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/dropdown/_section.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/footer/_brand.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/footer/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/footer/_link.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/footer/_nav.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/footer/_text.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/_checkbox.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/_fieldset.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/_helper-text.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/_input.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/_label.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/_radio-card.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/_radio.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/_select.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/errors/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/form/errors/_message.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/header/_brand.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/header/_dropdown.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/header/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/header/_link.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/header/_nav.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/header/_utilities.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/layout/_centered.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/layout/_global.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/layout/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/layout/_page.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/layout/_sidebar.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/list/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/list/_key-value.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/nav/_breadcrumbs.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/nav/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/nav/_sidebar.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/nav/_tabs.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/page-header/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/page-header/_title.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/page-header/_utilities.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/table/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/table/_table.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/toolbar/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/toolbar/_info.scss (100%) rename addons/rose/{addon => app}/styles/rose/components/toolbar/_toolbar.scss (100%) rename addons/rose/{addon => app}/styles/rose/utilities/_button.scss (100%) rename addons/rose/{addon => app}/styles/rose/utilities/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/utilities/_type.scss (100%) rename addons/rose/{addon => app}/styles/rose/variables/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/variables/_media.scss (100%) rename addons/rose/{addon => app}/styles/rose/variables/_opacity.scss (100%) rename addons/rose/{addon => app}/styles/rose/variables/_sizing.scss (100%) rename addons/rose/{addon => app}/styles/rose/variables/_typography.scss (100%) rename addons/rose/{addon => app}/styles/rose/variables/color/_css.scss (100%) rename addons/rose/{addon => app}/styles/rose/variables/color/_index.scss (100%) rename addons/rose/{addon => app}/styles/rose/variables/color/_sass.scss (100%) diff --git a/addons/core/package.json b/addons/core/package.json index f5f1c4226..a78b4775b 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -41,8 +41,7 @@ "ember-intl": "^5.7.0", "ember-loading": "^2.0.0", "ember-route-action-helper": "^2.0.8", - "ember-truth-helpers": "^3.0.0", - "rose": "*" + "ember-truth-helpers": "^3.0.0" }, "devDependencies": { "@babel/eslint-parser": "^7.18.2", @@ -81,6 +80,7 @@ "prettier": "^2.7.1", "qunit": "^2.17.1", "qunit-dom": "^2.0.0", + "rose": "*", "webpack": "5" }, "engines": { diff --git a/addons/rose/.sasslintrc b/addons/rose/.sasslintrc index fbccde1bf..84f041b0b 100644 --- a/addons/rose/.sasslintrc +++ b/addons/rose/.sasslintrc @@ -1,5 +1,5 @@ files: - include: 'app/styles/**/*.s+(a|c)ss' + include: 'app/**/*.scss' rules: leading-zero: 0 mixins-before-declarations: 0 diff --git a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx index 95f9f566b..60137a9b1 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx @@ -150,7 +150,6 @@ export const CardTemplate = (args) => ({ context: args, }); - =3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" sax@~1.2.4: version "1.2.4" @@ -24212,7 +24219,7 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-js@^1.0.1, source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==