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 .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://unpkg.com/@changesets/config@1.7.0/schema.json",
"$schema": "https://unpkg.com/@changesets/config@3.1.3/schema.json",
"changelog": [
"@changesets/changelog-github",
{
Expand Down
53 changes: 0 additions & 53 deletions .github/ISSUE_TEMPLATE/Bug_report.md

This file was deleted.

28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE/Feature_request.md

This file was deleted.

25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Bug Report
description: Something isn't working right
body:
- type: input
id: version
attributes:
label: Version
description: "`npm ls <package-name>`"
placeholder: "0.0.0"
validations:
required: true
- type: textarea
id: description
attributes:
label: Description
description: What happened, and what did you expect instead?
validations:
required: true
- type: textarea
id: reproduction
attributes:
label: Reproduction
description: Minimal code or steps to reproduce.
validations:
required: true
Comment thread
DylanPiercey marked this conversation as resolved.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Feature Request
description: Suggest an idea for this project
body:
- type: textarea
id: description
attributes:
label: Description
description: What would you like to see, and why?
validations:
required: true
32 changes: 2 additions & 30 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,2 @@
<!--- Provide a general summary of your changes in the Title above -->

## Scope

<!-- Which package does this PR affect? -->

## Description

<!--- Describe your changes in detail. Include the package name if applicable. -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

<!--- If it fixes an open issue, please link to the issue here. -->

## Screenshots (if appropriate):

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->

<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] I have updated/added documentation affected by my changes.
- [ ] I have added tests to cover my changes.

<!--
Disclaimer: Contributions via GitHub pull requests are gladly accepted from their original author. Along with any pull requests, please state that the contribution is your original work and that you license the work to the project under the project's open source license. Whether or not you state this explicitly, by submitting any copyrighted material via pull request, email, or other means you agree to license the material under the project's open source license and warrant that you have the legal authority to do so.
-->
<!-- Describe your changes. -->
<!-- Fixes #000 -->
20 changes: 20 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly
groups:
all:
patterns: ["*"]
- package-ecosystem: npm
directory: /
schedule:
interval: weekly
groups:
minor:
patterns: ["*"]
update-types: ["minor", "patch"]
major:
patterns: ["*"]
update-types: ["major"]
42 changes: 25 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,28 @@ on:
push:
branches: [main]

concurrency:
group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
cancel-in-progress: true

jobs:
lint:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v6
- name: Use node
- name: Install node
id: node
uses: actions/setup-node@v6
with:
node-version: 24
node-version: lts/*
cache: npm
- name: Install dependencies
- name: Install packages (node@${{ steps.node.outputs.node-version }})
run: npm ci
- name: Format Code
run: npm run lint
- name: Run build
run: npm run @ci:build
- name: Run lint
run: npm run @ci:lint
test:
runs-on: ubuntu-latest
name: "test: node@${{ matrix.node }}"
Expand All @@ -31,18 +38,19 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v6
- name: Use node@${{ matrix.node }}
- name: Install node
id: node
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node }}
cache: npm
- name: Install dependencies
- name: Install packages (node@${{ steps.node.outputs.node-version }})
run: npm ci
- name: Run tests
run: xvfb-run -a npm test
run: xvfb-run -a npm run @ci:test
release:
runs-on: ubuntu-latest
needs: [lint, test]
needs: [build, test]
if: "${{ github.repository_owner == 'marko-js' && github.event_name == 'push' }}"
permissions:
id-token: write
Expand All @@ -51,19 +59,19 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v6
- name: Use node
- name: Install node
id: node
uses: actions/setup-node@v6
with:
node-version: 24
node-version: lts/*
cache: npm
- name: Install dependencies
- name: Install packages (node@${{ steps.node.outputs.node-version }})
run: npm ci
- name: Release
id: changesets
- name: Run release
uses: changesets/action@v1
with:
version: npm run version
publish: npm run release
version: npm run @ci:version
publish: npm run @ci:release
commit: "[ci] release"
title: "[ci] release"
env:
Expand Down
24 changes: 5 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
# Editor
*.sublime*
.vscode/settings.json

# OSX
*.DS_Store

# NPM
node_modules

# Build
dist
*.marko.js
.vscode
*.actual*
*.DS_Store
*.tsbuildinfo
**/.vscode-test

# Logging
*.log

# Coverage
coverage
.nyc_output
dist
node_modules
npm-debug.log
7 changes: 0 additions & 7 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
.vscode*
.nyc_output
package.json
package-lock.json
CHANGELOG.md
**/node_modules
coverage
dist
__snapshots__
10 changes: 2 additions & 8 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
{
"overrides": [
{
"files": "*rc",
"options": {
"parser": "json"
}
}
]
"$schema": "https://json.schemastore.org/prettierrc",
"plugins": ["prettier-plugin-packagejson"]
}
4 changes: 2 additions & 2 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@
"Webstorm"
],
"ignoreRegExpList": [],
"files": ["*", "src/**/*"],
"ignorePaths": ["dist", "**/CHANGELOG.md"]
"files": ["**/*.{md,ts,marko}"],
"ignorePaths": ["**/dist", "**/node_modules", "**/CHANGELOG.md"]
}
15 changes: 5 additions & 10 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
import eslint from "@eslint/js";
import { defineConfig } from "eslint/config";
import sortImportPlugin from "eslint-plugin-simple-import-sort";
import globals from "globals";
import tseslint from "typescript-eslint";

export default tseslint.config(
export default defineConfig(
{
ignores: [
".nyc_output",
"**/.vscode*",
"**/__snapshots__",
"**/*dist/",
"coverage",
"node_modules",
],
ignores: [".vscode", "coverage", "**/dist", "**/__snapshots__"],
},
eslint.configs.recommended,
...tseslint.configs.recommended,
tseslint.configs.recommended,
{
languageOptions: {
globals: {
Expand All @@ -38,6 +32,7 @@ export default tseslint.config(
"@typescript-eslint/no-require-imports": "off",
"@typescript-eslint/no-unused-expressions": "off",
"@typescript-eslint/no-unused-vars": "off",
"no-useless-assignment": "off",
"simple-import-sort/exports": "error",
"simple-import-sort/imports": "error",
},
Expand Down
Loading