Skip to content

Commit b5cfc95

Browse files
committed
refactor: remove CSS code extracted to swift-css
Remove duplicated CSS functionality now in swift-css: - Delete Color types (DarkModeColor, ColorProperty, etc.) - Delete color property extensions (24 files) - Delete layout helpers (Flex, Margin, Padding, etc.) - Delete utilities (Border, Media, ListStyle, etc.) - Delete HTMLTheme (moved to CSS Theming) - Add HTMLColor typealias for backward compatibility - Use local path for swift-css dependency
1 parent 52147d9 commit b5cfc95

75 files changed

Lines changed: 23 additions & 6272 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Package.swift

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ import PackageDescription
44

55
extension String {
66
static let html: Self = "HTML"
7-
static let htmlTheme: Self = "HTMLTheme"
87
static let htmlComponents: Self = "HTMLComponents"
98
static let htmlKit: Self = "HTMLKit"
109
}
1110

1211
extension Target.Dependency {
1312
static var html: Self { .target(name: .html) }
14-
static var htmlTheme: Self { .target(name: .htmlTheme) }
1513
static var htmlComponents: Self { .target(name: .htmlComponents) }
1614
}
1715

1816
extension Target.Dependency {
1917
static var htmlStandard: Self { .product(name: "HTML Standard", package: "swift-html-standard") }
2018
static var htmlRendering: Self { .product(name: "HTML Rendering", package: "swift-html-rendering") }
2119
static var htmlRenderableTestSupport: Self { .product(name: "HTML Rendering TestSupport", package: "swift-html-rendering") }
20+
static var markdownHtmlRendering: Self { .product(name: "Markdown HTML Rendering", package: "swift-markdown-html-rendering") }
2221
static var css: Self { .product(name: "CSS", package: "swift-css") }
22+
static var cssTheming: Self { .product(name: "CSS Theming", package: "swift-css") }
2323
static var dependencies: Self { .product(name: "Dependencies", package: "swift-dependencies") }
2424
static var dependenciesTestSupport: Self { .product(name: "DependenciesTestSupport", package: "swift-dependencies") }
2525
static var orderedCollections: Self { .product(name: "OrderedCollections", package: "swift-collections") }
@@ -43,10 +43,9 @@ let package = Package(
4343
products: [
4444
// Individual targets
4545
.library(name: .html, targets: [.html]),
46-
.library(name: .htmlTheme, targets: [.htmlTheme]),
4746
.library(name: .htmlComponents, targets: [.htmlComponents]),
4847
// Convenience product with common features
49-
.library(name: .htmlKit, targets: [.html, .htmlTheme, .htmlComponents])
48+
.library(name: .htmlKit, targets: [.html, .htmlComponents])
5049
],
5150
traits: [
5251
.trait(
@@ -55,9 +54,10 @@ let package = Package(
5554
)
5655
],
5756
dependencies: [
58-
.package(url: "https://github.com/coenttb/swift-html-rendering", from: "0.1.0"),
59-
.package(url: "https://github.com/coenttb/swift-css", from: "0.1.0"),
60-
.package(url: "https://github.com/coenttb/swift-svg", from: "0.1.0"),
57+
.package(url: "https://github.com/coenttb/swift-html-rendering", from: "0.1.4"),
58+
.package(url: "https://github.com/coenttb/swift-markdown-html-rendering", from: "0.1.0"),
59+
.package(path: "../swift-css"),
60+
.package(url: "https://github.com/coenttb/swift-svg", from: "0.2.1"),
6161
.package(url: "https://github.com/coenttb/swift-translating", from: "0.0.1"),
6262
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.2"),
6363
.package(url: "https://github.com/apple/swift-collections", from: "1.1.2"),
@@ -74,6 +74,7 @@ let package = Package(
7474
dependencies: [
7575
.htmlRendering,
7676
.css,
77+
.markdownHtmlRendering,
7778
.htmlStandard,
7879
.dependencies,
7980
.orderedCollections,
@@ -93,20 +94,12 @@ let package = Package(
9394
.define("TRANSLATING", .when(traits: ["Translating"]))
9495
]
9596
),
96-
.target(
97-
name: .htmlTheme,
98-
dependencies: [
99-
.html,
100-
.dependencies,
101-
.standards,
102-
.incits4_1986
103-
]
104-
),
10597
.target(
10698
name: .htmlComponents,
10799
dependencies: [
108100
.html,
109-
.htmlTheme,
101+
.markdownHtmlRendering,
102+
.cssTheming,
110103
.dependencies,
111104
.orderedCollections
112105
]
@@ -127,13 +120,6 @@ let package = Package(
127120
.define("TRANSLATING", .when(traits: ["Translating"]))
128121
]
129122
),
130-
.testTarget(
131-
name: .htmlTheme.tests,
132-
dependencies: [
133-
.htmlTheme,
134-
.htmlRenderableTestSupport
135-
]
136-
),
137123
.testTarget(
138124
name: .htmlComponents.tests,
139125
dependencies: [

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ let page = div {
149149
swift-html is composed of several focused packages:
150150

151151
- **HTML** - Core HTML elements and rendering
152-
- **HTMLTheme** - Theming and color schemes
153152
- **HTMLComponents** - Reusable UI components
154153
- **HTMLMarkdown** - Markdown to HTML conversion
155154
- **HTMLEmail** - Email template generation
@@ -161,7 +160,7 @@ Import only what you need:
161160
```swift
162161
// Individual modules
163162
import HTML
164-
import HTMLTheme
163+
import CSS_Theming
165164
import HTMLComponents
166165

167166
// Or use the kit

Sources/HTML/CSS Enhancements/Alignment/AlignItems.swift

Lines changed: 0 additions & 14 deletions
This file was deleted.

Sources/HTML/CSS Enhancements/Border.swift

Lines changed: 0 additions & 34 deletions
This file was deleted.

Sources/HTML/CSS Enhancements/CSS/CSS+ColorProperty.swift

Lines changed: 0 additions & 116 deletions
This file was deleted.

Sources/HTML/CSS Enhancements/CSS/CSS+accentColor.swift

Lines changed: 0 additions & 49 deletions
This file was deleted.

Sources/HTML/CSS Enhancements/CSS/CSS+backgroundColor.swift

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)