Skip to content
This repository was archived by the owner on Nov 19, 2023. It is now read-only.

Housekeeping and refactor - fixes issues #64 & #65. #1

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Housekeeping and refactor - fixes issues #64 & #65. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d363d45
rename/resolve deps
jkaunert May 27, 2023
0d6d1c2
re-enables remote SP
jkaunert May 27, 2023
431bc7f
refactor dep urls for merge
jkaunert May 29, 2023
b744cd6
Merge branch 'refactor-modules' into dev
jkaunert May 29, 2023
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
132 changes: 84 additions & 48 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ let package = Package(
.library(name: "WebModule", targets: ["WebModule"]),
],
dependencies: [
.package(url: "https://github.com/feathercms/feather-core", .branch("dev")),
.package(url: "https://github.com/feathercms/web-objects", .branch("main")),
.package(url: "https://github.com/feathercms/feather-core", .branch("dev")),
.package(url: "https://github.com/feathercms/web-objects", .branch("main")),
],
targets: [
.target(name: "WebModule", dependencies: [
.product(name: "Feather", package: "feather-core"),
.product(name: "FeatherCore", package: "feather-core"),
.product(name: "WebObjects", package: "web-objects"),
],
resources: [
Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Api/WebModuleKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Vapor
import Fluent
import Feather
import FeatherCore

public extension HookName {
static let installWebPages: HookName = "install-web-pages"
Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Controllers/Admin/WebMenuAdminController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Vapor
import Feather
import FeatherCore
import Fluent
import WebObjects

Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Controllers/Admin/WebMenuItemAdminController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Vapor
import Feather
import FeatherCore
import Fluent
import WebObjects

Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Controllers/Admin/WebPageAdminController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Vapor
import Feather
import FeatherCore
import Fluent
import WebObjects

Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Controllers/Admin/WebSettingsAdminController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Vapor
import Fluent
import Feather
import FeatherCore

struct WebSettingsAdminController {

Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Controllers/Apis/WebMenuApiController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Vapor
import Feather
import FeatherCore
import Fluent
import WebObjects

Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Controllers/Apis/WebMenuItemApiController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Vapor
import Feather
import FeatherCore
import Fluent
import WebObjects

Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Controllers/Apis/WebPageApiController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Vapor
import Feather
import FeatherCore
import Fluent
import WebObjects

Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Controllers/WebResponseController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Vapor
import Feather
import FeatherCore
import Fluent

struct WebResponseController {
Expand Down
2 changes: 1 addition & 1 deletion Sources/WebModule/Database/Models/WebMenuItemModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation
import Fluent
import Feather
import FeatherCore

final class WebMenuItemModel: FeatherDatabaseModel {
typealias Module = WebModule
Expand Down
Loading