Skip to content

Commit 8b8a1f4

Browse files
authored
Merge pull request #44 from Shopify/gg-new-skelly
Modernize Skeleton Theme with JSON templates and improved architecture
2 parents c11708f + fe60b25 commit 8b8a1f4

File tree

91 files changed

+2233
-10675
lines changed

Some content is hidden

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

91 files changed

+2233
-10675
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.json linguist-language=jsonc

.github/dependabot.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: CI
2+
on: [push]
3+
jobs:
4+
theme-check:
5+
name: Theme Check
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v4
9+
- name: Theme Check
10+
uses: shopify/theme-check-action@v2
11+
with:
12+
token: ${{ github.token }}

.github/workflows/cla.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
cla:
1111
runs-on: ubuntu-latest
1212
if: |
13-
(github.event.issue.pull_request
13+
(github.event.issue.pull_request
1414
&& !github.event.issue.pull_request.merged_at
1515
&& contains(github.event.comment.body, 'signed')
16-
)
16+
)
1717
|| (github.event.pull_request && !github.event.pull_request.merged)
1818
steps:
1919
- uses: Shopify/shopify-cla-action@v1

.gitignore

Lines changed: 7 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,3 @@
1-
# This file contains a list of files and folders to be ignored when
2-
# committing to a git repository. Ignored files are both Slate project
3-
# specific files as well as commonly ignored files on any project.
4-
5-
# For more information on this .gitignore files, see GitHub's
6-
# documentation: https://help.github.com/articles/ignoring-files/
7-
8-
# Project #
9-
###################
10-
node_modules
11-
dist
12-
upload
13-
deploy.log
14-
config/shopify.yml
15-
npm-debug.log
16-
.env
17-
.env.*
18-
19-
20-
# Compiled source #
21-
###################
22-
*.com
23-
*.class
24-
*.dll
25-
*.exe
26-
*.o
27-
*.so
28-
29-
# Packages #
30-
############
31-
# it's better to unpack these files and commit the raw source
32-
# git has its own built in compression methods
33-
*.7z
34-
*.dmg
35-
*.gz
36-
*.iso
37-
*.jar
38-
*.rar
39-
*.tar
40-
*.zip
41-
42-
# Logs and databases #
43-
######################
44-
*.log
45-
*.sql
46-
*.sqlite
47-
481
# OS generated files #
492
######################
503
.DS_Store
@@ -54,14 +7,11 @@ npm-debug.log
547
.Trashes
558
ehthumbs.db
569
Thumbs.db
10+
node_modules/
5711

58-
# Custom #
59-
######################
60-
*.sass-cache*
61-
.cache/*
62-
_site
63-
/.idea
64-
/.vscode
65-
secrets.json
66-
.jekyll-metadata
67-
.ruby-version
12+
# Shopify CLI files
13+
.shopify/
14+
15+
## Release files
16+
release
17+
*.zip

.shopifyignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# This file contains a list of files that will be excluded from Shopify CLI
2+
# operations such as push, pull, dev, etc.
3+
#
4+
# Examples:
5+
#
6+
# Ignore a specific file:
7+
# templates/product.json
8+
#
9+
# Ignore templates with a wildcard pattern:
10+
# templates/*.json
11+
#
12+
# Ignore templates and sections with a regular expression:
13+
# /(templates|sections)/.*\.json/

.theme-check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
extends: theme-check:recommended

.travis.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

CODE_OF_CONDUCT.md

Lines changed: 132 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,132 @@
1-
# Contributor Code of Conduct
2-
3-
As contributors and maintainers of this project, and in the interest of
4-
fostering an open and welcoming community, we pledge to respect all
5-
people who contribute through reporting issues, posting feature
6-
requests, updating documentation, submitting pull requests or patches,
7-
and other activities.
8-
9-
We are committed to making participation in this project a
10-
harassment-free experience for everyone, regardless of level of
11-
experience, gender, gender identity and expression, sexual orientation,
12-
disability, personal appearance, body size, race, ethnicity, age,
13-
religion, or nationality.
14-
15-
Examples of unacceptable behavior by participants include:
16-
17-
* The use of sexualized language or imagery
18-
* Personal attacks
19-
* Trolling or insulting/derogatory comments
20-
* Public or private harassment
21-
* Publishing other's private information, such as physical or electronic
22-
addresses, without explicit permission
23-
* Other unethical or unprofessional conduct
24-
25-
Project maintainers have the right and responsibility to remove, edit,
26-
or reject comments, commits, code, wiki edits, issues, and other
27-
contributions that are not aligned to this Code of Conduct, or to ban
28-
temporarily or permanently any contributor for other behaviors that they
29-
deem inappropriate, threatening, offensive, or harmful.
30-
31-
By adopting this Code of Conduct, project maintainers commit themselves
32-
to fairly and consistently applying these principles to every aspect of
33-
managing this project. Project maintainers who do not follow or enforce
34-
the Code of Conduct may be permanently removed from the project team.
35-
36-
This Code of Conduct applies both within project spaces and in public
37-
spaces when an individual is representing the project or its community.
38-
39-
Instances of abusive, harassing, or otherwise unacceptable behavior may
40-
be reported by contacting a project maintainer at <slate@shopify.com>. All complaints will be reviewed and investigated and will
41-
result in a response that is deemed necessary and appropriate to the
42-
circumstances. Maintainers are obligated to maintain confidentiality
43-
with regard to the reporter of an incident.
44-
45-
This Code of Conduct is adapted from the Contributor Covenant, version
46-
1.3.0, available from http://contributor-covenant.org/version/1/3/0/
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, caste, color, religion, or sexual
10+
identity 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 overall
26+
community
27+
28+
Examples of unacceptable behavior include:
29+
30+
- The use of sexualized language or imagery, and sexual attention or advances of
31+
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 address,
35+
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 email 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+
opensource@shopify.com.
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 of
86+
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 permanent
93+
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 the
113+
community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.1, available at
119+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
120+
121+
Community Impact Guidelines were inspired by
122+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
123+
124+
For answers to common questions about this code of conduct, see the FAQ at
125+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
126+
[https://www.contributor-covenant.org/translations][translations].
127+
128+
[homepage]: https://www.contributor-covenant.org
129+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
130+
[Mozilla CoC]: https://github.com/mozilla/diversity
131+
[FAQ]: https://www.contributor-covenant.org/faq
132+
[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,24 @@
1-
# How to contribute
1+
# Contributing to Skeleton Theme
22

3-
We ❤️ pull requests. If you'd like to fix a bug, contribute a feature or just correct a typo, please feel free to do so, as long as you follow our [Code of Conduct](https://github.com/Shopify/skeleton-theme/blob/master/CODE_OF_CONDUCT.md).
3+
## How to contribute
44

5-
If you're thinking of adding a big new feature, consider opening an issue first to discuss it to ensure it aligns to the direction of the project (and potentially save yourself some time!).
5+
We ❤️ pull requests. If you'd like to fix a bug, contribute a feature, or just correct a typo, feel free to do so, as long as you follow our [Code of Conduct](./CODE_OF_CONDUCT.md).
66

7-
## Getting Started
7+
If you're thinking of adding a new feature or proposing a new pattern across the theme, please consider opening an issue first. This will allow us to discuss your idea, ensure it aligns with the project's direction, and potentially save you some time.
88

9-
To start working on the codebase, first fork the repo, then clone it:
9+
For your contribution to be accepted, you'll need to sign the [Shopify Contributor License Agreement (CLA)](https://cla.shopify.com/).
1010

11-
```
12-
git clone git@github.com:your-username/skeleton-theme.git
13-
```
11+
## Standards
1412

15-
_Note: replace "your-username" with your GitHub handle_
13+
* This codebase must be minimalist, not a fully featured theme.
14+
* This theme must provide a common foundational starting point for most developers.
15+
* Do not include or reference legacy or non-recommended features.
16+
* All changes must preserve the principles defined in the README.
1617

17-
Install all package dependencies and link local packages:
18+
## Steps to contribute
1819

19-
```
20-
yarn install
21-
```
22-
23-
Write some features!
24-
25-
## Documentation
26-
27-
If your change affects how people use the project (i.e. adding or removing
28-
functionality, changing the return value of a function, etc),
29-
please ensure the documentation is also updated to
30-
reflect this.
20+
1. Fork the repository: [https://github.com/Shopify/skeleton-theme/fork](https://github.com/Shopify/skeleton-theme/fork)
21+
2. Create your feature branch: `git checkout -b my-new-feature`
22+
3. Commit your changes: `git commit -am 'Add some feature'`
23+
4. Push to your branch: `git push origin my-new-feature`
24+
5. Create a new Pull Request

0 commit comments

Comments
 (0)