Merge branch 'main' into android-docs

Author: marcprux

.gitignore

@@ -22,3 +22,6 @@ xcuserdata
 
 # VS Code files
 .vscode
+
+# Npm modules
+node_modules

.prettierignore

@@ -0,0 +1 @@
+assets/javascripts/new-javascripts/vendor/

.prettierrc

@@ -1,14 +1,7 @@
 {
-  "overrides": [
-    {
-      "files": [
-        "**/*.css",
-        "**/*.scss"
-      ],
-      "options": {
-        "tabWidth": 2,
-        "useTabs": false
-      }
-    }
-  ]
+  "tabWidth": 2,
+  "useTabs": false,
+  "singleQuote": true,
+  "semi": false,
+  "endOfLine": "lf"
 }

404.md

@@ -1,8 +1,10 @@
 ---
-layout: page-wide
-title: "Not Found"
+layout: new-layouts/base
+title: Internal Server Error
 permalink: /404.html
 ---
 
-The page you’re looking for can’t be found.
-
+<section class="section">
+    <h1>Not Found</h1>
+    The page you're looking for can’t be found.
+</section>

500.md

@@ -1,7 +1,10 @@
 ---
-layout: page-wide
-title: "Internal Server Error"
+layout: new-layouts/base
+title: Internal Server Error
 permalink: /500.html
 ---
 
-The server encountered an error and was unable to complete your request.
+<section class="section">
+    <h1>Internal Server Error</h1>
+    The server encountered an error and was unable to complete your request.
+</section>

Gemfile.lock

@@ -12,36 +12,11 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.17.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-aarch64-linux-musl)
-    ffi (1.17.0-arm-linux-gnu)
-    ffi (1.17.0-arm-linux-musl)
     ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86-linux-gnu)
-    ffi (1.17.0-x86-linux-musl)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-musl)
     forwardable-extended (2.6.0)
-    google-protobuf (4.28.3)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.28.3-aarch64-linux)
-      bigdecimal
-      rake (>= 13)
     google-protobuf (4.28.3-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.28.3-x86-linux)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.28.3-x86_64-darwin)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.28.3-x86_64-linux)
-      bigdecimal
-      rake (>= 13)
     http_parser.rb (0.8.0)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
@@ -86,84 +61,15 @@ GEM
     rexml (3.3.9)
     rouge (4.5.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.81.0)
-      google-protobuf (~> 4.28)
-      rake (>= 13)
-    sass-embedded (1.81.0-aarch64-linux-android)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-aarch64-linux-gnu)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-aarch64-linux-musl)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-aarch64-mingw-ucrt)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-arm-linux-androideabi)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-arm-linux-gnueabihf)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-arm-linux-musleabihf)
-      google-protobuf (~> 4.28)
     sass-embedded (1.81.0-arm64-darwin)
       google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-riscv64-linux-android)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-riscv64-linux-gnu)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-riscv64-linux-musl)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86-cygwin)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86-linux-android)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86-linux-gnu)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86-linux-musl)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86-mingw-ucrt)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86_64-cygwin)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86_64-darwin)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86_64-linux-android)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86_64-linux-gnu)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.81.0-x86_64-linux-musl)
-      google-protobuf (~> 4.28)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.6.0)
     webrick (1.9.0)
 
 PLATFORMS
-  aarch64-linux
-  aarch64-linux-android
-  aarch64-linux-gnu
-  aarch64-linux-musl
-  aarch64-mingw-ucrt
-  arm-linux-androideabi
-  arm-linux-gnu
-  arm-linux-gnueabihf
-  arm-linux-musl
-  arm-linux-musleabihf
   arm64-darwin
-  riscv64-linux-android
-  riscv64-linux-gnu
-  riscv64-linux-musl
-  ruby
-  x86-cygwin
-  x86-linux
-  x86-linux-android
-  x86-linux-gnu
-  x86-linux-musl
-  x86-mingw-ucrt
-  x86_64-cygwin
-  x86_64-darwin
-  x86_64-linux
-  x86_64-linux-android
-  x86_64-linux-gnu
-  x86_64-linux-musl
 
 DEPENDENCIES
   base64
@@ -174,4 +80,4 @@ DEPENDENCIES
   webrick (~> 1.7)
 
 BUNDLED WITH
-   2.5.23
+   2.5.23

README.md

@@ -31,10 +31,23 @@ To run the site locally, enter the following commands into a terminal window:
 git clone https://github.com/swiftlang/swift-org-website.git
 cd swift-org-website
 bundle install
-LC_ALL=en_us.UTF-8 bundle exec jekyll serve
+LC_ALL=en_us.UTF-8 bundle exec jekyll serve --config _config.yml,_config_dev.yml
 open "http://localhost:4000"
 ```
 
+If you’d like to contribute to this project, please run Prettier before submitting your pull request to ensure consistent code style across the project.
+
+Requirements
+- [Node v18.17.1 or higher](https://nodejs.org)
+
+```shell
+npm install
+```
+
+```shell
+npm run prettify
+```
+
 ### Running in Docker
 
 First build the site with Docker Compose:

_config.yml

@@ -2,7 +2,7 @@ url: https://swift.org
 title: Swift.org
 description: "Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns."
 timezone: America/Lower_Princes
-exclude: ["README.md", "config.ru", "Gemfile", "Gemfile.lock", "Procfile", "vendor"]
+exclude: ["README.md", "config.ru", "Gemfile", "Gemfile.lock", "Procfile", "vendor", "get-started/storybook"]
 safe: false
 future: true
 
@@ -29,3 +29,4 @@ whitelist:
 
 include:
  - .well-known
+ - assets/fonts

_config_dev.yml

@@ -0,0 +1 @@
+exclude: []

_data/authors.yml

@@ -103,7 +103,7 @@ shahmishal:
    email: [email protected]
    github: shahmishal
    gravatar: 231cec2cc45a272aa5b341b413fdc2ed
-   about: "Mishal Shah is an engineer on the Swift Infrastructure team at Apple."
+   about: "Mishal Shah is part of the Swift Core Team, the Swift Ecosystem steering group, and the Swift Website workgroup, among other roles. He oversees a team focused on compiler developer experience tooling at Apple."
 
 mikeash:
    name: Mike Ash
@@ -517,3 +517,22 @@ marcprux:
   github: marcprux
   about: "Marc Prud'hommeaux works on bringing Swift application development to Android at Skip.tools."
 
+rmondello:
+  name: Ricky Mondello
+  github: rmondello
+  about: "Ricky Mondello is a member of the engineering team at Apple working on the Passwords app, passkeys, and other authentication technologies."
+
+indravardhan:
+  name: Indravardhan Singh Shaktawat
+  github: indravardhan
+  about: "Indravardhan Singh Shaktawat is a member of the engineering team at Apple working on Password Monitoring and other Security Services."
+
+spencervd6:
+  name: Spencer Van Dyke
+  github: spencervd6
+  about: "Spencer Van Dyke is a member of the engineering team at Apple working on Password Monitoring and other Security Services."
+
+umeshbatra13:
+  name: Umesh Batra
+  github: umeshbatra13
+  about: "Umesh Batra is a member of the engineering team at Apple working on Password Monitoring and other Security Services."