Skip to content
This repository has been archived by the owner on Jan 24, 2025. It is now read-only.

fix(docz-core): extend base config instead of overwriting user config #1028

Merged
merged 1 commit into from
Aug 27, 2019

Conversation

axe312ger
Copy link
Contributor

repopened as requested with dev branch as root/base

@rakannimer
Copy link
Contributor

Thanks ! Will update here when it's published.

@rakannimer rakannimer merged commit 7b46c2b into doczjs:dev Aug 27, 2019
@rakannimer rakannimer added the pending-release Issue fixed but not published to npm yet label Aug 27, 2019
rakannimer added a commit that referenced this pull request Aug 28, 2019
* fix(gatsby-theme-docz): add missing source sans pro font (#991)

* fix(gatsby-theme-docz): replace fragment tag to the short syntax (#992)

* fix(docz-example-basic): add explicit dependency to scheduler

* fix(docz): make scheduler dependency explicit

* docs(docz-example-basic): add instructions to quickly run the example

* fix(docz-example-typescript): add scheduler dep and docs #1020

* fix(docz-example-typescript): add scheduler dep and docs

* fix(docz-example-flow): add @babel/preset-flow with onCreateBabelConfig

* docs(docz-example-flow): add setup instructions

* Fix flow example, add setup doc (#1021)

* fix(docz-example-basic): add explicit dependency to scheduler

* fix(docz): make scheduler dependency explicit

* docs(docz-example-basic): add instructions to quickly run the example

* fix(docz-example-typescript): add scheduler dep and docs

* fix(docz-example-flow): add @babel/preset-flow with onCreateBabelConfig

* docs(docz-example-flow): add setup instructions

* Update Gatsby example (#1022)

* fix(docz-example-basic): add explicit dependency to scheduler

* fix(docz): make scheduler dependency explicit

* docs(docz-example-basic): add instructions to quickly run the example

* fix(docz-example-typescript): add scheduler dep and docs

* fix(docz-example-flow): add @babel/preset-flow with onCreateBabelConfig

* docs(docz-example-flow): add setup instructions

* fix(docz-example-gatsby): make gatsby example runnable outside repo

* docs(docz-example-gatsby): add setup instructions

* fix(docz): remove window check from useCurrentDoc fixes #985 (#1023)

* feat(docz-core): setup jest and add first test

* test(docz): add tests for states.config and states.entries

* ci(docz): add circleci tests (#1027)

* fix(gatsby-theme-docz): fix minor linting issue

* feat(docz): add circleci

* chore(docz): add bootstrap to ci

* ci(docz): clear cache

* ci(docz): add build step to install

* ci(docz): build only

* ci(docz-core): try without build

* ci(docz-core): remove __tests__ from include

* ci(docz-core): add build

* ci(docz-core): back to packages

* fix(docz-example-typescript): add externally usable tsconfig

* fix(docz-example-typescript): add extension of tsx file in mdx

* docs(docz): add link to v1

* docs(docz): add create-docz-app to examples

* fix(docz-example-flow): add scheduler dep

* fix(docz-example-styled-components): add scheduler and remove caaf

* docs(docz-example-react-native): add scheduler temp

* docs(docz-example-images): add scheduler temp

* fix(docz-core): wait for app to be ready before opening the browser

* fix(docz-core): extend base config instead of overwriting user config (#1028)

* chore(docz-core): typo

* chore(docz): bump version to 2.0.0-rc.2

* test(docz): loosen up test temporarily

* chore(docz-core): prefix scripts with yarn

* chore(docz): add release:next script

* chore(docz): lerna version fix

* v2.0.0-rc.2

* chore(docz): bump to 2.0.0-rc.3

* 2.0.0-rc.4

* 2.0.0-rc.5
@axe312ger axe312ger deleted the fix-base-config-dev branch September 3, 2019 15:40
amprew pushed a commit to amprew/docz that referenced this pull request Oct 3, 2019
* fix(gatsby-theme-docz): add missing source sans pro font (doczjs#991)

* fix(gatsby-theme-docz): replace fragment tag to the short syntax (doczjs#992)

* fix(docz-example-basic): add explicit dependency to scheduler

* fix(docz): make scheduler dependency explicit

* docs(docz-example-basic): add instructions to quickly run the example

* fix(docz-example-typescript): add scheduler dep and docs doczjs#1020

* fix(docz-example-typescript): add scheduler dep and docs

* fix(docz-example-flow): add @babel/preset-flow with onCreateBabelConfig

* docs(docz-example-flow): add setup instructions

* Fix flow example, add setup doc (doczjs#1021)

* fix(docz-example-basic): add explicit dependency to scheduler

* fix(docz): make scheduler dependency explicit

* docs(docz-example-basic): add instructions to quickly run the example

* fix(docz-example-typescript): add scheduler dep and docs

* fix(docz-example-flow): add @babel/preset-flow with onCreateBabelConfig

* docs(docz-example-flow): add setup instructions

* Update Gatsby example (doczjs#1022)

* fix(docz-example-basic): add explicit dependency to scheduler

* fix(docz): make scheduler dependency explicit

* docs(docz-example-basic): add instructions to quickly run the example

* fix(docz-example-typescript): add scheduler dep and docs

* fix(docz-example-flow): add @babel/preset-flow with onCreateBabelConfig

* docs(docz-example-flow): add setup instructions

* fix(docz-example-gatsby): make gatsby example runnable outside repo

* docs(docz-example-gatsby): add setup instructions

* fix(docz): remove window check from useCurrentDoc fixes doczjs#985 (doczjs#1023)

* feat(docz-core): setup jest and add first test

* test(docz): add tests for states.config and states.entries

* ci(docz): add circleci tests (doczjs#1027)

* fix(gatsby-theme-docz): fix minor linting issue

* feat(docz): add circleci

* chore(docz): add bootstrap to ci

* ci(docz): clear cache

* ci(docz): add build step to install

* ci(docz): build only

* ci(docz-core): try without build

* ci(docz-core): remove __tests__ from include

* ci(docz-core): add build

* ci(docz-core): back to packages

* fix(docz-example-typescript): add externally usable tsconfig

* fix(docz-example-typescript): add extension of tsx file in mdx

* docs(docz): add link to v1

* docs(docz): add create-docz-app to examples

* fix(docz-example-flow): add scheduler dep

* fix(docz-example-styled-components): add scheduler and remove caaf

* docs(docz-example-react-native): add scheduler temp

* docs(docz-example-images): add scheduler temp

* fix(docz-core): wait for app to be ready before opening the browser

* fix(docz-core): extend base config instead of overwriting user config (doczjs#1028)

* chore(docz-core): typo

* chore(docz): bump version to 2.0.0-rc.2

* test(docz): loosen up test temporarily

* chore(docz-core): prefix scripts with yarn

* chore(docz): add release:next script

* chore(docz): lerna version fix

* v2.0.0-rc.2

* chore(docz): bump to 2.0.0-rc.3

* 2.0.0-rc.4

* 2.0.0-rc.5
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
pending-release Issue fixed but not published to npm yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants