Commit Graph

1171 Commits

Author SHA1 Message Date
Christian Bundy
925e4bc78b Merge branch 'master' of github.com:fraction/oasis into upgrade-koa-router 2020-11-24 20:46:51 -08:00
Christian Bundy
010b4535c8
Merge pull request #524 from christianbundy/revert-css-changes
Revert CSS changes from preview PR
2020-11-24 20:04:41 -08:00
Christian Bundy
50fa52fb09
Merge pull request #521 from christianbundy/add-more-tests
Add more comprehensive tests
2020-11-24 20:04:01 -08:00
Christian Bundy
73be3b79c6 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/types/yargs-15.0.10' into add-more-tests 2020-11-23 08:19:27 -08:00
Christian Bundy
416b036187 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/husky-4.3.0' into add-more-tests 2020-11-23 08:19:13 -08:00
Christian Bundy
47ead0c624 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/types/mkdirp-1.0.1' into add-more-tests 2020-11-23 08:18:55 -08:00
Christian Bundy
c56b546428 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/types/koa__router-8.0.3' into add-more-tests 2020-11-23 08:18:33 -08:00
dependabot[bot]
cd6f2182e4
Bump @types/yargs from 15.0.4 to 15.0.10
Bumps [@types/yargs](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/yargs) from 15.0.4 to 15.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/yargs)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-23 05:18:10 +00:00
dependabot[bot]
25cc918fce
Bump husky from 3.1.0 to 4.3.0
Bumps [husky](https://github.com/typicode/husky) from 3.1.0 to 4.3.0.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v3.1.0...v4.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-23 05:16:46 +00:00
dependabot[bot]
5d892823de
Bump @types/mkdirp from 1.0.0 to 1.0.1
Bumps [@types/mkdirp](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mkdirp) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mkdirp)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-23 05:15:24 +00:00
dependabot[bot]
f09c3fc274
Bump @types/koa__router from 8.0.2 to 8.0.3
Bumps [@types/koa__router](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/koa__router) from 8.0.2 to 8.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/koa__router)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-23 05:14:05 +00:00
Christian Bundy
6250f4f0a4 Revert CSS changes from preview PR
Problem: There were lots of CSS changes in the preview + blob PR and I
didn't take enough time to look at them. It looks like a few of them
made style problems (e.g. extra specing in the 'next' / 'previous' links
on the profile pages) and it made it harder (IMO) to determine that
links are links (since we've been using font weight to distinguish).

Solution: Revert those changes back to the previous defaults. If the
margin glitch was on purpose or anyone feels strongly about
distinguishing links using some other style (color?) then I'm happy to
merge those, but I'd like to fix the extra margin and have *some* way to
distinguish links in the mean time.
2020-11-22 18:31:27 -08:00
Christian Bundy
70e87d5e8e Add ssb-private1
Problem: With the new ssb-db@20 we have to explicitly add ssb-private1
to ensure that we can see private messages.

Solution: Add ssb-private1 as a plugin.
2020-11-22 18:02:20 -08:00
Christian Bundy
68acfc833d Merge branch 'master' of github.com:fraction/oasis into add-more-tests 2020-11-22 16:55:37 -08:00
Christian Bundy
65b7df9ea9 Remove comments to disable linters
Problem: Our tests seem to have been disabled in various places, which
means that type errors, typos, and other small problems were introduced.

Solution: Remove the comments and fix the underlying problems without
disabling the linters.
2020-11-22 16:52:12 -08:00
Daan Wynen
25a95dcba2
Merge pull request #470 from christianbundy/re-add-husky
Revert "Removes husky to fix #346"
2020-11-23 01:43:52 +01:00
Christian Bundy
26fa0203a7 npm dedupe 2020-11-22 16:38:23 -08:00
Christian Bundy
74ed560ace Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-db-20.3.0' into add-more-tests-ssb-db 2020-11-22 16:14:15 -08:00
Christian Bundy
2262116d08 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-backlinks-2.1.1' into add-more-tests 2020-11-22 15:58:15 -08:00
Christian Bundy
76f2792c0b Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-search-1.3.0' into add-more-tests 2020-11-22 15:47:07 -08:00
Christian Bundy
6cbaa447d3 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-friends-4.3.0' into add-more-tests 2020-11-22 15:46:56 -08:00
Christian Bundy
f77498ae0a Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-conn-0.19.1' into add-more-tests 2020-11-22 15:46:44 -08:00
Christian Bundy
9f1b05de70 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-meme-1.1.0' into add-more-tests 2020-11-22 15:46:30 -08:00
Christian Bundy
ebb634b097 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-invite-2.1.6' into add-more-tests 2020-11-22 15:46:16 -08:00
Christian Bundy
c7b1e0a249 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-blobs-1.2.3' into add-more-tests 2020-11-22 15:45:25 -08:00
Christian Bundy
70e87b8217 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-ooo-1.3.3' into add-more-tests 2020-11-22 15:44:57 -08:00
Christian Bundy
587f9d5efe Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-query-2.4.5' into add-more-tests 2020-11-22 15:44:44 -08:00
Christian Bundy
b261c3ea98 Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/ssb-room-1.3.0' into add-more-tests 2020-11-22 15:44:30 -08:00
Christian Bundy
c86865a5ca Add more comprehensive tests
Problem: I've been worried about merging these version bump pull
requests since we don't have many tests, and I *really* don't want to
merge any catostrophic breaking changes anywhere.

Solution: Add some tests that are more comprehensive, starting by
creating a temporary SSB database and keypair and then editing the
profile, previewing a message, publishing a message, etc., until we have
a handful of small functions actually being tested. This won't ensure
that everything works forever, and it *really* doesn't test replication,
but it should help increase our confidence that test success means that
fewer things are broken.
2020-11-22 15:35:15 -08:00
dependabot[bot]
57cb5c225d
Bump ssb-db from 19.4.0 to 20.3.0
Bumps [ssb-db](https://github.com/ssbc/ssb-db) from 19.4.0 to 20.3.0.
- [Release notes](https://github.com/ssbc/ssb-db/releases)
- [Commits](https://github.com/ssbc/ssb-db/compare/v19.4.0...v20.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:26:32 +00:00
dependabot[bot]
e2f9a4d0a3
Bump ssb-backlinks from 1.0.0 to 2.1.1
Bumps [ssb-backlinks](https://github.com/ssbc/ssb-backlinks) from 1.0.0 to 2.1.1.
- [Release notes](https://github.com/ssbc/ssb-backlinks/releases)
- [Commits](https://github.com/ssbc/ssb-backlinks/commits/v2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:26:09 +00:00
dependabot[bot]
49c606e654
Bump ssb-search from 1.2.1 to 1.3.0
Bumps [ssb-search](https://github.com/ssbc/ssb-search) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/ssbc/ssb-search/releases)
- [Commits](https://github.com/ssbc/ssb-search/compare/v1.2.1...v1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:25:48 +00:00
dependabot[bot]
91b5c37207
Bump ssb-friends from 4.1.4 to 4.3.0
Bumps [ssb-friends](https://github.com/ssbc/ssb-friends) from 4.1.4 to 4.3.0.
- [Release notes](https://github.com/ssbc/ssb-friends/releases)
- [Commits](https://github.com/ssbc/ssb-friends/compare/v4.1.4...v4.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:25:27 +00:00
dependabot[bot]
c87f0762d2
Bump ssb-conn from 0.17.0 to 0.19.1
Bumps [ssb-conn](https://github.com/staltz/ssb-conn) from 0.17.0 to 0.19.1.
- [Release notes](https://github.com/staltz/ssb-conn/releases)
- [Commits](https://github.com/staltz/ssb-conn/compare/v0.17.0...v0.19.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:25:07 +00:00
dependabot[bot]
805a6219f7
Bump ssb-meme from 1.0.4 to 1.1.0
Bumps [ssb-meme](https://github.com/ssbc/ssb-meme) from 1.0.4 to 1.1.0.
- [Release notes](https://github.com/ssbc/ssb-meme/releases)
- [Commits](https://github.com/ssbc/ssb-meme/compare/v1.0.4...v1.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:24:39 +00:00
dependabot[bot]
55d84224a2
Bump ssb-invite from 2.1.4 to 2.1.6
Bumps [ssb-invite](https://github.com/ssbc/ssb-invite) from 2.1.4 to 2.1.6.
- [Release notes](https://github.com/ssbc/ssb-invite/releases)
- [Commits](https://github.com/ssbc/ssb-invite/commits/v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:24:16 +00:00
dependabot[bot]
7071eb06c3
Bump ssb-blobs from 1.2.2 to 1.2.3
Bumps [ssb-blobs](https://github.com/ssbc/ssb-blobs) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/ssbc/ssb-blobs/releases)
- [Commits](https://github.com/ssbc/ssb-blobs/commits/v1.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:23:54 +00:00
dependabot[bot]
eda7855598
Bump ssb-ooo from 1.3.2 to 1.3.3
Bumps [ssb-ooo](https://github.com/dominictarr/ssb-ooo) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/dominictarr/ssb-ooo/releases)
- [Commits](https://github.com/dominictarr/ssb-ooo/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:23:28 +00:00
dependabot[bot]
819eb74715
Bump ssb-query from 2.4.3 to 2.4.5
Bumps [ssb-query](https://github.com/dominictarr/ssb-query) from 2.4.3 to 2.4.5.
- [Release notes](https://github.com/dominictarr/ssb-query/releases)
- [Commits](https://github.com/dominictarr/ssb-query/compare/v2.4.3...v2.4.5)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:23:07 +00:00
dependabot[bot]
74937c763d
Bump ssb-room from 1.2.2 to 1.3.0
Bumps [ssb-room](https://github.com/staltz/ssb-room) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/staltz/ssb-room/releases)
- [Commits](https://github.com/staltz/ssb-room/compare/v1.2.2...1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 20:22:43 +00:00
Christian Bundy
acf94e2d2e Add note about pre-commit hook 2020-11-22 21:08:47 +01:00
Christian Bundy
679a2bff74 Revert "Removes husky to fix #346"
Problem: I keep forgetting to run tests and my commits aren't actually
passing in CI. I'd really like for these to be run automatically so that
I don't have to remember my pre-commit hooks.

Solution: Revert commit d9e829e2e8, which
Nick Wynja added to remove Husky as a pre-commit hook. I hope that
anyone who doesn't want to run the pre-commit hook will run Git with the
`--no-verify` option, and anyone bummed at this change will open a
conversation to discuss in more details (or just revert *this* commit).

See-also: https://github.com/fraction/oasis/issues/346
2020-11-22 21:08:45 +01:00
Daan Wynen
76789a0ed6
Merge pull request #509 from christianbundy/eat-flotilla
Merge flotilla source code into Oasis
2020-11-22 20:42:30 +01:00
Christian Bundy
c993adc01a Merge flotilla source code into Oasis
Problem: I thought it would be a good idea to keep our SSB stack in
another module but it just creates friction and adds another layer to
our stack that has to be independently upgraded and versioned.

Solution: Merge the @fraction/flotilla source code into Oasis so that we
don't have to maintain two separate projects.
2020-11-22 10:10:53 -08:00
Christian Bundy
781e647fce Upgrade @koa/router
This also fixes our routes so that we're listening on `/foo` instead of
`/foo/` with an accidental trailing slash.
2020-11-21 20:15:03 -08:00
Christian Bundy
3600e09ab0
Merge pull request #505 from fraction/dependabot/npm_and_yarn/file-type-16.0.1
Bump file-type from 15.0.1 to 16.0.1
2020-11-21 17:36:05 -08:00
Christian Bundy
5f910c86b5
Merge pull request #501 from fraction/dependabot/npm_and_yarn/types/mkdirp-1.0.1
Bump @types/mkdirp from 1.0.0 to 1.0.1
2020-11-21 17:25:45 -08:00
Christian Bundy
95cef65be2
Merge pull request #506 from fraction/dependabot/npm_and_yarn/pretty-ms-7.0.1
Bump pretty-ms from 6.0.1 to 7.0.1
2020-11-21 17:22:06 -08:00
Christian Bundy
6522172a46
Merge pull request #499 from fraction/dependabot/npm_and_yarn/types/yargs-15.0.10
Bump @types/yargs from 15.0.4 to 15.0.10
2020-11-21 17:18:12 -08:00
dependabot[bot]
6a0ad69969
Bump file-type from 15.0.1 to 16.0.1
Bumps [file-type](https://github.com/sindresorhus/file-type) from 15.0.1 to 16.0.1.
- [Release notes](https://github.com/sindresorhus/file-type/releases)
- [Commits](https://github.com/sindresorhus/file-type/compare/v15.0.1...v16.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-22 01:11:13 +00:00