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

docs: migrate documentation to docusaurus + typedoc #13914

Merged
merged 54 commits into from
Apr 2, 2022
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
9c4f6c3
docs: start migration to docusaurus
ephys Jan 7, 2022
f680bc5
docs: fix documentation causing syntax errors
ephys Jan 7, 2022
585ac7f
docs: add typedoc
ephys Jan 7, 2022
491d77e
Merge branch 'main' into feature/typedoc
ephys Mar 7, 2022
b92add8
refactor: update code style
ephys Mar 7, 2022
8cf19dd
docs: split typedoc from docusaurus
ephys Mar 7, 2022
9a2baf3
docs: update links to our resources
ephys Mar 7, 2022
55b5c2a
docs: add TS example in intro.mdx
ephys Mar 7, 2022
bd760fa
refactor: remove unused boilerplate
ephys Mar 7, 2022
b690487
docs: migrate getting-started
ephys Mar 7, 2022
b683356
docs: rename intro in sidebar
ephys Mar 7, 2022
e68b9bf
docs: migrate defining-a-model
ephys Mar 7, 2022
b9f13ac
refactor: move imports to the top of mdx files
ephys Mar 8, 2022
bb6a6d8
docs: update defining models
ephys Mar 8, 2022
3c87b08
docs: add terminology page
ephys Mar 8, 2022
60bb737
docs: document modelName minification caveat
ephys Mar 8, 2022
2584adf
docs: expand “table&column names“ chapter
ephys Mar 8, 2022
80288dc
docs: mark private model fields as private
ephys Mar 8, 2022
835622c
docs: replace sh with bash lang
ephys Mar 8, 2022
8abd47e
docs: remove readme from typedoc
ephys Mar 8, 2022
6330302
docs: update links in sync page
ephys Mar 8, 2022
c037126
docs: add links in jsdoc
ephys Mar 8, 2022
0722af9
docs: migrate associations (wip)
ephys Mar 8, 2022
1eae040
docs: fix links
ephys Mar 8, 2022
edc8276
docs: remove hardcoding of jsdoc url
ephys Mar 8, 2022
2aa840f
docs: document how hasMany 'hasAll' method works
ephys Mar 8, 2022
8270f14
docs: migrate One-To-Many documentation
ephys Mar 8, 2022
f70adeb
docs: migrate many-to-many
ephys Mar 8, 2022
3d8cf80
docs: rename generated-index pages
ephys Mar 8, 2022
da64978
docs: rename generated-index pages
ephys Mar 8, 2022
f6dda59
docs: update type table in datatypes
ephys Mar 8, 2022
e7a7f3d
docs: update type table in datatypes
ephys Mar 8, 2022
53f8e1d
docs: revert rewrite, only migrate
ephys Mar 9, 2022
46f54c6
refactor: fix linting & remove dead files
ephys Mar 9, 2022
3d8dba0
docs: fix dead links
ephys Mar 9, 2022
25cf73d
docs: add favicon
ephys Mar 9, 2022
4d4374b
build: update docs script
ephys Mar 9, 2022
2142c6e
refactor: remove dead files
ephys Mar 9, 2022
13d4cb0
fix: fix path to favicon
ephys Mar 9, 2022
9902be1
build: hoist docusaurus tsconfig preset
ephys Mar 9, 2022
999cd1a
docs: update twitter link
ephys Mar 9, 2022
91b590a
build: remove docs except typedoc
ephys Mar 10, 2022
a9f62cd
refactor: remove unused dep
ephys Mar 10, 2022
577d1c5
Merge branch 'main' into ephys/typedoc
ephys Mar 11, 2022
a533168
Merge branch 'main' into feature/typedoc
ephys Mar 11, 2022
e34ec48
Merge branch 'main' into feature/typedoc
ephys Mar 22, 2022
54baac7
ci: update website repository url
ephys Mar 22, 2022
400fe0e
fix: update website urls
ephys Mar 22, 2022
b7dcb55
docs: update readme
ephys Mar 22, 2022
f0deb1d
Merge branch 'main' into feature/typedoc
ephys Apr 1, 2022
eab5b4b
build: pin typedoc dependency
ephys Apr 1, 2022
a3768f2
fix: revert typing change, kept for future pr
ephys Apr 1, 2022
b66ba3d
build: update lockfile
ephys Apr 1, 2022
5e39651
Merge branch 'main' into feature/typedoc
ephys Apr 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 17 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ module.exports = {
// let's disable the most problematic rules for now.
// they're only disabled for .js files.
// .ts files will need to migrate.
files: ['test/**/*.js', 'docs/**/*.js'],
files: ['test/**/*.js'],
rules: {
'babel/no-invalid-this': 'off',
'func-names': 'off',
Expand All @@ -149,8 +149,8 @@ module.exports = {
'no-multi-spaces': 'off',
},
}, {
// Disable slow rules that are not important in tests & docs (perf)
files: ['test/**/*', 'docs/**/*'],
// Disable slow rules that are not important in tests (perf)
files: ['test/**/*'],
rules: {
'import/no-extraneous-dependencies': 'off',
// no need to check jsdoc in tests & docs
Expand Down Expand Up @@ -179,6 +179,11 @@ module.exports = {
parserOptions: {
project: ['./test/tsconfig.json'],
},
}, {
files: ['**/tsconfig.json'],
rules: {
'json/*': ['error', { allowComments: true }],
},
}],
settings: {
jsdoc: {
Expand All @@ -192,7 +197,15 @@ module.exports = {
sourceType: 'script',
},
// TODO: un-ignore test/types/**, src/**/*.d.ts, and 'dev/**/*'
ignorePatterns: ['lib/**/*', 'types/**/*', 'test/types/**/*', 'src/**/*.d.ts', 'dev/**/*', '!dev/update-authors.js'],
ignorePatterns: [
'lib/**/*',
'types/**/*',
'test/types/**/*',
'src/**/*.d.ts',
'dev/**/*',
'!dev/update-authors.js',
'.typedoc-build',
],
env: {
node: true,
mocha: true,
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
path: install-build-node-${{ matrix.node-version }}.tar
retention-days: 1
lint:
name: Lint code and docs
name: Lint code
runs-on: ubuntu-latest
needs: install-and-build
steps:
Expand All @@ -54,7 +54,6 @@ jobs:
- name: Extract artifact
run: tar -xf install-build-node-16.tar
- run: yarn lint-no-fix
- run: yarn lint-docs
unit-test:
strategy:
fail-fast: false
Expand Down Expand Up @@ -91,7 +90,7 @@ jobs:
- name: Unit tests (snowflake)
run: yarn test-unit-snowflake
docs:
name: Generate docs
name: Generate TypeDoc
runs-on: ubuntu-latest
needs: lint
steps:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ coverage
test/tmp/*
test/binary/tmp/*
.vscode/
esdoc
.typedoc-build
node_modules
*.log
/lib
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<img src="docs/images/logo-small.png" width="100" />
<p style="text-align: center;">
<img src="docs/images/logo-small.png" width="100" alt="" />
<h1 align="center">Sequelize</h1>
</p>

Expand All @@ -17,7 +17,7 @@ Sequelize is an easy-to-use and promise-based [Node.js](https://nodejs.org/en/ab

Sequelize follows [Semantic Versioning](http://semver.org) and the [official Node.js LTS schedule](https://nodejs.org/en/about/releases/). Version 7 of Sequelize officially supports the Node.js versions `^12.22.0`, `^14.17,0`, `^16.0.0`. Other versions might be working as well.
WikiRik marked this conversation as resolved.
Show resolved Hide resolved

New to Sequelize? Take a look at the [Tutorials and Guides](https://sequelize.org/master). You might also be interested in the [API Reference](https://sequelize.org/master/identifiers).
New to Sequelize? Take a look at the [Tutorials and Guides](https://sequelize.org). You might also be interested in the [API Reference](https://sequelize.org/v6/identifiers).

Would you like to contribute? Read [our contribution guidelines](https://github.com/sequelize/sequelize/blob/main/CONTRIBUTING.md) to know more. There are many ways to help! 😃

Expand Down Expand Up @@ -94,15 +94,15 @@ If you have security issues to report, please refer to our [Responsible Disclosu
### :wrench: Tools

- [CLI](https://github.com/sequelize/cli)
- [With TypeScript](https://sequelize.org/master/manual/typescript.html)
- [With TypeScript](https://sequelize.org/v6/manual/typescript.html)
- [Enhanced TypeScript with decorators](https://github.com/RobinBuschmann/sequelize-typescript)
- [For GraphQL](https://github.com/mickhansen/graphql-sequelize)
- [For CockroachDB](https://github.com/cockroachdb/sequelize-cockroachdb)
- [Plugins](https://sequelize.org/master/manual/resources.html)
- [Plugins](https://sequelize.org/v6/manual/resources.html)
- [For YugabyteDB](https://github.com/yugabyte/sequelize-yugabytedb)

### :speech_balloon: Translations

- [English](https://sequelize.org/master) (OFFICIAL)
- [English](https://sequelize.org) (OFFICIAL)
- [中文文档](https://github.com/demopark/sequelize-docs-Zh-CN) (UNOFFICIAL)

36 changes: 0 additions & 36 deletions docs/ROUTER.txt

This file was deleted.

186 changes: 0 additions & 186 deletions docs/css/style.css

This file was deleted.

16 changes: 0 additions & 16 deletions docs/css/theme.css

This file was deleted.