Skip to content

Commit 3846121

Browse files
kishikawakatsumikishikawakatsumi
committed
Redesign
1 parent 0e32cee commit 3846121

Some content is hidden

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

46 files changed

+7852
-1658
lines changed

‎.github/workflows/test.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
branches: [master]
55
workflow_dispatch:
66

7+
env:
8+
FONTAWESOME_TOKEN: ${{ secrets.FONTAWESOME_TOKEN }}
9+
710
jobs:
811
test:
912
runs-on: ubuntu-latest
@@ -12,4 +15,4 @@ jobs:
1215
- name: Build
1316
run: |
1417
set -ex
15-
docker build --rm --no-cache .
18+
docker build --rm --no-cache --build-arg FONTAWESOME_TOKEN=${{ env.FONTAWESOME_TOKEN }} .

‎.swiftpm/xcode/xcshareddata/xcschemes/swift-ast-explorer.xcscheme

-116
This file was deleted.

‎.vscode/launch.json

+8-15
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,22 @@
33
{
44
"type": "lldb",
55
"request": "launch",
6-
"name": "Debug Run",
7-
"program": "${workspaceFolder:swift-ast-explorer}/.build/debug/Run",
6+
"sourceLanguages": ["swift"],
7+
"name": "Debug App",
8+
"program": "${workspaceFolder:swift-ast-explorer}/.build/debug/App",
89
"args": [],
910
"cwd": "${workspaceFolder:swift-ast-explorer}",
10-
"preLaunchTask": "swift: Build Debug Run"
11+
"preLaunchTask": "swift: Build Debug App"
1112
},
1213
{
1314
"type": "lldb",
1415
"request": "launch",
15-
"name": "Release Run",
16-
"program": "${workspaceFolder:swift-ast-explorer}/.build/release/Run",
16+
"sourceLanguages": ["swift"],
17+
"name": "Release App",
18+
"program": "${workspaceFolder:swift-ast-explorer}/.build/release/App",
1719
"args": [],
1820
"cwd": "${workspaceFolder:swift-ast-explorer}",
19-
"preLaunchTask": "swift: Build Release Run"
20-
},
21-
{
22-
"type": "lldb",
23-
"request": "launch",
24-
"name": "Test swift-ast-explorer",
25-
"program": "/Applications/Xcode.app/Contents/Developer/usr/bin/xctest",
26-
"args": [".build/debug/swift-ast-explorerPackageTests.xctest"],
27-
"cwd": "${workspaceFolder:swift-ast-explorer}",
28-
"preLaunchTask": "swift: Build All"
21+
"preLaunchTask": "swift: Build Release App"
2922
}
3023
]
3124
}

‎CODE_OF_CONDUCT.md

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
- Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
- The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
- Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
[@kishikawakatsumi](https://github.com/kishikawakatsumi).
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

‎Dockerfile

+36-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,50 @@
1+
FROM node:lts-slim as node
2+
3+
WORKDIR /build
4+
5+
ARG FONTAWESOME_TOKEN
6+
COPY package*.json ./
7+
RUN echo "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_TOKEN}" > ./.npmrc \
8+
&& npm ci \
9+
&& rm -f ./.npmrc
10+
11+
COPY webpack.*.js ./
12+
COPY Public ./Public/
13+
RUN npx webpack --config webpack.prod.js
14+
15+
116
FROM swift:5.8.0-focal as build
217
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
3-
&& apt-get -q update && apt-get -q dist-upgrade -y && rm -r /var/lib/apt/lists/*
18+
&& apt-get -q update \
19+
&& apt-get -q dist-upgrade -y\
20+
&& rm -rf /var/lib/apt/lists/*
421

522
WORKDIR /build
23+
COPY --from=node /build /build
624
COPY ./Package.* ./
725
RUN swift package resolve
26+
827
COPY . .
9-
RUN swift build -c release
28+
RUN swift build -c release --static-swift-stdlib
1029

1130
WORKDIR /staging
12-
RUN cp "$(swift build --package-path /build -c release --show-bin-path)/Run" ./ \
13-
&& mv /build/Public ./Public && chmod -R a-w ./Public \
14-
&& mv /build/Resources ./Resources && chmod -R a-w ./Resources
31+
32+
RUN cp "$(swift build --package-path /build -c release --show-bin-path)/App" ./
33+
34+
RUN find -L "$(swift build --package-path /build -c release --show-bin-path)/" -regex '.*\.resources$' -exec cp -Ra {} ./ \;
35+
36+
RUN [ -d /build/Public ] && { mv /build/Public ./Public && chmod -R a-w ./Public; } || true
37+
RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w ./Resources; } || true
38+
1539

1640
FROM swift:5.8.0-focal
1741
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
18-
&& apt-get -q update && apt-get -q dist-upgrade -y && rm -r /var/lib/apt/lists/*
42+
&& apt-get -q update \
43+
&& apt-get -q dist-upgrade -y \
44+
&& apt-get -q install -y \
45+
ca-certificates \
46+
tzdata \
47+
&& rm -r /var/lib/apt/lists/*
1948

2049
RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
2150

@@ -25,5 +54,5 @@ COPY --from=build --chown=vapor:vapor /staging /app
2554
USER vapor:vapor
2655
EXPOSE $PORT
2756

28-
ENTRYPOINT ["./Run"]
57+
ENTRYPOINT ["./App"]
2958
CMD ["serve", "--env", "production", "--hostname", "0.0.0.0"]

0 commit comments

Comments
 (0)