Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release parser, v0.1.0, test changeset #5744

Merged
merged 32 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3eaf8b7
feat: Add changesets
sidharthv96 Aug 21, 2024
dd5866a
chore: Add changeset workflow
sidharthv96 Aug 22, 2024
03d6531
chore: Revert package versions to match master
sidharthv96 Aug 22, 2024
6e4b349
chore: Ignore packages in changeset
sidharthv96 Aug 22, 2024
90364a0
docs: Add changeset
sidharthv96 Aug 22, 2024
0cf639c
Merge branch 'develop' into sidv/changesets
sidharthv96 Aug 22, 2024
36444ab
Update access
sidharthv96 Aug 22, 2024
d0ea3dd
chore: Update release command
sidharthv96 Aug 22, 2024
7a1c25b
[autofix.ci] apply automated fixes
autofix-ci[bot] Aug 22, 2024
c61159b
Update release command
sidharthv96 Aug 22, 2024
c3ca401
Merge branch 'sidv/changesets' of https://github.com/mermaid-js/merma…
sidharthv96 Aug 22, 2024
8815e44
Merge branch 'develop' into sidv/changesets
sidharthv96 Aug 22, 2024
6e7a24e
Update version and publish scripts
sidharthv96 Aug 22, 2024
fc44d1f
[autofix.ci] apply automated fixes
autofix-ci[bot] Aug 22, 2024
7debe2f
Split changesets
sidharthv96 Aug 22, 2024
89c782c
Merge branch 'sidv/changesets' of https://github.com/mermaid-js/merma…
sidharthv96 Aug 22, 2024
c892a89
Mark @mermaid-js/mermaid-example-diagram as private
sidharthv96 Aug 22, 2024
c4b9206
chore: Copy readme before publish
sidharthv96 Aug 22, 2024
3d9a24d
chore: Remove prePublishOnly
sidharthv96 Aug 22, 2024
61632f2
verify Docs version before publish
sidharthv96 Aug 22, 2024
cc545f4
Update changelog format
sidharthv96 Aug 22, 2024
598de70
Remove changesets
sidharthv96 Aug 22, 2024
eac8459
Add changeset to PR template
sidharthv96 Aug 22, 2024
283ec73
Remove release drafter
sidharthv96 Aug 22, 2024
5ed5274
chore: Revert version changes
sidharthv96 Aug 22, 2024
0c316d9
chore: Revert version changes
sidharthv96 Aug 22, 2024
9dcda25
Merge branch 'develop' into sidv/changesets
sidharthv96 Aug 22, 2024
9c03264
Merge branch 'develop' into sidv/changesets
sidharthv96 Aug 22, 2024
ad12fa7
Fix config
sidharthv96 Aug 22, 2024
ea9a061
Merge pull request #5733 from mermaid-js/sidv/changesets
sidharthv96 Aug 23, 2024
078038b
Merge branch 'master' into develop
knsv Aug 23, 2024
5013484
Release parser, v0.1.0, test changeset
sidharthv96 Aug 23, 2024
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
8 changes: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
12 changes: 12 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": ["@changesets/changelog-github", { "repo": "mermaid-js/mermaid" }],
"commit": false,
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "master",
"updateInternalDependencies": "patch",
"bumpVersionsWithWorkspaceProtocolOnly": true,
"ignore": ["@mermaid-js/docs", "@mermaid-js/webpack-test", "@mermaid-js/mermaid-example-diagram"]
}
6 changes: 6 additions & 0 deletions .changeset/perfect-teachers-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@mermaid-js/parser': minor
'mermaid': patch
---

Release parser, test changesets
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Make sure you
- [ ] :book: have read the [contribution guidelines](https://mermaid.js.org/community/contributing.html)
- [ ] :computer: have added necessary unit/e2e tests.
- [ ] :notebook: have added documentation. Make sure [`MERMAID_RELEASE_VERSION`](https://mermaid.js.org/community/contributing.html#update-documentation) is used for all new features.
- [ ] :bookmark: targeted `develop` branch
- [ ] :butterfly: If your PR makes a change that should be noted in one or more packages' changelogs, generate a changeset by running `pnpm changeset` and following the prompts. Changesets that add features should be `minor` and those that fix bugs should be `patch`. Please prefix changeset messages with `feat:`, `fix:`, or `chore:`.
36 changes: 0 additions & 36 deletions .github/release-drafter.yml

This file was deleted.

24 changes: 0 additions & 24 deletions .github/workflows/release-draft.yml

This file was deleted.

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

on:
push:
branches:
- master

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3

- uses: pnpm/action-setup@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
cache: pnpm
node-version-file: '.node-version'

- name: Install Packages
run: pnpm install --frozen-lockfile

- name: Create Release Pull Request or Publish to npm
id: changesets
uses: changesets/action@v1
with:
version: pnpm changeset:version
publish: pnpm changeset:publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
"dev": "tsx .esbuild/server.ts",
"dev:vite": "tsx .vite/server.ts",
"dev:coverage": "pnpm coverage:cypress:clean && VITE_COVERAGE=true pnpm dev:vite",
"release": "pnpm build",
"copy-readme": "cpy './README.*' ./packages/mermaid/ --cwd=.",
"changeset:version": "changeset version && pnpm build && pnpm --filter mermaid run docs:release-version && pnpm --filter mermaid run docs:build && git add --all",
"changeset:publish": "pnpm copy-readme && changeset publish",
"lint": "eslint --quiet --stats --cache --cache-strategy content . && pnpm lint:jison && prettier --cache --check .",
"lint:fix": "eslint --cache --cache-strategy content --fix . && prettier --write . && tsx scripts/fixCSpell.ts",
"lint:jison": "tsx ./scripts/jison/lint.mts",
Expand All @@ -40,7 +42,6 @@
"test": "pnpm lint && vitest run",
"test:watch": "vitest --watch",
"test:coverage": "vitest --coverage",
"prepublishOnly": "pnpm build && pnpm test",
"prepare": "husky install && pnpm build",
"pre-commit": "lint-staged"
},
Expand All @@ -63,6 +64,8 @@
"devDependencies": {
"@applitools/eyes-cypress": "^3.44.4",
"@argos-ci/cypress": "^2.1.0",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.7",
"@cspell/eslint-plugin": "^8.8.4",
"@cypress/code-coverage": "^3.12.30",
"@eslint/js": "^9.4.0",
Expand All @@ -82,6 +85,7 @@
"chokidar": "^3.6.0",
"concurrently": "^8.2.2",
"cors": "^2.8.5",
"cpy-cli": "^5.0.0",
"cross-env": "^7.0.3",
"cspell": "^8.6.0",
"cypress": "^13.11.0",
Expand Down
5 changes: 2 additions & 3 deletions packages/mermaid-example-diagram/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "@mermaid-js/mermaid-example-diagram",
"version": "9.3.0",
"private": true,
"description": "Example of external diagram module for MermaidJS.",
"module": "dist/mermaid-example-diagram.core.mjs",
"types": "dist/detector.d.ts",
Expand All @@ -18,9 +19,7 @@
"example",
"mermaid"
],
"scripts": {
"prepublishOnly": "pnpm -w run build"
},
"scripts": {},
"repository": {
"type": "git",
"url": "https://github.com/mermaid-js/mermaid"
Expand Down
4 changes: 1 addition & 3 deletions packages/mermaid-layout-elk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
"elk",
"mermaid"
],
"scripts": {
"prepublishOnly": "pnpm -w run build"
},
"scripts": {},
"repository": {
"type": "git",
"url": "https://github.com/mermaid-js/mermaid"
Expand Down
3 changes: 1 addition & 2 deletions packages/mermaid-zenuml/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"mermaid"
],
"scripts": {
"clean": "rimraf dist",
"prepublishOnly": "pnpm -w run build"
"clean": "rimraf dist"
},
"repository": {
"type": "git",
Expand Down
4 changes: 1 addition & 3 deletions packages/mermaid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
"types:build-config": "tsx scripts/create-types-from-json-schema.mts",
"types:verify-config": "tsx scripts/create-types-from-json-schema.mts --verify",
"checkCircle": "npx madge --circular ./src",
"release": "pnpm build",
"prepublishOnly": "cpy '../../README.*' ./ --cwd=. && pnpm docs:release-version && pnpm -w run build"
"prepublishOnly": "pnpm docs:verify-version"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -106,7 +105,6 @@
"ajv": "^8.12.0",
"chokidar": "^3.6.0",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"csstree-validator": "^3.0.0",
"globby": "^14.0.1",
"jison": "^0.4.18",
Expand Down
3 changes: 2 additions & 1 deletion packages/mermaid/src/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "docs",
"name": "@mermaid-js/docs",
"private": true,
"version": "0.0.1",
"type": "module",
"scripts": {
"dev": "vitepress --port 3333 --open",
Expand Down
3 changes: 1 addition & 2 deletions packages/parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"scripts": {
"clean": "rimraf dist src/language/generated",
"langium:generate": "langium generate",
"langium:watch": "langium generate --watch",
"prepublishOnly": "pnpm -w run build"
"langium:watch": "langium generate --watch"
},
"repository": {
"type": "git",
Expand Down
Loading
Loading