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
15 changes: 0 additions & 15 deletions .github/workflows/project.yml

This file was deleted.

18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

[Docs](https://d2lang.com) | [Cheat sheet](./docs/assets/cheat_sheet.pdf) | [Comparisons](https://text-to-diagram.com) | [Playground](https://play.d2lang.com)

[![ci](https://github.com/terrastruct/d2/actions/workflows/ci.yml/badge.svg)](https://github.com/terrastruct/d2/actions/workflows/ci.yml)
[![daily](https://github.com/terrastruct/d2/actions/workflows/daily.yml/badge.svg)](https://github.com/terrastruct/d2/actions/workflows/daily.yml)
[![release](https://img.shields.io/github/v/release/terrastruct/d2)](https://github.com/terrastruct/d2/releases)
[![ci](https://github.com/d2lang/d2/actions/workflows/ci.yml/badge.svg)](https://github.com/d2lang/d2/actions/workflows/ci.yml)
[![daily](https://github.com/d2lang/d2/actions/workflows/daily.yml/badge.svg)](https://github.com/d2lang/d2/actions/workflows/daily.yml)
[![release](https://img.shields.io/github/v/release/d2lang/d2)](https://github.com/d2lang/d2/releases)
[![changelog](https://img.shields.io/badge/changelog-read-blue)](./CHANGELOG.md)
[![npm version](https://img.shields.io/npm/v/@terrastruct/d2)](https://www.npmjs.com/package/@terrastruct/d2)
[![discord](https://img.shields.io/discord/1039184639652265985?label=discord)](https://discord.gg/NF6X8K4eDq)
[![twitter](https://img.shields.io/twitter/follow/terrastruct?style=social)](https://twitter.com/terrastruct)
[![license](https://img.shields.io/github/license/terrastruct/d2?color=9cf)](./LICENSE.txt)
[![license](https://img.shields.io/github/license/d2lang/d2?color=9cf)](./LICENSE.txt)

<a href="https://play.d2lang.com">
<img src="./docs/assets/playground_button.png" alt="D2 Playground button" width="200" />
Expand Down Expand Up @@ -232,9 +232,9 @@ let us know and we'll be happy to include it here!

### Official plugins

- **VSCode extension**: [https://github.com/terrastruct/d2-vscode](https://github.com/terrastruct/d2-vscode)
- **Vim extension**: [https://github.com/terrastruct/d2-vim](https://github.com/terrastruct/d2-vim)
- **Obsidian plugin**: [https://github.com/terrastruct/d2-obsidian](https://github.com/terrastruct/d2-obsidian)
- **VSCode extension**: [https://github.com/d2lang/d2-vscode](https://github.com/d2lang/d2-vscode)
- **Vim extension**: [https://github.com/d2lang/d2-vim](https://github.com/d2lang/d2-vim)
- **Obsidian plugin**: [https://github.com/d2lang/d2-obsidian](https://github.com/d2lang/d2-obsidian)
- **Slack app**: [https://d2lang.com/tour/slack](https://d2lang.com/tour/slack)
- **Discord plugin**: [https://d2lang.com/tour/discord](https://d2lang.com/tour/discord)

Expand Down Expand Up @@ -274,8 +274,8 @@ let us know and we'll be happy to include it here!
### Misc

- **Comparison site**: [https://github.com/terrastruct/text-to-diagram-site](https://github.com/terrastruct/text-to-diagram-site)
- **Playground**: [https://github.com/terrastruct/d2-playground](https://github.com/terrastruct/d2-playground)
- **Language docs**: [https://github.com/terrastruct/d2-docs](https://github.com/terrastruct/d2-docs)
- **Playground**: [https://github.com/d2lang/d2-playground](https://github.com/d2lang/d2-playground)
- **Language docs**: [https://github.com/d2lang/d2-docs](https://github.com/d2lang/d2-docs)
- **Hosted icons**: [https://icons.terrastruct.com](https://icons.terrastruct.com)

## FAQ
Expand Down
2 changes: 1 addition & 1 deletion ci/release/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ it depends on from ../sub/lib.

> note: Remember for production releases you need to set the $TSTRUCT_OS_ARCH_BUILDER
> variables as we must compile d2 directly on each release target to include dagre.
> See https://github.com/terrastruct/d2/issues/31
> See https://github.com/d2lang/d2/issues/31

Use `--host-only` to build only the release for the host's `$OS-$ARCH` pair.

Expand Down
4 changes: 2 additions & 2 deletions ci/release/_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ note: Deleting the unarchived releases will cause --uninstall to stop working.
You can rerun install.sh to update your version of D2. install.sh will avoid reinstalling
if the installed version is the latest unless --force is passed.

See https://github.com/terrastruct/d2/blob/master/docs/INSTALL.md#security for
See https://github.com/d2lang/d2/blob/master/docs/INSTALL.md#security for
documentation on its security.
EOF
}
Expand Down Expand Up @@ -166,7 +166,7 @@ main() {
flag_errusage "no arguments are accepted"
fi

REPO=${REPO:-terrastruct/d2}
REPO=${REPO:-d2lang/d2}
ensure_os
ensure_arch
ensure_prefix
Expand Down
22 changes: 11 additions & 11 deletions ci/release/changelogs/next.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
#### Features 🚀

- exports: gif exports work with `animate: true` keyword [#2663](https://github.com/terrastruct/d2/pull/2663)
- exports: gif exports work with `animate: true` keyword [#2663](https://github.com/d2lang/d2/pull/2663)

#### Improvements 🧹

- d2ascii:
- sql_table and uml class shapes are supported [#2623](https://github.com/terrastruct/d2/pull/2623)
- newlines are handled [#2626](https://github.com/terrastruct/d2/pull/2626)
- empty left columns are cropped [#2626](https://github.com/terrastruct/d2/pull/2626)
- sql_table and uml class shapes are supported [#2623](https://github.com/d2lang/d2/pull/2623)
- newlines are handled [#2626](https://github.com/d2lang/d2/pull/2626)
- empty left columns are cropped [#2626](https://github.com/d2lang/d2/pull/2626)
- exports:
- Chromium download through CLI for PNG exports is prompted [#2655](https://github.com/terrastruct/d2/pull/2655)
- `animate-interval` is no longer required, defaults to 1000ms for gifs [#2663](https://github.com/terrastruct/d2/pull/2663)
- Chromium download through CLI for PNG exports is prompted [#2655](https://github.com/d2lang/d2/pull/2655)
- `animate-interval` is no longer required, defaults to 1000ms for gifs [#2663](https://github.com/d2lang/d2/pull/2663)
- renders:
- remote images are fetched more reliably [#2659](https://github.com/terrastruct/d2/pull/2659)
- remote images are fetched more reliably [#2659](https://github.com/d2lang/d2/pull/2659)

#### Bugfixes ⛑️

- exports: pptx follows standards more closely, addressing warnings from some Powerpoint software [#2645](https://github.com/terrastruct/d2/pull/2645)
- d2sequence: fix edge case of invalid sequence diagrams [#2660](https://github.com/terrastruct/d2/pull/2660)
- d2svg: Text may overflow legend bounds when monospace font is used [#2674](https://github.com/terrastruct/d2/pull/2674)
- exports: pptx follows standards more closely, addressing warnings from some Powerpoint software [#2645](https://github.com/d2lang/d2/pull/2645)
- d2sequence: fix edge case of invalid sequence diagrams [#2660](https://github.com/d2lang/d2/pull/2660)
- d2svg: Text may overflow legend bounds when monospace font is used [#2674](https://github.com/d2lang/d2/pull/2674)

---

For the latest d2.js changes, see separate [changelog](https://github.com/terrastruct/d2/blob/master/d2js/js/CHANGELOG.md).
For the latest d2.js changes, see separate [changelog](https://github.com/d2lang/d2/blob/master/d2js/js/CHANGELOG.md).
2 changes: 1 addition & 1 deletion ci/release/changelogs/template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

---

For the latest d2.js changes, see separate [changelog](https://github.com/terrastruct/d2/blob/master/d2js/js/CHANGELOG.md).
For the latest d2.js changes, see separate [changelog](https://github.com/d2lang/d2/blob/master/d2js/js/CHANGELOG.md).
2 changes: 1 addition & 1 deletion ci/release/template/README.md.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This release is structured the same as our Unix releases for use with MSYS2.
You may find our \`.msi\` installer more convenient as it handles putting \`d2.exe\` into
your \`\$PATH\` for you.

See https://github.com/terrastruct/d2/blob/master/docs/INSTALL.md#windows
See https://github.com/d2lang/d2/blob/master/docs/INSTALL.md#windows
EOF
fi

Expand Down
2 changes: 1 addition & 1 deletion ci/release/template/man/d2.1
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ The theme to use when the viewer's browser is in dark mode. When left unset
is used for both light and dark mode. Be aware that explicit styles set in D2 code will
still be applied and this may produce unexpected results. We plan on resolving this by
making style maps in D2 light/dark mode specific. See
.Lk https://github.com/terrastruct/d2/issues/831
.Lk https://github.com/d2lang/d2/issues/831
.Ns .
.It Fl s , -sketch Ar false
Renders the diagram to look like it was sketched by hand
Expand Down
2 changes: 1 addition & 1 deletion d2cli/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func layoutNotFound(ctx context.Context, ps []d2plugin.Plugin, layout string) er
return xmain.UsageErrorf(`D2_LAYOUT "%s" is not bundled and could not be found in your $PATH.
The available options are: %s. For details on each option, run "d2 layout".

For more information on setup, please visit https://github.com/terrastruct/d2.`,
For more information on setup, please visit https://github.com/d2lang/d2.`,
layout, strings.Join(names, ", "))
}

Expand Down
2 changes: 1 addition & 1 deletion d2cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func Run(ctx context.Context, ms *xmain.State) (err error) {
if err != nil {
return err
}
darkThemeFlag, err := ms.Opts.Int64("D2_DARK_THEME", "dark-theme", "", -1, "the theme to use when the viewer's browser is in dark mode. When left unset -theme is used for both light and dark mode. Be aware that explicit styles set in D2 code will still be applied and this may produce unexpected results. We plan on resolving this by making style maps in D2 light/dark mode specific. See https://github.com/terrastruct/d2/issues/831.")
darkThemeFlag, err := ms.Opts.Int64("D2_DARK_THEME", "dark-theme", "", -1, "the theme to use when the viewer's browser is in dark mode. When left unset -theme is used for both light and dark mode. Be aware that explicit styles set in D2 code will still be applied and this may produce unexpected results. We plan on resolving this by making style maps in D2 light/dark mode specific. See https://github.com/d2lang/d2/issues/831.")
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions d2js/js/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

D2.js is a JavaScript wrapper around D2, the modern diagram scripting language. It enables running D2 directly in browsers and Node environments through WebAssembly.

For an example of usage, see [https://play.d2lang.com](https://play.d2lang.com), which is powered by d2.js and is [open-source](https://github.com/terrastruct/d2-playground).
For an example of usage, see [https://play.d2lang.com](https://play.d2lang.com), which is powered by d2.js and is [open-source](https://github.com/d2lang/d2-playground).

## Features

Expand Down Expand Up @@ -163,7 +163,7 @@ sudo apt-get install binaryen
### Building from source

```bash
git clone https://github.com/terrastruct/d2.git
git clone https://github.com/d2lang/d2.git
cd d2/d2js/js
./make.sh all
```
Expand Down
6 changes: 3 additions & 3 deletions d2js/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"version": "0.1.33",
"repository": {
"type": "git",
"url": "git+https://github.com/terrastruct/d2.git",
"url": "git+https://github.com/d2lang/d2.git",
"directory": "d2js/js"
},
"bugs": {
"url": "https://github.com/terrastruct/d2/issues"
"url": "https://github.com/d2lang/d2/issues"
},
"homepage": "https://github.com/terrastruct/d2/tree/master/d2js/js#readme",
"homepage": "https://github.com/d2lang/d2/tree/master/d2js/js#readme",
"publishConfig": {
"access": "public"
},
Expand Down
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ The code itself should be documented as appropriate with Go-style comments. No r

If it's some new functionality, please submit a pull request to document it in the
language docs:
[https://github.com/terrastruct/d2-docs](https://github.com/terrastruct/d2-docs).
[https://github.com/d2lang/d2-docs](https://github.com/d2lang/d2-docs).

### Questions

Expand Down
4 changes: 2 additions & 2 deletions docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Adjust VERSION, OS, and ARCH as needed.

```sh
VERSION=v0.0.13 OS=macos ARCH=amd64 curl -fsSLO \
"https://github.com/terrastruct/d2/releases/download/$VERSION/d2-$VERSION-$OS-$ARCH.tar.gz" \
"https://github.com/d2lang/d2/releases/download/$VERSION/d2-$VERSION-$OS-$ARCH.tar.gz" \
&& tar -xzf "d2-$VERSION-$OS-$ARCH.tar.gz" \
&& make -sC "d2-$VERSION" install
```
Expand Down Expand Up @@ -180,7 +180,7 @@ Remember, you need at least Go v1.20

## Windows

We have prebuilt [releases](https://github.com/terrastruct/d2/releases) of d2 available for Windows via `.msi` installers. The installer
We have prebuilt [releases](https://github.com/d2lang/d2/releases) of d2 available for Windows via `.msi` installers. The installer
will add the `d2` binary to your `$PATH` so that you can execute `d2` in `cmd.exe` or
`pwsh.exe`.

Expand Down
4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ note: Deleting the unarchived releases will cause --uninstall to stop working.
You can rerun install.sh to update your version of D2. install.sh will avoid reinstalling
if the installed version is the latest unless --force is passed.

See https://github.com/terrastruct/d2/blob/master/docs/INSTALL.md#security for
See https://github.com/d2lang/d2/blob/master/docs/INSTALL.md#security for
documentation on its security.
EOF
}
Expand Down Expand Up @@ -759,7 +759,7 @@ main() {
flag_errusage "no arguments are accepted"
fi

REPO=${REPO:-terrastruct/d2}
REPO=${REPO:-d2lang/d2}
ensure_os
ensure_arch
ensure_prefix
Expand Down
Loading