Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Removed layout assets from the starterkit. #1271

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Removed layout assets from the starterkit. #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions tests/bats/assets.subtheme.custom.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ load _helper
assert_file_exists "dist/styles.editor.css"
assert_file_contains "dist/styles.editor.css" "ck-editor__editable"

assert_file_exists "dist/styles.layout.css"
assert_file_contains "dist/styles.layout.css" "ct-layout"

assert_file_exists "dist/scripts.js"
assert_file_not_exists "dist/styles-variables.js"
assert_file_not_exists "dist/styles-editor.js"
Expand Down
3 changes: 0 additions & 3 deletions tests/bats/assets.subtheme.sibling.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ load _helper
assert_file_exists "dist/styles.editor.css"
assert_file_contains "dist/styles.editor.css" "ck-editor__editable"

assert_file_exists "dist/styles.layout.css"
assert_file_contains "dist/styles.layout.css" "ct-layout"

assert_file_exists "dist/scripts.js"
assert_file_not_exists "dist/styles-variables.js"
assert_file_not_exists "dist/styles-editor.js"
Expand Down
9 changes: 0 additions & 9 deletions web/themes/contrib/civictheme/civictheme_starter_kit/assets/sass/theme.layout.scss
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions web/themes/contrib/civictheme/civictheme_starter_kit/webpack/layout_css.js
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions web/themes/contrib/civictheme/civictheme_starter_kit/webpack/webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ module.exports = {
// - main: all styles used in components and Drupal theme -> styles.css
// - variables: CSS variables -> styles.variables.css
// - editor: nested styles used in editor -> styles.editor.css
// - layout: styles used in layout -> styles.layout.css
const entries = {
main: [],
variables: [],
editor: [],
layout: [],
};

// Scan for all JS.
Expand All @@ -38,9 +36,6 @@ module.exports = {
// Add explicitly editor.scss
entries.editor.push(path.resolve(__dirname, 'editor_css.js'));

// Add explicitly layout.scss
entries.layout.push(path.resolve(__dirname, 'layout_css.js'));

return entries;
}(path.resolve(__dirname, '../components_combined/**/!(*.stories|*.component|*.min|*.test|*.script|*.utils).js'))),
optimization: {
Expand All @@ -61,11 +56,6 @@ module.exports = {
name: 'editor',
chunks: (chunk) => (chunk.name === 'editor'),
},
layout: {
test: 'css/mini-extract',
name: 'layout',
chunks: (chunk) => (chunk.name === 'layout'),
},
},
},
},
Expand All @@ -85,8 +75,6 @@ module.exports = {
'../dist/scripts-variables.js.map',
'../dist/scripts-editor.js',
'../dist/scripts-editor.js.map',
'../dist/scripts-layout.js',
'../dist/scripts-layout.js.map',
],
}),
],
Expand Down
Loading