Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.git
node_modules
dist
_site
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ indent_size = 4

[*.scss]
indent_style = space
indent_size = 4
indent_size = 2

[*.yml]
indent_style = space
Expand Down
3 changes: 1 addition & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
dist/**
!.eleventy.js
_site/**
31 changes: 31 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
"use strict";

module.exports = {
extends: [
"fluid",
"plugin:yml/standard",
"plugin:markdown/recommended"
],
ignorePatterns: ["_site/", "backstop_data/", "!.*.cjs", "!.*.js", "!.github/"],
env: {
amd: true,
browser: true,
node: true,
es6: true
},
parserOptions: {
ecmaVersion: 2020
},
overrides: [
{
files: ["src/assets/scripts/app.js", "src/assets/scripts/**/*.module.js"],
parserOptions: {
sourceType: "module"
}
},
{
files: ["**/*.md"],
processor: "markdown/markdown"
}
]
};
21 changes: 0 additions & 21 deletions .eslintrc.json

This file was deleted.

46 changes: 0 additions & 46 deletions .fluidlintallrc.json

This file was deleted.

25 changes: 17 additions & 8 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,46 @@ assignees: ''
---

## Describe the bug

A clear and concise description of what the bug is.

### To reproduce

Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

### Expected behavior

A clear and concise description of what you expected to happen.

## Screenshots

If applicable, add screenshots to help explain your problem.

## Technical details

### Desktop
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

### Smartphone / tablet
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

### Smartphone / tablet

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

### Assistive technology used

- Name: [Name of assistive technology]
- Version: [e.g. 22]

## Additional context or notes

Add any other context about the problem here.
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ assignees: ''
---

## Is your feature request related to a problem?

A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

## Describe the solution you'd like

A clear and concise description of what you want to happen.

## Describe alternative solutions you've considered

A clear and concise description of any alternative solutions or features you've considered.

## Additional context or notes

Add any other context or screenshots about the feature request here.
20 changes: 7 additions & 13 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
# Enable version updates for npm
- package-ecosystem: npm
# Look for `package.json` and `lock` files in the `root` directory
directory: "/"
# Check for updates once a month
directory: /
schedule:
interval: monthly
allow:
# Allow direct updates only (for packages named in package.json)
- dependency-type: direct
- dependency-type: production
ignore:
- dependency-name: husky
versions: [">=5"]
- dependency-name: react
versions: [">16"]
- dependency-name: stylelint
versions: [">14"]
- dependency-name: stylelint-config-standard-scss
versions: [">7"]
- package-ecosystem: github-actions
directory: /
schedule:
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Docker build

on:
pull_request:
branches: [main]

jobs:
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Build with Docker
run: docker build .

17 changes: 8 additions & 9 deletions .github/workflows/ci.yml → .github/workflows/lint-build.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Test and build
name: Lint and build

on:
pull_request:
branches: [ main ]
branches: [main]

jobs:
test-and-build:
lint-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -15,16 +15,15 @@ jobs:
path: node_modules
key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
- name: Install dependencies
run: |
npm i
run: npm install
env:
CI: true
- name: Lint files
run: |
npm run lint
run: npm run lint
env:
CI: true
- name: Build site
run: |
npm run build
run: npm run build
env:
CI: true

17 changes: 17 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Publish release

on:
push:
branches: [main]

jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: google-github-actions/release-please-action@v3
id: release
with:
token: ${{ secrets.GITHUB_TOKEN }}
release-type: node
package-name: "@codelearncreate/weavly.org"
pull-request-title-pattern: "chore(release): release${component} ${version}"
15 changes: 0 additions & 15 deletions .github/workflows/release.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
node_modules
dist
src/_data/assets.json
_site
.DS_Store

# Local Netlify folder
.netlify
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run lint
npx --no lint-staged
6 changes: 6 additions & 0 deletions .markdownlint-cli2.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
"use strict";

module.exports = {
config: require("./node_modules/markdownlint-config-fluid/.markdownlintrc.json"),
ignores: ["node_modules", "src/*.md", "src/collections", "CHANGELOG.md"]
};
12 changes: 0 additions & 12 deletions .prettierrc.json

This file was deleted.

18 changes: 18 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
"use strict";

module.exports = {
extends: ["stylelint-config-fluid", "stylelint-config-standard-scss"],
customSyntax: "postcss-scss",
plugins: ["stylelint-use-logical-spec"],
ignoreFiles: ["_site/**/*.{css,scss}"],
rules: {
"no-descending-specificity": null,
"custom-property-pattern": null,
"import-notation": "string",
"selector-class-pattern": null,
"liberty/use-logical-spec": [
"always",
{ except: ["float", "top", "left", "right", "bottom"] }
]
}
};
9 changes: 0 additions & 9 deletions .stylelintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ RUN npm run build

FROM nginx:1.18.0-alpine

COPY --from=builder /app/dist /usr/share/nginx/html
COPY --from=builder /app/_site /usr/share/nginx/html
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ The website will be available at [http://localhost:8080](http://localhost:8080).

## Notes

Modifications can be made to any source file or directory except for the contents of the `./dist/` directory. The
`./dist/` directory is not versioned since it contains the built website that Eleventy generates from the source files,
and files in `dist` are overwritten at build time.
Modifications can be made to any source file or directory except for the contents of the `./_site/` directory. The
`./_site/` directory is not versioned since it contains the built website that Eleventy generates from the source files,
and files in `_site` are overwritten at build time.

## License

Expand Down
Loading