Skip to content

fix(styling): Add .import sass files #21869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions shim-scss-imports.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env node

const path = require('path');
const proc = require('child_process');
const fs = require('fs');

const findResult = proc.spawnSync('find', ['.', '-iname', '"_*.scss"'], {
cwd: __dirname,
shell: true,
env: process.env,
}).stdout.toString();

const sassFiles = findResult.trim().split('\n');
for (const f of sassFiles) {
const originalFileContent = fs.readFileSync(f, 'utf8');

const originalFileName = path.basename(f);
const originalDirectory = path.dirname(f);

let importFileContent =
`@forward '${originalFileName.replace(/^_/, '').replace('.scss', '')}';\n`;
const originalImportLines = originalFileContent.matchAll(/@import '(.+)';/g);
for (const match of originalImportLines) {
const importPath = match[1];
if (importPath.includes('@material')) continue;
if (importPath.includes('private')) continue;

importFileContent += `@forward '${importPath}';\n`;
}

const importFileName = originalFileName.replace('.scss', '.import.scss');
const importFilePath = path.join(originalDirectory, importFileName);
fs.writeFileSync(importFilePath, importFileContent, 'utf8');
}
1 change: 1 addition & 0 deletions src/cdk/a11y/_a11y.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'a11y';
1 change: 1 addition & 0 deletions src/cdk/overlay/_overlay.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'overlay';
1 change: 1 addition & 0 deletions src/cdk/text-field/_text-field.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'text-field';
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@forward 'column-resize';
@forward '../../material/core/style/variables';
@forward '../../material/core/style/vendor-prefixes';
@forward '../../material/core/theming/palette';
@forward '../../material/core/theming/theming';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'autocomplete-theme';
@forward '../mdc-helpers/mdc-helpers';
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-button/_button-base.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'button-base';
@forward '../../material/core/style/layout-common';
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'button-theme';
@forward '../../material/core/ripple/ripple';
@forward '../mdc-helpers/mdc-helpers';
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-card/_card-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'card-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'checkbox-theme';
@forward '../mdc-helpers/mdc-helpers';
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-chips/_chips-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'chips-theme';
@forward '../mdc-helpers/mdc-helpers';
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-color/_all-color.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'all-color';
@forward '../mdc-theming/all-theme';
4 changes: 4 additions & 0 deletions src/material-experimental/mdc-core/_core.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'core';
@forward '../../material/core/theming/theming';
@forward './option/option-theme';
@forward './option/optgroup-theme';
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'optgroup-theme';
@forward '../../mdc-helpers/mdc-helpers';
@forward '../../../material/core/theming/theming';
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'option-theme';
@forward '../../mdc-helpers/mdc-helpers';
@forward '../../../material/core/theming/theming';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'all-density';
@forward '../mdc-theming/all-theme';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'dialog-legacy-padding';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'dialog-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'mdc-dialog-structure-overrides';
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'form-field-density';
@forward '../../material/core/theming/theming';
@forward 'form-field-sizing';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'form-field-focus-overlay';
@forward '../../material/core/style/layout-common';
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'form-field-native-select';
@forward '../../material/core/theming/theming';
@forward '../../cdk/a11y/a11y';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'form-field-sizing';
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'form-field-subscript';
@forward 'form-field-sizing';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import '@material/theme/mixins.import';
@import '@material/textfield/variables.import';
@import '@material/typography/mixins.import';
@import 'form-field-sizing';
@import '../mdc-helpers/mdc-helpers';

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@forward 'form-field-theme';
@forward '../mdc-helpers/mdc-helpers';
@forward 'form-field-density';
@forward 'form-field-subscript';
@forward 'form-field-focus-overlay';
@forward 'form-field-native-select';
@forward 'mdc-text-field-theme-variable-refresh';
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'mdc-text-field-structure-overrides';
@forward 'form-field-sizing';
@forward '../../cdk/a11y/a11y';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'mdc-text-field-textarea-overrides';
@forward 'form-field-sizing';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'mdc-text-field-theme-variable-refresh';
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'focus-indicators';
@forward '../../material/core/theming/theming';
@forward '../../material/core/style/layout-common';
@forward '../../material/core/focus-indicators/focus-indicators';
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'mdc-helpers';
@forward '../../material/core/style/layout-common';
@forward '../../material/core/theming/theming';
@forward '../../material/core/typography/typography';
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-input/_input-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'input-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'interactive-list-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'list-option-theme';
@forward '../mdc-checkbox/checkbox-theme';
4 changes: 4 additions & 0 deletions src/material-experimental/mdc-list/_list-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'list-theme';
@forward './interactive-list-theme';
@forward './list-option-theme';
@forward '../mdc-helpers/mdc-helpers';
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-menu/_menu-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'menu-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'paginator-theme';
@forward '../../material/core/theming/theming';
@forward '../mdc-helpers/mdc-helpers';
@forward './paginator-variables';
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@

@mixin mat-mdc-paginator-density($config-or-theme) {
$density-scale: mat-get-density-config($config-or-theme);
$height: mat-private-density-prop-value($mat-paginator-density-config, $density-scale, height);
$height: mat-private-density-prop-value(
$mat-mdc-paginator-density-config, $density-scale, height);

@include mat-private-density-legacy-compatibility() {
.mat-mdc-paginator-container {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'paginator-variables';
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
$mat-paginator-height: 56px !default;
$mat-mdc-paginator-height: 56px !default;
// Minimum height for paginator's in the highest density is determined based on how
// much the paginator can shrink until the content exceeds (i.e. navigation buttons).
$mat-paginator-minimum-height: 40px !default;
$mat-paginator-maximum-height: $mat-paginator-height !default;
$mat-mdc-paginator-minimum-height: 40px !default;
$mat-mdc-paginator-maximum-height: $mat-mdc-paginator-height !default;

$mat-paginator-density-config: (
$mat-mdc-paginator-density-config: (
height: (
default: $mat-paginator-height,
maximum: $mat-paginator-maximum-height,
minimum: $mat-paginator-minimum-height,
default: $mat-mdc-paginator-height,
maximum: $mat-mdc-paginator-maximum-height,
minimum: $mat-mdc-paginator-minimum-height,
)
) !default;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'progress-bar-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'progress-spinner-theme';
@forward '../mdc-helpers/mdc-helpers';
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-radio/_radio-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'radio-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'select-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'sidenav-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'slide-toggle-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'slider-theme';
@forward '../mdc-helpers/mdc-helpers';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'snack-bar-theme';
@forward '../mdc-helpers/mdc-helpers';
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-table/_table-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'table-theme';
@forward '../mdc-helpers/mdc-helpers';
5 changes: 5 additions & 0 deletions src/material-experimental/mdc-tabs/_tabs-common.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@forward 'tabs-common';
@forward '../../material/core/style/variables';
@forward '../../material/core/style/vendor-prefixes';
@forward '../../cdk/a11y/a11y';
@forward '../mdc-helpers/mdc-helpers';
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-tabs/_tabs-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'tabs-theme';
@forward '../mdc-helpers/mdc-helpers';
23 changes: 23 additions & 0 deletions src/material-experimental/mdc-theming/_all-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@forward 'all-theme';
@forward '../mdc-core/core';
@forward '../mdc-autocomplete/autocomplete-theme';
@forward '../mdc-button/button-theme';
@forward '../mdc-card/card-theme';
@forward '../mdc-checkbox/checkbox-theme';
@forward '../mdc-chips/chips-theme';
@forward '../mdc-dialog/dialog-theme';
@forward '../mdc-list/list-theme';
@forward '../mdc-menu/menu-theme';
@forward '../mdc-radio/radio-theme';
@forward '../mdc-select/select-theme';
@forward '../mdc-slide-toggle/slide-toggle-theme';
@forward '../mdc-snack-bar/snack-bar-theme';
@forward '../mdc-tabs/tabs-theme';
@forward '../mdc-table/table-theme';
@forward '../mdc-paginator/paginator-theme';
@forward '../mdc-progress-bar/progress-bar-theme';
@forward '../mdc-progress-spinner/progress-spinner-theme';
@forward '../mdc-input/input-theme';
@forward '../mdc-form-field/form-field-theme';
@forward '../../material/core/core';
@forward '../../material/core/theming/theming';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'all-typography';
@forward '../mdc-theming/all-theme';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'menubar-theme';
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@forward 'popover-edit';
@forward '../../cdk/a11y/a11y';
@forward '../../material/core/style/variables';
@forward '../../material/core/theming/palette';
@forward '../../material/core/theming/theming';
@forward '../../material/core/typography/typography-utils';
2 changes: 2 additions & 0 deletions src/material-experimental/selection/_selection.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'selection';
@forward '../../material/core/theming/theming';
2 changes: 2 additions & 0 deletions src/material/autocomplete/_autocomplete-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'autocomplete-theme';
@forward '../core/theming/theming';
5 changes: 5 additions & 0 deletions src/material/badge/_badge-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@forward 'badge-theme';
@forward '../core/theming/palette';
@forward '../core/theming/theming';
@forward '../core/typography/typography-utils';
@forward '../../cdk/a11y/a11y';
4 changes: 4 additions & 0 deletions src/material/bottom-sheet/_bottom-sheet-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'bottom-sheet-theme';
@forward '../core/typography/typography-utils';
@forward '../core/theming/palette';
@forward '../core/theming/theming';
6 changes: 6 additions & 0 deletions src/material/button-toggle/_button-toggle-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@forward 'button-toggle-theme';
@forward '../../cdk/a11y/a11y';
@forward '../core/theming/palette';
@forward '../core/theming/theming';
@forward '../core/typography/typography-utils';
@forward './button-toggle-variables';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'button-toggle-variables';
4 changes: 4 additions & 0 deletions src/material/button/_button-base.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'button-base';
@forward '../core/style/variables';
@forward '../core/style/elevation';
@forward '../core/style/button-common';
3 changes: 3 additions & 0 deletions src/material/button/_button-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'button-theme';
@forward '../core/theming/theming';
@forward '../core/typography/typography-utils';
4 changes: 4 additions & 0 deletions src/material/card/_card-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'card-theme';
@forward '../core/theming/palette';
@forward '../core/theming/theming';
@forward '../core/typography/typography-utils';
3 changes: 3 additions & 0 deletions src/material/checkbox/_checkbox-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'checkbox-theme';
@forward '../core/theming/theming';
@forward '../core/typography/typography-utils';
4 changes: 4 additions & 0 deletions src/material/chips/_chips-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'chips-theme';
@forward '../core/theming/palette';
@forward '../core/theming/theming';
@forward '../core/typography/typography-utils';
10 changes: 10 additions & 0 deletions src/material/core/_core.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@forward 'core';
@forward '../../cdk/overlay/overlay';
@forward '../../cdk/a11y/a11y';
@forward '../../cdk/text-field/text-field';
@forward './ripple/ripple';
@forward './focus-indicators/focus-indicators';
@forward './option/option-theme';
@forward './option/optgroup-theme';
@forward './selection/pseudo-checkbox/pseudo-checkbox-theme';
@forward './typography/all-typography';
3 changes: 3 additions & 0 deletions src/material/core/color/_all-color.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'all-color';
@forward '../theming/all-theme';
@forward '../theming/theming';
9 changes: 9 additions & 0 deletions src/material/core/density/private/_all-density.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@forward 'all-density';
@forward '../../theming/theming';
@forward '../../../expansion/expansion-theme';
@forward '../../../stepper/stepper-theme';
@forward '../../../toolbar/toolbar-theme';
@forward '../../../tree/tree-theme';
@forward '../../../paginator/paginator-theme';
@forward '../../../form-field/form-field-theme';
@forward '../../../button-toggle/button-toggle-theme';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'compatibility';
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'focus-indicators';
@forward '../theming/theming';
@forward '../style/layout-common';
4 changes: 4 additions & 0 deletions src/material/core/option/_optgroup-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'optgroup-theme';
@forward '../theming/palette';
@forward '../theming/theming';
@forward '../typography/typography-utils';
4 changes: 4 additions & 0 deletions src/material/core/option/_option-theme.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'option-theme';
@forward '../theming/palette';
@forward '../theming/theming';
@forward '../typography/typography-utils';
3 changes: 3 additions & 0 deletions src/material/core/ripple/_ripple.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward 'ripple';
@forward '../theming/theming';
@forward '../../../cdk/a11y/a11y';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'pseudo-checkbox-theme';
@forward '../../theming/theming';
2 changes: 2 additions & 0 deletions src/material/core/style/_button-common.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'button-common';
@forward './vendor-prefixes';
2 changes: 2 additions & 0 deletions src/material/core/style/_checkbox-common.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'checkbox-common';
@forward './variables';
2 changes: 2 additions & 0 deletions src/material/core/style/_elevation.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'elevation';
@forward 'variables';
2 changes: 2 additions & 0 deletions src/material/core/style/_form-common.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'form-common';
@forward '../theming/theming';
1 change: 1 addition & 0 deletions src/material/core/style/_layout-common.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'layout-common';
1 change: 1 addition & 0 deletions src/material/core/style/_list-common.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'list-common';
5 changes: 5 additions & 0 deletions src/material/core/style/_menu-common.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@forward 'menu-common';
@forward './variables';
@forward './list-common';
@forward './layout-common';
@forward './vendor-prefixes';
2 changes: 2 additions & 0 deletions src/material/core/style/_private.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@forward 'private';
@forward './elevation';
1 change: 1 addition & 0 deletions src/material/core/style/_variables.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'variables';
1 change: 1 addition & 0 deletions src/material/core/style/_vendor-prefixes.import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@forward 'vendor-prefixes';
Loading