不要怂,就是干,撸起袖子干!

Commit 0ca8d727 by Sushant Committed by GitHub

docs: prepare for v6 release (#12416)

1 parent 663261bf
...@@ -6,7 +6,6 @@ language: node_js ...@@ -6,7 +6,6 @@ language: node_js
branches: branches:
only: only:
- master - master
- /^greenkeeper/.*$/
except: except:
- /^v\d+\.\d+\.\d+$/ - /^v\d+\.\d+\.\d+$/
...@@ -37,7 +36,7 @@ before_script: ...@@ -37,7 +36,7 @@ before_script:
script: script:
- |- - |-
if [ "$COVERAGE" = true ]; then npm run cover && bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info; else npm run test; fi npm run cover && bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info
jobs: jobs:
include: include:
...@@ -75,14 +74,8 @@ jobs: ...@@ -75,14 +74,8 @@ jobs:
- stage: release - stage: release
node_js: '10' node_js: '10'
script: script:
- npm run lint-docs #change after v6 released - npm run lint
before_deploy: #- npm run semantic-release
- npm run docs
deploy:
provider: surge
project: ./esdoc/
domain: docs.sequelizejs.com
skip_cleanup: true
stages: stages:
- lint - lint
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
The sequelize documentation is divided in two parts: The sequelize documentation is divided in two parts:
* Tutorials, guides, and example based documentation are written in Markdown - Tutorials, guides, and example based documentation are written in Markdown
* The API reference is generated automatically from source code comments with [ESDoc](http://esdoc.org) (which uses [JSDoc](http://usejsdoc.org) syntax). - The API reference is generated automatically from source code comments with [ESDoc](http://esdoc.org) (which uses [JSDoc](http://usejsdoc.org) syntax).
The whole documentation is rendered using ESDoc and continuously deployed to [Surge](http://surge.sh). The output is produced in the `esdoc` folder. The whole documentation is rendered using ESDoc and continuously deployed to Github Pages at https://sequelize.org. The output is produced in the `esdoc` folder.
The tutorials, written in markdown, are located in the `docs` folder. ESDoc is configured to find them in the `"manual"` field of `.esdoc.json`. The tutorials, written in markdown, are located in the `docs` folder. ESDoc is configured to find them in the `"manual"` field of `.esdoc.json`.
......
_Please note!_ The github issue tracker should only be used for feature requests and bugs with a clear description of the issue and the expected behaviour (see below). All questions belong on [Slack](https://sequelize.slack.com), [StackOverflow](https://stackoverflow.com/questions/tagged/sequelize.js) or [Google groups](https://groups.google.com/forum/#!forum/sequelize). _Please note!_ The github issue tracker should only be used for feature requests and bugs with a clear description of the issue and the expected behaviour (see below). All questions belong on [Slack](https://sequelize.slack.com) & [StackOverflow](https://stackoverflow.com/questions/tagged/sequelize.js).
# Issues # Issues
Issues are always very welcome - after all, they are a big part of making sequelize better. However, there are a couple of things you can do to make the lives of the developers _much, much_ easier: Issues are always very welcome - after all, they are a big part of making sequelize better. However, there are a couple of things you can do to make the lives of the developers _much, much_ easier:
### Tell us: ### Tell us:
* What you are doing? - What you are doing?
* Post a _minimal_ code sample that reproduces the issue, including models and associations - Post a _minimal_ code sample that reproduces the issue, including models and associations
* What do you expect to happen? - What do you expect to happen?
* What is actually happening? - What is actually happening?
* Which dialect you are using (postgres, mysql etc)? - Which dialect you are using (postgres, mysql etc)?
* Which sequelize version you are using? - Which sequelize version you are using?
When you post code, please use [Github flavored markdown](https://help.github.com/articles/github-flavored-markdown), in order to get proper syntax highlighting! When you post code, please use [Github flavored markdown](https://help.github.com/articles/github-flavored-markdown), in order to get proper syntax highlighting!
If you can even provide a pull request with a failing unit test, we will love you long time! Plus your issue will likely be fixed much faster. If you can even provide a pull request with a failing unit test, we will love you long time! Plus your issue will likely be fixed much faster.
# Pull requests # Pull requests
We're glad to get pull request if any functionality is missing or something is buggy. However, there are a couple of things you can do to make life easier for the maintainers: We're glad to get pull request if any functionality is missing or something is buggy. However, there are a couple of things you can do to make life easier for the maintainers:
* Explain the issue that your PR is solving - or link to an existing issue - Explain the issue that your PR is solving - or link to an existing issue
* Make sure that all existing tests pass - Make sure that all existing tests pass
* Make sure you followed [coding guidelines](https://github.com/sequelize/sequelize/blob/master/CONTRIBUTING.md#coding-guidelines) - Make sure you followed [coding guidelines](https://github.com/sequelize/sequelize/blob/master/CONTRIBUTING.md#coding-guidelines)
* Add some tests for your new functionality or a test exhibiting the bug you are solving. Ideally all new tests should not pass _without_ your changes. - Add some tests for your new functionality or a test exhibiting the bug you are solving. Ideally all new tests should not pass _without_ your changes.
- Use [async/await](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/async_function) in all new tests. Specifically this means: - Use [async/await](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/async_function) in all new tests. Specifically this means:
- don't use `EventEmitter`, `QueryChainer` or the `success`, `done` and `error` events - don't use `EventEmitter`, `QueryChainer` or the `success`, `done` and `error` events
- don't use a done callback in your test, just return the promise chain. - don't use a done callback in your test, just return the promise chain.
- Small bugfixes and direct backports to the 4.x branch are accepted without tests. - Small bugfixes and direct backports to the 4.x branch are accepted without tests.
* If you are adding to / changing the public API, remember to add API docs, in the form of [JSDoc style](http://usejsdoc.org/about-getting-started.html) comments. See [section 4a](#4a-check-the-documentation) for the specifics. - If you are adding to / changing the public API, remember to add API docs, in the form of [JSDoc style](http://usejsdoc.org/about-getting-started.html) comments. See [section 4a](#4a-check-the-documentation) for the specifics.
Interested? Coolio! Here is how to get started: Interested? Coolio! Here is how to get started:
### 1. Prepare your environment ### 1. Prepare your environment
Here comes a little surprise: You need [Node.JS](http://nodejs.org). Here comes a little surprise: You need [Node.JS](http://nodejs.org).
### 2. Install the dependencies ### 2. Install the dependencies
...@@ -72,6 +75,7 @@ You may need to specify credentials using the environment variables `SEQ_PG_USER ...@@ -72,6 +75,7 @@ You may need to specify credentials using the environment variables `SEQ_PG_USER
For Postgres you may also need to install the `postgresql-postgis` package (an optional component of some Postgres distributions, e.g. Ubuntu). The package will be named something like: `postgresql-<pg_version_number>-postgis-<postgis_version_number>`, e.g. `postgresql-9.5-postgis-2.2`. You should be able to find the exact package name on a Debian/Ubuntu system by running the command: `apt-cache search -- -postgis`. For Postgres you may also need to install the `postgresql-postgis` package (an optional component of some Postgres distributions, e.g. Ubuntu). The package will be named something like: `postgresql-<pg_version_number>-postgis-<postgis_version_number>`, e.g. `postgresql-9.5-postgis-2.2`. You should be able to find the exact package name on a Debian/Ubuntu system by running the command: `apt-cache search -- -postgis`.
Create the following extensions in the test database: Create the following extensions in the test database:
``` ```
CREATE EXTENSION postgis; CREATE EXTENSION postgis;
CREATE EXTENSION hstore; CREATE EXTENSION hstore;
...@@ -92,20 +96,23 @@ $ docker-compose up postgres-95 mysql-57 mssql ...@@ -92,20 +96,23 @@ $ docker-compose up postgres-95 mysql-57 mssql
``` ```
> **_NOTE:_** If you get the following output: > **_NOTE:_** If you get the following output:
>```
>...
>Creating mysql-57 ... error
> >
>ERROR: for mysql-57 Cannot create container for service mysql-57: b'create .: volume name is too short, names should be at least two alphanumeric characters' > ```
> ...
> Creating mysql-57 ... error
>
> ERROR: for mysql-57 Cannot create container for service mysql-57: b'create .: volume name is too short, names should be at least two alphanumeric characters'
>
> ERROR: for mysql-57 Cannot create container for service mysql-57: b'create .: volume name is too short, names should be at least two alphanumeric characters'
> ERROR: Encountered errors while bringing up the project.
> ```
>
> You need to set the variables `MARIADB_ENTRYPOINT` and `MYSQLDB_ENTRYPOINT` accordingly:
> >
>ERROR: for mysql-57 Cannot create container for service mysql-57: b'create .: volume name is too short, names should be at least two alphanumeric characters' > ```sh
>ERROR: Encountered errors while bringing up the project. > $ export MARIADB_ENTRYPOINT="$PATH_TO_PROJECT/test/config/mariadb"
>``` > $ export MYSQLDB_ENTRYPOINT="$PATH_TO_PROJECT/test/config/mysql"
>You need to set the variables `MARIADB_ENTRYPOINT` and `MYSQLDB_ENTRYPOINT` accordingly: > ```
>```sh
>$ export MARIADB_ENTRYPOINT="$PATH_TO_PROJECT/test/config/mariadb"
>$ export MYSQLDB_ENTRYPOINT="$PATH_TO_PROJECT/test/config/mysql"
>```
**MSSQL:** Please run `npm run setup-mssql` to create the test database. **MSSQL:** Please run `npm run setup-mssql` to create the test database.
......
FROM node:6 FROM node:10
RUN apt-get install libpq-dev RUN apt-get install libpq-dev
......
...@@ -12,17 +12,14 @@ Sequelize is a promise-based Node.js ORM for Postgres, MySQL, MariaDB, SQLite an ...@@ -12,17 +12,14 @@ Sequelize is a promise-based Node.js ORM for Postgres, MySQL, MariaDB, SQLite an
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/master). You might also be interested in the [API Reference](https://sequelize.org/master/identifiers).
### v6-beta Release ### v6 Release
[![npm version](https://badgen.net/npm/v/sequelize/next)](https://www.npmjs.com/package/sequelize) You can find detailed changelog [here](https://github.com/sequelize/sequelize/blob/master/docs/manual/other-topics/upgrade-to-v6.md).
`v6-beta` is now available. You can find detailed changelog [here](https://github.com/sequelize/sequelize/blob/master/docs/manual/other-topics/upgrade-to-v6.md).
## Installation ## Installation
```sh ```sh
$ npm i sequelize # This will install v5 $ npm i sequelize # This will install v6
$ npm i sequelize@next # This will install v6-beta
# And one of the following: # And one of the following:
$ npm i pg pg-hstore # Postgres $ npm i pg pg-hstore # Postgres
...@@ -33,19 +30,23 @@ $ npm i tedious # Microsoft SQL Server ...@@ -33,19 +30,23 @@ $ npm i tedious # Microsoft SQL Server
``` ```
## Documentation ## Documentation
- [v6-beta Documentation](https://sequelize.org/master)
- [v6 Documentation](https://sequelize.org/master)
- [v5/v4/v3 Documentation](https://sequelize.org) - [v5/v4/v3 Documentation](https://sequelize.org)
- [Contributing](https://github.com/sequelize/sequelize/blob/master/CONTRIBUTING.md) - [Contributing](https://github.com/sequelize/sequelize/blob/master/CONTRIBUTING.md)
## Responsible disclosure ## Responsible disclosure
If you have security issues to report, please refer to our [Responsible Disclosure Policy](https://github.com/sequelize/sequelize/blob/master/SECURITY.md) for more details. If you have security issues to report, please refer to our [Responsible Disclosure Policy](https://github.com/sequelize/sequelize/blob/master/SECURITY.md) for more details.
## Resources ## Resources
- [Changelog](https://github.com/sequelize/sequelize/releases) - [Changelog](https://github.com/sequelize/sequelize/releases)
- [Slack](http://sequelize-slack.herokuapp.com/) - [Slack Inviter](http://sequelize-slack.herokuapp.com/)
- [Stack Overflow](https://stackoverflow.com/questions/tagged/sequelize.js) - [Stack Overflow](https://stackoverflow.com/questions/tagged/sequelize.js)
### Tools ### Tools
- [CLI](https://github.com/sequelize/cli) - [CLI](https://github.com/sequelize/cli)
- [With TypeScript](https://sequelize.org/master/manual/typescript.html) - [With TypeScript](https://sequelize.org/master/manual/typescript.html)
- [Enhanced TypeScript with decorators](https://github.com/RobinBuschmann/sequelize-typescript) - [Enhanced TypeScript with decorators](https://github.com/RobinBuschmann/sequelize-typescript)
...@@ -54,5 +55,6 @@ If you have security issues to report, please refer to our [Responsible Disclosu ...@@ -54,5 +55,6 @@ If you have security issues to report, please refer to our [Responsible Disclosu
- [Plugins](https://sequelize.org/master/manual/resources.html) - [Plugins](https://sequelize.org/master/manual/resources.html)
### Translations ### Translations
- [English](https://sequelize.org/master) (OFFICIAL) - [English](https://sequelize.org/master) (OFFICIAL)
- [中文文档](https://github.com/demopark/sequelize-docs-Zh-CN) (UNOFFICIAL) - [中文文档](https://github.com/demopark/sequelize-docs-Zh-CN) (UNOFFICIAL)
...@@ -6,6 +6,7 @@ The following table describes the versions of this project that are currently su ...@@ -6,6 +6,7 @@ The following table describes the versions of this project that are currently su
| Version | Supported | | Version | Supported |
| ------- | ------------------ | | ------- | ------------------ |
| 6.x | :heavy_check_mark: |
| 5.x | :heavy_check_mark: | | 5.x | :heavy_check_mark: |
## Responsible disclosure policy ## Responsible disclosure policy
......
...@@ -66,6 +66,33 @@ This method now only takes 2 parameters, `tableName` and `options`. Previously t ...@@ -66,6 +66,33 @@ This method now only takes 2 parameters, `tableName` and `options`. Previously t
## Changelog ## Changelog
### 6.0.0-beta.7
- docs(associations): belongs to many create with through table
- docs(query-interface): fix broken links [#12272](https://github.com/sequelize/sequelize/pull/12272)
- docs(sequelize): omitNull only works for CREATE/UPDATE queries
- docs: asyncify [#12297](https://github.com/sequelize/sequelize/pull/12297)
- docs: responsive [#12308](https://github.com/sequelize/sequelize/pull/12308)
- docs: update feature request template
- feat(postgres): native upsert [#12301](https://github.com/sequelize/sequelize/pull/12301)
- feat(sequelize): allow passing dialectOptions.options from url [#12404](https://github.com/sequelize/sequelize/pull/12404)
- fix(include): check if attributes specified for included through model [#12316](https://github.com/sequelize/sequelize/pull/12316)
- fix(model.destroy): return 0 with truncate [#12281](https://github.com/sequelize/sequelize/pull/12281)
- fix(mssql): empty order array generates invalid FETCH statement [#12261](https://github.com/sequelize/sequelize/pull/12261)
- fix(postgres): parse enums correctly when describing a table [#12409](https://github.com/sequelize/sequelize/pull/12409)
- fix(query): ensure correct return signature for QueryTypes.RAW [#12305](https://github.com/sequelize/sequelize/pull/12305)
- fix(query): preserve cls context for logger [#12328](https://github.com/sequelize/sequelize/pull/12328)
- fix(query-generator): do not generate GROUP BY clause if options.group is empty [#12343](https://github.com/sequelize/sequelize/pull/12343)
- fix(reload): include default scope [#12399](https://github.com/sequelize/sequelize/pull/12399)
- fix(types): add Association into OrderItem type [#12332](https://github.com/sequelize/sequelize/pull/12332)
- fix(types): add clientMinMessages to Options interface [#12375](https://github.com/sequelize/sequelize/pull/12375)
- fix(types): transactionType in Options [#12377](https://github.com/sequelize/sequelize/pull/12377)
- fix(types): add support for optional values in "where" clauses [#12337](https://github.com/sequelize/sequelize/pull/12337)
- fix(types): add missing fields to 'FindOrCreateType' [#12338](https://github.com/sequelize/sequelize/pull/12338)
- fix: add missing sql and parameters properties to some query errors [#12299](https://github.com/sequelize/sequelize/pull/12299)
- fix: remove custom inspect [#12262](https://github.com/sequelize/sequelize/pull/12262)
- refactor: cleanup query generators [#12304](https://github.com/sequelize/sequelize/pull/12304)
### 6.0.0-beta.6 ### 6.0.0-beta.6
- docs(add-constraint): options.fields support - docs(add-constraint): options.fields support
......
...@@ -118,6 +118,16 @@ ...@@ -118,6 +118,16 @@
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS" "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
} }
}, },
"release": {
"branch": "master",
"verifyConditions": [
"@semantic-release/npm",
"@semantic-release/github"
]
},
"publishConfig": {
"tag": "latest"
},
"scripts": { "scripts": {
"lint": "eslint lib test --quiet", "lint": "eslint lib test --quiet",
"lint-docs": "markdownlint docs", "lint-docs": "markdownlint docs",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!