Use post-css cli and move node files to .node

Author: kaishin

.node/package-lock.json

@@ -0,0 +1,13 @@
+{
+  "name": "swift-doc",
+  "browserslist": ["> 1%", "not dead"],
+  "scripts": {
+    "build": "postcss ../Assets/css/all.css -o ../Resources/all.min.css --config ./postcss.config.js -u cssnano",
+    "watch": "postcss -w ../Assets/**/*.css --dir ../Resources --config ./postcss.config.js "
+  },
+  "dependencies": {
+    "cssnano": "^4.1.10",
+    "postcss-cli": "^7.1.0",
+    "postcss-preset-env": "^6.7.0"
+  }
+}

.node/package.json

@@ -1,6 +1,5 @@
 module.exports = {
   plugins: [
-    require('autoprefixer'),
     require('postcss-preset-env')({
       stage: 0,
       features: {

postcss.config.js renamed to .node/postcss.config.js

@@ -246,11 +246,17 @@ jobs:
 ## Development
 ### Web Assets
 
-[Parcel](https://parceljs.org) is used to process Web assets such as CSS and JavaScript. To make changes, you need to have Node and a package manager such as `npm` installed. In the project root, run `npm install` to install the dependencies.
+To make changes to the CSS files, you need to have Node and a package manager such as `npm` installed. To get started:
 
-During development, run the following command in a terminal:
+```terminal
+$ cd .node
+$ npm install
+```
+
+To process the PostCSS files during development:
 
 ```terminal
+$ cd .node
 $ npm run watch
 ```
 

Assets/css/styles.css renamed to Assets/css/all.css

@@ -1,131 +1,130 @@
 import ArgumentParser
 import Foundation
+import SwiftDoc
+import SwiftMarkup
 import SwiftSemantics
 import struct SwiftSemantics.Protocol
-import SwiftMarkup
-import SwiftDoc
 
 extension SwiftDoc {
-    struct Generate: ParsableCommand {
-        enum Format: String, ExpressibleByArgument {
-            case commonmark
-            case html
-        }
+  struct Generate: ParsableCommand {
+    enum Format: String, ExpressibleByArgument {
+      case commonmark
+      case html
+    }
+
+    struct Options: ParsableArguments {
+      @Argument(help: "One or more paths to Swift files")
+      var inputs: [String]
+
+      @Option(name: [.long, .customShort("n")],
+              help: "The name of the module")
+      var moduleName: String
+
+      @Option(name: .shortAndLong,
+              default: ".build/documentation",
+              help: "The path for generated output")
+      var output: String
+
+      @Option(name: .shortAndLong,
+              default: .commonmark,
+              help: "The output format")
+      var format: Format
 
-        struct Options: ParsableArguments {
-            @Argument(help: "One or more paths to Swift files")
-            var inputs: [String]
+      @Option(name: .customLong("base-url"),
+              default: "/",
+              help: "The base URL used for all relative URLs in generated documents.")
+      var baseURL: String
+    }
+
+    static var configuration = CommandConfiguration(abstract: "Generates Swift documentation")
+
+    @OptionGroup()
+    var options: Options
+
+    func run() throws {
+      let module = try Module(name: options.moduleName, paths: options.inputs)
+
+      let outputDirectoryURL = URL(fileURLWithPath: options.output)
+      try fileManager.createDirectory(at: outputDirectoryURL, withIntermediateDirectories: true, attributes: fileAttributes)
 
-            @Option(name: [.long, .customShort("n")],
-                    help: "The name of the module")
-            var moduleName: String
+      do {
+        let format = options.format
 
-            @Option(name: .shortAndLong,
-                    default: ".build/documentation",
-                    help: "The path for generated output")
-            var output: String
+        var pages: [String: Page] = [:]
 
-            @Option(name: .shortAndLong,
-                    default: .commonmark,
-                    help: "The output format")
-            var format: Format
+        var globals: [String: [Symbol]] = [:]
+        for symbol in module.interface.topLevelSymbols.filter({ $0.isPublic }) {
+          switch symbol.api {
+          case is Class, is Enumeration, is Structure, is Protocol:
+            pages[path(for: symbol)] = TypePage(module: module, symbol: symbol)
+          case let `typealias` as Typealias:
+            pages[path(for: `typealias`.name)] = TypealiasPage(module: module, symbol: symbol)
+          case let function as Function where !function.isOperator:
+            globals[function.name, default: []] += [symbol]
+          case let variable as Variable:
+            globals[variable.name, default: []] += [symbol]
+          default:
+            continue
+          }
+        }
 
-            @Option(name: .customLong("base-url"),
-                    default: "/",
-                    help: "The base URL used for all relative URLs in generated documents.")
-            var baseURL: String
+        for (name, symbols) in globals {
+          pages[path(for: name)] = GlobalPage(module: module, name: name, symbols: symbols)
         }
 
-        static var configuration = CommandConfiguration(abstract: "Generates Swift documentation")
-
-        @OptionGroup()
-        var options: Options
-
-        func run() throws {
-            let module = try Module(name: options.moduleName, paths: options.inputs)
-
-            let outputDirectoryURL = URL(fileURLWithPath: options.output)
-            try fileManager.createDirectory(at: outputDirectoryURL, withIntermediateDirectories: true, attributes: fileAttributes)
-
-            do {
-                let format = options.format
-
-                var pages: [String: Page] = [:]
-
-                var globals: [String: [Symbol]] = [:]
-                for symbol in module.interface.topLevelSymbols.filter({ $0.isPublic }) {
-                    switch symbol.api {
-                    case is Class, is Enumeration, is Structure, is Protocol:
-                        pages[path(for: symbol)] = TypePage(module: module, symbol: symbol)
-                    case let `typealias` as Typealias:
-                        pages[path(for: `typealias`.name)] = TypealiasPage(module: module, symbol: symbol)
-                    case let function as Function where !function.isOperator:
-                        globals[function.name, default: []] += [symbol]
-                    case let variable as Variable:
-                        globals[variable.name, default: []] += [symbol]
-                    default:
-                        continue
-                    }
-                }
-
-                for (name, symbols) in globals {
-                    pages[path(for: name)] = GlobalPage(module: module, name: name, symbols: symbols)
-                }
-
-                guard !pages.isEmpty else { return }
-
-                if pages.count == 1, let page = pages.first?.value {
-                    let filename: String
-                    switch format {
-                    case .commonmark:
-                        filename = "Home.md"
-                    case .html:
-                        filename = "index.html"
-                    }
-
-                    let url = outputDirectoryURL.appendingPathComponent(filename)
-                    try page.write(to: url, format: format, baseURL: options.baseURL)
-                } else {
-                    switch format {
-                    case .commonmark:
-                        pages["Home"] = HomePage(module: module)
-                        pages["_Sidebar"] = SidebarPage(module: module)
-                        pages["_Footer"] = FooterPage()
-                    case .html:
-                        pages["Home"] = HomePage(module: module)
-                    }
-
-                    try pages.map { $0 }.parallelForEach {
-                        let filename: String
-                        switch format {
-                        case .commonmark:
-                            filename = "\($0.key).md"
-                        case .html where $0.key == "Home":
-                            filename = "index.html"
-                        case .html:
-                            filename = "\($0.key)/index.html"
-                        }
-
-                        let url = outputDirectoryURL.appendingPathComponent(filename)
-                        try $0.value.write(to: url, format: format, baseURL: options.baseURL)
-                    }
-                }
-
-                if case .html = format {
-                    let cssData = try fetchRemoteCSS()
-                    let cssURL = outputDirectoryURL.appendingPathComponent("all.css")
-                    try writeFile(cssData, to: cssURL)
-                }
-
-
-            } catch {
-                logger.error("\(error)")
+        guard !pages.isEmpty else { return }
+
+        if pages.count == 1, let page = pages.first?.value {
+          let filename: String
+          switch format {
+          case .commonmark:
+            filename = "Home.md"
+          case .html:
+            filename = "index.html"
+          }
+
+          let url = outputDirectoryURL.appendingPathComponent(filename)
+          try page.write(to: url, format: format, baseURL: options.baseURL)
+        } else {
+          switch format {
+          case .commonmark:
+            pages["Home"] = HomePage(module: module)
+            pages["_Sidebar"] = SidebarPage(module: module)
+            pages["_Footer"] = FooterPage()
+          case .html:
+            pages["Home"] = HomePage(module: module)
+          }
+
+          try pages.map { $0 }.parallelForEach {
+            let filename: String
+            switch format {
+            case .commonmark:
+              filename = "\($0.key).md"
+            case .html where $0.key == "Home":
+              filename = "index.html"
+            case .html:
+              filename = "\($0.key)/index.html"
             }
+
+            let url = outputDirectoryURL.appendingPathComponent(filename)
+            try $0.value.write(to: url, format: format, baseURL: options.baseURL)
+          }
         }
+
+        if case .html = format {
+          let cssData = try fetchRemoteCSS()
+          let cssURL = outputDirectoryURL.appendingPathComponent("all.css")
+          try writeFile(cssData, to: cssURL)
+        }
+
+      } catch {
+        logger.error("\(error)")
+      }
     }
+  }
 }
 
 func fetchRemoteCSS() throws -> Data {
-    let url = URL(string: "https://raw.githubusercontent.com/SwiftDocOrg/swift-doc/master/Resources/all.css")!
-    return try Data(contentsOf: url)
+  let url = URL(string: "https://raw.githubusercontent.com/SwiftDocOrg/swift-doc/master/Resources/all.min.css")!
+  return try Data(contentsOf: url)
 }