Skip to content

Commit

Permalink
Feather 1.0.0-beta.3 (FeatherCMS#31)
Browse files Browse the repository at this point in the history
* FeatherCore 1.0.0-beta.13.1
* Every module is now integrated as a dependency
* Menu module moved to core
* CSS & template improvements
* README updates & license
  • Loading branch information
tib authored Nov 27, 2020
1 parent 11f0ccf commit 609940d
Show file tree
Hide file tree
Showing 87 changed files with 1,187 additions and 3,218 deletions.
Binary file modified Assets/GitHub-Lead.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004

Copyright (C) 2018-2020 Binary Birds

Authors:

Tibor Bodecs <mail.tib@gmail.com>

Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.

DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. You just DO WHAT THE FUCK YOU WANT TO.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CUR_DIR = $(CURDIR)

run:
swift run Run serve --port 8080
swift run Run

env:
echo 'BASE_URL="http://0.0.0.0:8080"' > .env.development
Expand Down
52 changes: 44 additions & 8 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
"version": "1.0.0"
}
},
{
"package": "analytics-module",
"repositoryURL": "https://github.com/feather-modules/analytics",
"state": {
"branch": null,
"revision": "9413466ff29e3e284a8c6938e1e3c57e6b370747",
"version": "1.0.0-beta.3.1"
}
},
{
"package": "async-http-client",
"repositoryURL": "https://github.com/swift-server/async-http-client.git",
Expand Down Expand Up @@ -51,8 +60,8 @@
"repositoryURL": "https://github.com/binarybirds/feather-core",
"state": {
"branch": null,
"revision": "ec4412f136f37fe69e0efd876aaa78e390686f2e",
"version": "1.0.0-beta.10"
"revision": "41909328b680b52d58a56757cebb0174c68278ab",
"version": "1.0.0-beta.13.1"
}
},
{
Expand Down Expand Up @@ -163,6 +172,15 @@
"version": "1.1.0"
}
},
{
"package": "markdown-module",
"repositoryURL": "https://github.com/feather-modules/markdown",
"state": {
"branch": null,
"revision": "94db5406c156ff6408850dc62c89e000aa440254",
"version": "1.0.0-beta.1"
}
},
{
"package": "routing-kit",
"repositoryURL": "https://github.com/vapor/routing-kit.git",
Expand All @@ -181,6 +199,15 @@
"version": "0.15.0"
}
},
{
"package": "sponsor-module",
"repositoryURL": "https://github.com/feather-modules/sponsor",
"state": {
"branch": null,
"revision": "ae77962524f253625da22f15ec5e9ae730599904",
"version": "1.0.0-beta.3.2"
}
},
{
"package": "sql-kit",
"repositoryURL": "https://github.com/vapor/sql-kit.git",
Expand Down Expand Up @@ -285,17 +312,26 @@
"repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
"state": {
"branch": null,
"revision": "bb56586c4cab9a79dce6ec4738baddb5802c5de7",
"version": "1.9.0"
"revision": "5a352330c09a323e59ebd99afdf4ca3964c217bc",
"version": "1.9.1"
}
},
{
"package": "swifty-module",
"repositoryURL": "https://github.com/feather-modules/swifty",
"state": {
"branch": null,
"revision": "cdead1a40f3d6eb0bdbeb1304527660cf4c18ed5",
"version": "1.0.0-beta.1"
}
},
{
"package": "UAParserSwift",
"repositoryURL": "https://github.com/malcommac/UAParserSwift",
"state": {
"branch": null,
"revision": "48dd6b3dbb96fd8da53e8f71d96c515bf7d7480b",
"version": "1.2.0"
"revision": "a8057c7cff60db2cdf31d0a0a68ce430754ab64e",
"version": "1.2.1"
}
},
{
Expand All @@ -321,8 +357,8 @@
"repositoryURL": "https://github.com/binarybirds/viper-kit",
"state": {
"branch": null,
"revision": "56f1404e64ede213c399f5a33aaa60b1ff5adddf",
"version": "1.5.0-beta.6"
"revision": "dc4598b3a2bf882af7759ddb54081c9f84bbd93e",
"version": "1.5.0-beta.7"
}
},
{
Expand Down
40 changes: 16 additions & 24 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PackageDescription
let package = Package(
name: "feather",
platforms: [
.macOS(.v11)
.macOS(.v10_15)
],
products: [
.executable(name: "Run", targets: ["Run"]),
Expand All @@ -13,24 +13,20 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/binarybirds/feather-core", from: "1.0.0-beta"),
// .package(url: "https://github.com/binarybirds/feather-core", .branch("main")),
.package(url: "https://github.com/binarybirds/leaf-foundation", from: "1.0.0-beta"),
/// drivers
.package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.0.0"),
.package(url: "https://github.com/binarybirds/liquid-local-driver", from: "1.0.0"),

// .package(name: "redirect-module", url: "https://github.com/feather-modules/redirect", .branch("main")),
// .package(name: "sponsor-module", url: "https://github.com/feather-modules/sponsor", .branch("main")),
// .package(name: "static-module", url: "https://github.com/feather-modules/static", .branch("main")),
// .package(name: "blog-module", url: "https://github.com/feather-modules/blog", .branch("main")),
// .package(name: "swifty-module", url: "https://github.com/feather-modules/swifty", .branch("main")),
// .package(name: "markdown-module", url: "https://github.com/feather-modules/markdown", .branch("main")),

.package(url: "https://github.com/malcommac/UAParserSwift", from: "1.2.0"),
.package(name: "ALanguageParser", url: "https://github.com/matsoftware/accept-language-parser", from: "1.0.0"),

.package(url: "https://github.com/JohnSundell/Splash", from: "0.15.0"),
.package(url: "https://github.com/JohnSundell/Ink", from: "0.5.0"),
// .package(name: "redirect-module", url: "https://github.com/feather-modules/redirect", from: "1.0.0-beta"),
// .package(name: "static-module", url: "https://github.com/feather-modules/static", from: "1.0.0-beta"),
// .package(name: "blog-module", url: "https://github.com/feather-modules/blog", from: "1.0.0-beta"),
// .package(name: "site-module", url: "https://github.com/feather-modules/site", from: "1.0.0-beta"),
// .package(name: "menu-module", url: "https://github.com/feather-modules/menu", from: "1.0.0-beta"),
.package(name: "swifty-module", url: "https://github.com/feather-modules/swifty", from: "1.0.0-beta"),
.package(name: "markdown-module", url: "https://github.com/feather-modules/markdown", from: "1.0.0-beta"),
.package(name: "analytics-module", url: "https://github.com/feather-modules/analytics", from: "1.0.0-beta"),
.package(name: "sponsor-module", url: "https://github.com/feather-modules/sponsor", from: "1.0.0-beta"),
],
targets: [
.target(name: "App", dependencies: [
Expand All @@ -43,21 +39,17 @@ let package = Package(

/// modules
// .product(name: "RedirectModule", package: "redirect-module"),
// .product(name: "SponsorModule", package: "sponsor-module"),
// .product(name: "StaticModule", package: "static-module"),
// .product(name: "BlogModule", package: "blog-module"),
// .product(name: "SwiftyModule", package: "swifty-module"),
// .product(name: "MarkdownModule", package: "markdown-module"),

.product(name: "UAParserSwift", package: "UAParserSwift"),
.product(name: "ALanguageParser", package: "ALanguageParser"),
// .product(name: "SiteModule", package: "site-module"),
// .product(name: "MenuModule", package: "menu-module"),
.product(name: "SwiftyModule", package: "swifty-module"),
.product(name: "MarkdownModule", package: "markdown-module"),
.product(name: "AnalyticsModule", package: "analytics-module"),
.product(name: "SponsorModule", package: "sponsor-module"),

.product(name: "Splash", package: "Splash"),
.product(name: "Ink", package: "Ink"),

.product(name: "Vapor", package: "vapor"),
], exclude: [
"Modules/Analytics/Bundle",
"Modules/Blog/Bundle",
"Modules/Menu/Bundle",
"Modules/Redirect/Bundle",
Expand Down
Loading

0 comments on commit 609940d

Please sign in to comment.