From 7b4ed3623f5774d7783c39962bfa1ce97938e310 Mon Sep 17 00:00:00 2001 From: Jess Telford Date: Thu, 24 Oct 2019 11:55:51 +1100 Subject: [PATCH] =?UTF-8?q?Release=20@keystonejs/*=20packages=20(=E3=81=A4?= =?UTF-8?q?=EF=BC=BE=E2=97=A1=EF=BC=BE)=E3=81=A4=20(#1821)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "Version Packages (#1814)" This reverts commit a0a3ebe821724d98764a13dc4b1353d2c95374ca. * Release @keystonejs/* packages (つ＾◡＾)つ --- .changeset/honest-poems-peel.md | 56 +++++++++++++++++++ .flowconfig | 2 +- CONTRIBUTING.md | 10 ++-- api-tests/CHANGELOG.md | 22 +------- api-tests/DateTime.test.js | 4 +- api-tests/auth-header.test.js | 8 +-- api-tests/default-value/defaults.test.js | 4 +- .../extend-graphql-schema.test.js | 4 +- api-tests/fields.test.js | 2 +- api-tests/hooks/list-hooks.test.js | 4 +- api-tests/package.json | 20 +++---- api-tests/queries-access-control/meta.test.js | 4 +- api-tests/queries/cache-hints.test.js | 4 +- api-tests/queries/limits.test.js | 6 +- api-tests/queries/meta.test.js | 4 +- api-tests/queries/relationships.test.js | 4 +- .../filtering/access-control.test.js | 4 +- .../relationships/filtering/filtering.test.js | 4 +- .../relationships/filtering/nested.test.js | 4 +- .../relationships/mongo/data-storage.test.js | 4 +- .../nested-mutations/connect-many.test.js | 4 +- .../nested-mutations/connect-singular.test.js | 4 +- .../create-and-connect-many.test.js | 4 +- .../create-and-connect-singular.test.js | 4 +- .../nested-mutations/create-many.test.js | 4 +- .../nested-mutations/create-singular.test.js | 4 +- .../disconnect-all-many.test.js | 4 +- .../disconnect-all-singular.test.js | 4 +- .../nested-mutations/disconnect-many.test.js | 4 +- .../disconnect-singular.test.js | 4 +- .../two-way-backreference/to-many.test.js | 4 +- .../to-one-required.test.js | 4 +- .../two-way-backreference/to-one.test.js | 4 +- api-tests/required.test.js | 4 +- api-tests/uniqueness/unique.test.js | 4 +- benchmarks/CHANGELOG.md | 21 +------ benchmarks/fixtures/create-related.js | 4 +- benchmarks/fixtures/create.js | 4 +- benchmarks/fixtures/query.js | 4 +- benchmarks/lib/utils.js | 2 +- benchmarks/package.json | 18 +++--- demo-projects/blog/CHANGELOG.md | 24 -------- demo-projects/blog/index.js | 14 ++--- demo-projects/blog/package.json | 28 +++++----- demo-projects/blog/schema.js | 8 +-- demo-projects/meetup/CHANGELOG.md | 25 +-------- demo-projects/meetup/emails/index.js | 2 +- demo-projects/meetup/index.js | 12 ++-- demo-projects/meetup/package.json | 26 ++++----- demo-projects/meetup/schema.js | 6 +- demo-projects/todo/CHANGELOG.md | 20 +------ demo-projects/todo/index.js | 12 ++-- demo-projects/todo/package.json | 16 +++--- docs/api/authentication.md | 2 +- docs/api/validation.md | 2 +- docs/guides/access-control.md | 2 +- docs/guides/add-lists.md | 6 +- docs/guides/apps.md | 10 ++-- docs/guides/authentication.md | 6 +- docs/guides/custom-mutations.md | 2 +- docs/guides/custom-server.md | 18 +++--- docs/guides/initial-data.md | 10 ++-- docs/guides/migrations.md | 2 +- docs/guides/new-project.md | 16 +++--- docs/guides/schema.md | 2 +- package.json | 12 ++-- packages/access-control/CHANGELOG.md | 15 +---- packages/access-control/lib/access-control.js | 2 +- packages/access-control/package.json | 6 +- packages/adapter-knex/CHANGELOG.md | 18 +----- packages/adapter-knex/README.md | 2 +- packages/adapter-knex/lib/adapter-knex.js | 8 +-- packages/adapter-knex/package.json | 12 ++-- packages/adapter-mongoose/CHANGELOG.md | 19 +------ packages/adapter-mongoose/README.md | 2 +- .../adapter-mongoose/lib/adapter-mongoose.js | 10 ++-- packages/adapter-mongoose/package.json | 14 ++--- packages/apollo-helpers/CHANGELOG.md | 10 +--- packages/apollo-helpers/README.md | 6 +- packages/apollo-helpers/package.json | 4 +- packages/app-admin-ui/CHANGELOG.md | 21 +------ packages/app-admin-ui/README.md | 6 +- packages/app-admin-ui/client/FIELD_TYPES | 2 +- packages/app-admin-ui/client/classes/List.js | 2 +- .../client/components/CreateItemModal.js | 2 +- .../client/components/ListTable.js | 2 +- .../client/components/UpdateManyItemsModal.js | 2 +- .../app-admin-ui/client/pages/Item/index.js | 2 +- .../client/pages/List/FieldSelect.js | 2 +- .../client/pages/List/url-state.js | 2 +- packages/app-admin-ui/package.json | 14 ++--- .../app-admin-ui/server/getWebpackConfig.js | 4 +- packages/app-graphql-playground/CHANGELOG.md | 17 +----- packages/app-graphql-playground/README.md | 8 +-- packages/app-graphql-playground/package.json | 10 ++-- packages/app-graphql/CHANGELOG.md | 20 +------ packages/app-graphql/README.md | 6 +- packages/app-graphql/index.js | 4 +- packages/app-graphql/lib/apolloServer.js | 4 +- packages/app-graphql/package.json | 12 ++-- packages/app-next/CHANGELOG.md | 10 +--- packages/app-next/README.md | 2 +- packages/app-next/package.json | 4 +- packages/app-nuxt/CHANGELOG.md | 10 +--- packages/app-nuxt/README.md | 2 +- packages/app-nuxt/package.json | 4 +- packages/app-schema-router/CHANGELOG.md | 10 +--- packages/app-schema-router/README.md | 10 ++-- packages/app-schema-router/package.json | 4 +- packages/app-static/CHANGELOG.md | 10 +--- packages/app-static/README.md | 8 +-- packages/app-static/package.json | 4 +- packages/arch/packages/alert/package.json | 2 +- packages/arch/packages/badge/package.json | 2 +- packages/arch/packages/button/package.json | 2 +- packages/arch/packages/card/package.json | 2 +- .../arch/packages/color-utils/package.json | 2 +- packages/arch/packages/common/package.json | 2 +- packages/arch/packages/confirm/package.json | 2 +- packages/arch/packages/controls/package.json | 2 +- .../arch/packages/day-picker/package.json | 2 +- packages/arch/packages/dialog/package.json | 2 +- packages/arch/packages/drawer/package.json | 2 +- packages/arch/packages/dropdown/package.json | 2 +- packages/arch/packages/fields/package.json | 2 +- packages/arch/packages/filters/package.json | 2 +- packages/arch/packages/icons/package.json | 2 +- packages/arch/packages/input/package.json | 2 +- packages/arch/packages/layout/package.json | 2 +- packages/arch/packages/loading/package.json | 2 +- packages/arch/packages/lozenge/package.json | 2 +- .../arch/packages/modal-utils/package.json | 2 +- packages/arch/packages/navbar/package.json | 2 +- packages/arch/packages/options/package.json | 2 +- .../arch/packages/pagination/package.json | 2 +- packages/arch/packages/pill/package.json | 2 +- packages/arch/packages/popout/package.json | 2 +- packages/arch/packages/select/package.json | 2 +- packages/arch/packages/theme/package.json | 2 +- packages/arch/packages/tooltip/package.json | 2 +- .../arch/packages/typography/package.json | 2 +- packages/auth-passport/CHANGELOG.md | 16 +----- packages/auth-passport/README.md | 22 ++++---- packages/auth-passport/lib/Passport.js | 4 +- packages/auth-passport/package.json | 8 +-- packages/auth-password/CHANGELOG.md | 16 +----- packages/auth-password/package.json | 8 +-- packages/build-field-types/CHANGELOG.md | 10 +--- packages/build-field-types/README.md | 2 +- .../basic-field-type/src/index.js | 2 +- packages/build-field-types/package.json | 4 +- .../__snapshots__/field-types.js.snap | 2 +- packages/create-keystone-app/CHANGELOG.md | 8 --- .../example-projects/blank/CHANGELOG.md | 18 +----- .../example-projects/blank/index.js | 8 +-- .../example-projects/blank/package.json | 12 ++-- .../example-projects/config.js | 6 +- .../example-projects/nuxt/CHANGELOG.md | 20 +------ .../example-projects/nuxt/index.js | 12 ++-- .../example-projects/nuxt/package.json | 16 +++--- .../example-projects/starter/CHANGELOG.md | 20 +------ .../example-projects/starter/index.js | 12 ++-- .../example-projects/starter/package.json | 16 +++--- .../example-projects/todo/CHANGELOG.md | 20 +------ .../example-projects/todo/index.js | 12 ++-- .../example-projects/todo/package.json | 16 +++--- packages/create-keystone-app/package.json | 4 +- .../templates/adapter-knex.js | 2 +- .../templates/adapter-mongoose.js | 2 +- packages/email/CHANGELOG.md | 10 +--- packages/email/README.md | 8 +-- packages/email/lib/email.js | 2 +- packages/email/package.json | 4 +- packages/field-content/CHANGELOG.md | 17 +----- packages/field-content/package.json | 10 ++-- packages/field-content/src/Block.js | 2 +- packages/field-content/src/Implementation.js | 6 +- .../field-content/src/blocks/blockquote.js | 2 +- packages/field-content/src/blocks/caption.js | 2 +- packages/field-content/src/blocks/heading.js | 2 +- .../src/blocks/image-container.js | 2 +- packages/field-content/src/blocks/image.js | 2 +- packages/field-content/src/blocks/link.js | 2 +- .../field-content/src/blocks/list-item.js | 2 +- .../field-content/src/blocks/ordered-list.js | 2 +- .../field-content/src/blocks/paragraph.js | 2 +- .../src/blocks/unordered-list.js | 2 +- packages/field-content/src/index.js | 4 +- packages/field-content/src/slate-walker.js | 2 +- .../field-content/src/views/Controller.js | 4 +- packages/field-views-loader/CHANGELOG.md | 10 +--- packages/field-views-loader/index.js | 2 +- packages/field-views-loader/package.json | 4 +- packages/fields-auto-increment/CHANGELOG.md | 16 +----- packages/fields-auto-increment/README.md | 4 +- packages/fields-auto-increment/package.json | 8 +-- .../src/Implementation.js | 4 +- packages/fields-auto-increment/src/index.js | 2 +- packages/fields-datetime-utc/CHANGELOG.md | 17 +----- packages/fields-datetime-utc/package.json | 10 ++-- .../fields-datetime-utc/src/Implementation.js | 6 +- packages/fields-datetime-utc/src/index.js | 2 +- packages/fields-markdown/CHANGELOG.md | 16 +----- packages/fields-markdown/package.json | 8 +-- packages/fields-markdown/src/index.js | 4 +- packages/fields-mongoid/CHANGELOG.md | 18 +----- packages/fields-mongoid/README.md | 4 +- packages/fields-mongoid/package.json | 12 ++-- packages/fields-mongoid/src/Implementation.js | 6 +- packages/fields-mongoid/src/index.js | 6 +- .../fields-mongoid/src/views/Controller.js | 2 +- packages/fields-wysiwyg-tinymce/CHANGELOG.md | 16 +----- packages/fields-wysiwyg-tinymce/package.json | 8 +-- packages/fields-wysiwyg-tinymce/src/index.js | 4 +- packages/fields/CHANGELOG.md | 21 +------ packages/fields/README.md | 2 +- packages/fields/package.json | 18 +++--- packages/fields/src/Implementation.js | 2 +- .../src/types/CalendarDay/Implementation.js | 4 +- .../src/types/CalendarDay/filterTests.js | 2 +- .../fields/src/types/CalendarDay/index.js | 2 +- .../src/types/Checkbox/Implementation.js | 4 +- .../fields/src/types/Checkbox/filterTests.js | 2 +- packages/fields/src/types/Checkbox/index.js | 2 +- .../src/types/CloudinaryImage/ImageBlock.js | 6 +- .../fields/src/types/CloudinaryImage/index.js | 2 +- packages/fields/src/types/Color/index.js | 2 +- .../src/types/DateTime/Implementation.js | 4 +- packages/fields/src/types/DateTime/README.md | 2 +- .../fields/src/types/DateTime/filterTests.js | 2 +- packages/fields/src/types/DateTime/index.js | 2 +- .../src/types/Decimal/Implementation.js | 4 +- .../fields/src/types/Decimal/filterTests.js | 2 +- packages/fields/src/types/Decimal/index.js | 2 +- .../fields/src/types/File/Implementation.js | 4 +- packages/fields/src/types/File/index.js | 2 +- .../fields/src/types/Float/Implementation.js | 4 +- .../fields/src/types/Float/filterTests.js | 2 +- packages/fields/src/types/Float/index.js | 2 +- .../src/types/Integer/Implementation.js | 4 +- .../fields/src/types/Integer/filterTests.js | 2 +- packages/fields/src/types/Integer/index.js | 2 +- .../src/types/Location/Implementation.js | 4 +- packages/fields/src/types/Location/README.md | 4 +- packages/fields/src/types/Location/index.js | 2 +- .../fields/src/types/OEmbed/Implementation.js | 4 +- .../fields/src/types/OEmbed/OEmbedBlock.js | 4 +- packages/fields/src/types/OEmbed/README.md | 6 +- packages/fields/src/types/OEmbed/index.js | 2 +- .../src/types/Password/Implementation.js | 4 +- .../fields/src/types/Password/filterTests.js | 2 +- packages/fields/src/types/Password/index.js | 2 +- .../src/types/Relationship/Implementation.js | 4 +- .../fields/src/types/Relationship/index.js | 2 +- .../types/Relationship/nested-mutations.js | 2 +- .../Relationship/tests/implementation.test.js | 2 +- .../Relationship/views/CreateItemModal.js | 2 +- .../fields/src/types/Select/Implementation.js | 4 +- .../fields/src/types/Select/filterTests.js | 2 +- packages/fields/src/types/Select/index.js | 2 +- .../src/types/Slug/Implementation.test.js | 2 +- packages/fields/src/types/Slug/README.md | 12 ++-- packages/fields/src/types/Slug/index.js | 2 +- .../fields/src/types/Text/Implementation.js | 4 +- packages/fields/src/types/Text/filterTests.js | 2 +- packages/fields/src/types/Text/index.js | 2 +- .../src/types/Unsplash/Implementation.js | 4 +- packages/fields/src/types/Unsplash/README.md | 4 +- .../src/types/Unsplash/UnsplashBlock.js | 4 +- packages/fields/src/types/Unsplash/index.js | 2 +- packages/fields/src/types/Url/index.js | 2 +- .../fields/src/types/Uuid/Implementation.js | 4 +- packages/fields/src/types/Uuid/filterTests.js | 2 +- packages/fields/src/types/Uuid/index.js | 6 +- packages/fields/tests/idFilterTests.js | 2 +- packages/file-adapters/CHANGELOG.md | 10 +--- packages/file-adapters/package.json | 4 +- packages/keystone/CHANGELOG.md | 23 +------- packages/keystone/README.md | 2 +- packages/keystone/lib/Keystone/index.js | 10 ++-- .../lib/Keystone/relationship-utils.js | 2 +- packages/keystone/lib/List/index.js | 12 ++-- packages/keystone/package.json | 20 +++---- packages/keystone/tests/Keystone.test.js | 2 +- packages/keystone/tests/List.test.js | 8 +-- .../keystone/tests/relationship-utils.test.js | 2 +- packages/list-plugins/CHANGELOG.md | 15 +---- packages/list-plugins/README.md | 8 +-- packages/list-plugins/atTracking.md | 4 +- packages/list-plugins/byTracking.md | 4 +- .../list-plugins/lib/tracking/atTracking.js | 2 +- .../list-plugins/lib/tracking/byTracking.js | 2 +- packages/list-plugins/package.json | 6 +- packages/logger/CHANGELOG.md | 10 +--- packages/logger/README.md | 2 +- packages/logger/package.json | 6 +- packages/mongo-join-builder/CHANGELOG.md | 15 +---- packages/mongo-join-builder/README.md | 2 +- .../mongo-join-builder/lib/join-builder.js | 2 +- .../mongo-join-builder/lib/query-parser.js | 2 +- .../lib/tokenizers/simple.js | 2 +- packages/mongo-join-builder/package.json | 6 +- packages/oembed-adapters/CHANGELOG.md | 15 +---- packages/oembed-adapters/README.md | 8 +-- packages/oembed-adapters/package.json | 6 +- packages/oembed-adapters/src/iframely.js | 2 +- packages/session/CHANGELOG.md | 10 +--- packages/session/package.json | 4 +- packages/test-utils/CHANGELOG.md | 18 +----- packages/test-utils/README.md | 2 +- packages/test-utils/lib/test-utils.js | 8 +-- packages/test-utils/package.json | 14 ++--- packages/utils/CHANGELOG.md | 10 +--- packages/utils/package.json | 6 +- test-projects/access-control/CHANGELOG.md | 21 +------ test-projects/access-control/index.js | 14 ++--- test-projects/access-control/package.json | 20 +++---- test-projects/basic/CHANGELOG.md | 24 +------- .../custom-fields/Stars/Implementation.js | 2 +- .../basic/custom-fields/Stars/README.md | 10 ++-- .../basic/custom-fields/Stars/index.js | 2 +- test-projects/basic/index.js | 20 +++---- test-projects/basic/package.json | 26 ++++----- test-projects/client-validation/CHANGELOG.md | 21 +------ test-projects/client-validation/index.js | 12 ++-- test-projects/client-validation/package.json | 20 +++---- test-projects/login/CHANGELOG.md | 23 +------- test-projects/login/index.js | 14 ++--- test-projects/login/package.json | 24 ++++---- test-projects/social-login/CHANGELOG.md | 23 +------- test-projects/social-login/index.js | 16 +++--- test-projects/social-login/package.json | 24 ++++---- test-projects/social-login/server.js | 2 +- website/CHANGELOG.md | 10 +--- website/package.json | 4 +- 335 files changed, 876 insertions(+), 1511 deletions(-) create mode 100644 .changeset/honest-poems-peel.md diff --git a/.changeset/honest-poems-peel.md b/.changeset/honest-poems-peel.md new file mode 100644 index 00000000000..6188843fb57 --- /dev/null +++ b/.changeset/honest-poems-peel.md @@ -0,0 +1,56 @@ +--- +'@keystonejs/api-tests': major +'@keystonejs/benchmarks': major +'@keystonejs/demo-project-blog': major +'@keystonejs/demo-project-meetup': major +'@keystonejs/demo-project-todo': major +'@keystonejs/access-control': major +'@keystonejs/adapter-knex': major +'@keystonejs/adapter-mongoose': major +'@keystonejs/apollo-helpers': major +'@keystonejs/app-admin-ui': major +'@keystonejs/app-graphql-playground': major +'@keystonejs/app-graphql': major +'@keystonejs/app-next': major +'@keystonejs/app-nuxt': major +'@keystonejs/app-schema-router': major +'@keystonejs/app-static': major +'@keystonejs/auth-passport': major +'@keystonejs/auth-password': major +'@keystonejs/build-field-types': major +'@keystonejs/email': major +'@keystonejs/field-content': major +'@keystonejs/field-views-loader': major +'@keystonejs/fields-auto-increment': major +'@keystonejs/fields-datetime-utc': major +'@keystonejs/fields-markdown': major +'@keystonejs/fields-mongoid': major +'@keystonejs/fields-wysiwyg-tinymce': major +'@keystonejs/fields': major +'@keystonejs/file-adapters': major +'@keystonejs/keystone': major +'@keystonejs/list-plugins': major +'@keystonejs/logger': major +'@keystonejs/mongo-join-builder': major +'@keystonejs/oembed-adapters': major +'@keystonejs/session': major +'@keystonejs/test-utils': major +'@keystonejs/utils': major +'@keystonejs/cypress-project-access-control': major +'@keystonejs/cypress-project-basic': major +'@keystonejs/cypress-project-client-validation': major +'@keystonejs/cypress-project-login': major +'@keystonejs/cypress-project-social-login': major +'@keystonejs/website': major +'@keystonejs/example-projects-blank': major +'@keystonejs/example-projects-nuxt': major +'@keystonejs/example-projects-starter': major +'@keystonejs/example-projects-todo': major +'create-keystone-app': minor +--- + +Release @keystonejs/* packages (つ＾◡＾)つ + +- This is the first release of `@keystonejs/*` packages (previously `@keystone-alpha/*`). +- All packages in the `@keystone-alpha` namespace are now available in the `@keystonejs` namespace, starting at version `5.0.0`. +- To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystonejs/*": "^5.0.0"` and update any `require`/`import` statements in your code. diff --git a/.flowconfig b/.flowconfig index 437d8ad51d1..ce80f5f2511 100644 --- a/.flowconfig +++ b/.flowconfig @@ -17,7 +17,7 @@ [lints] [options] -module.name_mapper='^@keystone\/\(.+\)$' -> '/packages/\1' +module.name_mapper='^@keystonejs\/\(.+\)$' -> '/packages/\1' module.name_mapper='.*FIELD_TYPES' -> '/packages/field-views-loader/field-types' module.name_mapper='^@arch-ui\/\([^\/]+\)$' -> '@arch-ui/\1/src/index.js' server.max_workers=1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c3a25734822..3e8688d9aaa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,8 +61,8 @@ An example, if you generate a changeset that includes `adapter-mongoose` as a pa ```md --- -'@keystone/adapter-mongoose': patch -'@keystone/keystone': minor +'@keystonejs/adapter-mongoose': patch +'@keystonejs/keystone': minor --- A very useful description of the changes should be here. @@ -181,11 +181,11 @@ Now, for each release we want to backport to, we follow this process: 1. Checkout the tag of the release - Let's say the package being patched is `@keystone/keystone`, then we + Let's say the package being patched is `@keystonejs/keystone`, then we want to run: ```sh - git checkout -b backport-keystone-14.0.1 @keystone/keystone@14.0.1 + git checkout -b backport-keystone-14.0.1 @keystonejs/keystone@14.0.1 ``` 2. Cherry pick the commit across. @@ -228,7 +228,7 @@ Now, for each release we want to backport to, we follow this process: ```sh (\ - export PACKAGE_NAME=@keystone/keystone && \ + export PACKAGE_NAME=@keystonejs/keystone && \ export OTP_CODE= && \ cd packages/keystone && \ yarn publish --tag=backport --otp=$OTP_CODE && \ diff --git a/api-tests/CHANGELOG.md b/api-tests/CHANGELOG.md index 7f1c7e30096..08323740933 100644 --- a/api-tests/CHANGELOG.md +++ b/api-tests/CHANGELOG.md @@ -1,24 +1,4 @@ -# @keystone/api-tests - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-knex@5.0.0 - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/auth-password@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/keystone@5.0.0 - - @keystone/session@5.0.0 - - @keystone/test-utils@5.0.0 +# @keystonejs/api-tests # @keystone-alpha/api-tests diff --git a/api-tests/DateTime.test.js b/api-tests/DateTime.test.js index 632a9a452d8..1b0bf2ea97f 100644 --- a/api-tests/DateTime.test.js +++ b/api-tests/DateTime.test.js @@ -1,5 +1,5 @@ -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); -const { Text, DateTime } = require('@keystone/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); +const { Text, DateTime } = require('@keystonejs/fields'); const cuid = require('cuid'); function setupKeystone(adapterName) { diff --git a/api-tests/auth-header.test.js b/api-tests/auth-header.test.js index 59098c9f584..5e630609ba0 100644 --- a/api-tests/auth-header.test.js +++ b/api-tests/auth-header.test.js @@ -1,7 +1,7 @@ -const { PasswordAuthStrategy } = require('@keystone/auth-password'); -const { Text, Password, DateTime } = require('@keystone/fields'); -const { multiAdapterRunners, networkedGraphqlRequest } = require('@keystone/test-utils'); -const { setupServer } = require('@keystone/test-utils'); +const { PasswordAuthStrategy } = require('@keystonejs/auth-password'); +const { Text, Password, DateTime } = require('@keystonejs/fields'); +const { multiAdapterRunners, networkedGraphqlRequest } = require('@keystonejs/test-utils'); +const { setupServer } = require('@keystonejs/test-utils'); const cuid = require('cuid'); const initialData = { diff --git a/api-tests/default-value/defaults.test.js b/api-tests/default-value/defaults.test.js index 2d061796896..7e29fac409b 100644 --- a/api-tests/default-value/defaults.test.js +++ b/api-tests/default-value/defaults.test.js @@ -1,5 +1,5 @@ -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); -const { Text } = require('@keystone/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); +const { Text } = require('@keystonejs/fields'); const cuid = require('cuid'); const setupList = (adapterName, fields) => diff --git a/api-tests/extend-graphql-schema/extend-graphql-schema.test.js b/api-tests/extend-graphql-schema/extend-graphql-schema.test.js index 3950d957597..d98b762ae85 100644 --- a/api-tests/extend-graphql-schema/extend-graphql-schema.test.js +++ b/api-tests/extend-graphql-schema/extend-graphql-schema.test.js @@ -1,10 +1,10 @@ -const { Text } = require('@keystone/fields'); +const { Text } = require('@keystonejs/fields'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const cuid = require('cuid'); const falseFn = () => false; diff --git a/api-tests/fields.test.js b/api-tests/fields.test.js index 7fe6031c444..7f19a37533b 100644 --- a/api-tests/fields.test.js +++ b/api-tests/fields.test.js @@ -1,7 +1,7 @@ const fs = require('fs'); const path = require('path'); const cuid = require('cuid'); -const { multiAdapterRunners, setupServer } = require('@keystone/test-utils'); +const { multiAdapterRunners, setupServer } = require('@keystonejs/test-utils'); // `mongodb-memory-server` downloads a binary on first run in CI, which can take // a while, so we bump up the timeout here. diff --git a/api-tests/hooks/list-hooks.test.js b/api-tests/hooks/list-hooks.test.js index a59b69af5dc..005641bc98b 100644 --- a/api-tests/hooks/list-hooks.test.js +++ b/api-tests/hooks/list-hooks.test.js @@ -1,5 +1,5 @@ -const { Text } = require('@keystone/fields'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { Text } = require('@keystonejs/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const cuid = require('cuid'); function setupKeystone(adapterName) { diff --git a/api-tests/package.json b/api-tests/package.json index 2ba3ccad39e..d7b5c0b6df5 100644 --- a/api-tests/package.json +++ b/api-tests/package.json @@ -1,21 +1,21 @@ { - "name": "@keystone/api-tests", + "name": "@keystonejs/api-tests", "description": "A set of tests for running against the KeystoneJS API.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "devDependencies": { - "@keystone/adapter-knex": "^5.0.0", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/keystone": "^5.0.0", - "@keystone/session": "^5.0.0", - "@keystone/test-utils": "^5.0.0", + "@keystonejs/adapter-knex": "^4.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", + "@keystonejs/session": "^4.0.0", + "@keystonejs/test-utils": "^4.0.0", "body-parser": "^1.18.2", "cookie-signature": "^1.1.0", "cuid": "^2.1.6", @@ -23,7 +23,7 @@ "testcheck": "^1.0.0-rc.2" }, "dependencies": { - "@keystone/auth-password": "^5.0.0", + "@keystonejs/auth-password": "^4.0.0", "express": "^4.17.1" } } diff --git a/api-tests/queries-access-control/meta.test.js b/api-tests/queries-access-control/meta.test.js index 8c3a694a533..ca55c27172d 100644 --- a/api-tests/queries-access-control/meta.test.js +++ b/api-tests/queries-access-control/meta.test.js @@ -1,5 +1,5 @@ -const { Text, Relationship } = require('@keystone/fields'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { Text, Relationship } = require('@keystonejs/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const cuid = require('cuid'); function setupKeystone(adapterName) { diff --git a/api-tests/queries/cache-hints.test.js b/api-tests/queries/cache-hints.test.js index 9dc79299918..81a377bb018 100644 --- a/api-tests/queries/cache-hints.test.js +++ b/api-tests/queries/cache-hints.test.js @@ -1,9 +1,9 @@ -const { Integer, Text, Relationship } = require('@keystone/fields'); +const { Integer, Text, Relationship } = require('@keystonejs/fields'); const { multiAdapterRunners, setupServer, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const cuid = require('cuid'); diff --git a/api-tests/queries/limits.test.js b/api-tests/queries/limits.test.js index 39d6aee9b90..1be1781550b 100644 --- a/api-tests/queries/limits.test.js +++ b/api-tests/queries/limits.test.js @@ -1,13 +1,13 @@ -const { Integer, Text, Relationship } = require('@keystone/fields'); +const { Integer, Text, Relationship } = require('@keystonejs/fields'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const { validation: { depthLimit, definitionLimit, fieldLimit }, -} = require('@keystone/app-graphql'); +} = require('@keystonejs/app-graphql'); const cuid = require('cuid'); diff --git a/api-tests/queries/meta.test.js b/api-tests/queries/meta.test.js index 033784f3df6..0d82877305e 100644 --- a/api-tests/queries/meta.test.js +++ b/api-tests/queries/meta.test.js @@ -1,5 +1,5 @@ -const { Text, Relationship } = require('@keystone/fields'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { Text, Relationship } = require('@keystonejs/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const cuid = require('cuid'); function setupKeystone(adapterName) { diff --git a/api-tests/queries/relationships.test.js b/api-tests/queries/relationships.test.js index 69984c1283f..985c586629e 100644 --- a/api-tests/queries/relationships.test.js +++ b/api-tests/queries/relationships.test.js @@ -1,7 +1,7 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { Text, Relationship } = require('@keystonejs/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); const cuid = require('cuid'); diff --git a/api-tests/relationships/filtering/access-control.test.js b/api-tests/relationships/filtering/access-control.test.js index 90514b61b41..1b1a051dfc9 100644 --- a/api-tests/relationships/filtering/access-control.test.js +++ b/api-tests/relationships/filtering/access-control.test.js @@ -1,10 +1,10 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const { multiAdapterRunners, setupServer, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const cuid = require('cuid'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/filtering/filtering.test.js b/api-tests/relationships/filtering/filtering.test.js index a22c61fcee6..e3c1a4e16f6 100644 --- a/api-tests/relationships/filtering/filtering.test.js +++ b/api-tests/relationships/filtering/filtering.test.js @@ -1,5 +1,5 @@ -const { Text, Relationship } = require('@keystone/fields'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { Text, Relationship } = require('@keystonejs/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const cuid = require('cuid'); function setupKeystone(adapterName) { diff --git a/api-tests/relationships/filtering/nested.test.js b/api-tests/relationships/filtering/nested.test.js index 65353bb9779..40d0b308e93 100644 --- a/api-tests/relationships/filtering/nested.test.js +++ b/api-tests/relationships/filtering/nested.test.js @@ -1,5 +1,5 @@ -const { Text, Relationship } = require('@keystone/fields'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { Text, Relationship } = require('@keystonejs/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const cuid = require('cuid'); function setupKeystone(adapterName) { diff --git a/api-tests/relationships/mongo/data-storage.test.js b/api-tests/relationships/mongo/data-storage.test.js index 33aedb6013e..5b4d1ba0f57 100644 --- a/api-tests/relationships/mongo/data-storage.test.js +++ b/api-tests/relationships/mongo/data-storage.test.js @@ -1,5 +1,5 @@ -const { Text, Relationship } = require('@keystone/fields'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { Text, Relationship } = require('@keystonejs/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const cuid = require('cuid'); function setupKeystone(adapterName) { diff --git a/api-tests/relationships/nested-mutations/connect-many.test.js b/api-tests/relationships/nested-mutations/connect-many.test.js index aa03ca055ef..5c9c1c5947b 100644 --- a/api-tests/relationships/nested-mutations/connect-many.test.js +++ b/api-tests/relationships/nested-mutations/connect-many.test.js @@ -1,12 +1,12 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/nested-mutations/connect-singular.test.js b/api-tests/relationships/nested-mutations/connect-singular.test.js index 1a3f35992ad..1e15c2bf93d 100644 --- a/api-tests/relationships/nested-mutations/connect-singular.test.js +++ b/api-tests/relationships/nested-mutations/connect-singular.test.js @@ -1,12 +1,12 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); function setupKeystone(adapterName) { return setupServer({ diff --git a/api-tests/relationships/nested-mutations/create-and-connect-many.test.js b/api-tests/relationships/nested-mutations/create-and-connect-many.test.js index ae34e987f0b..da4e1d2c580 100644 --- a/api-tests/relationships/nested-mutations/create-and-connect-many.test.js +++ b/api-tests/relationships/nested-mutations/create-and-connect-many.test.js @@ -1,12 +1,12 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/nested-mutations/create-and-connect-singular.test.js b/api-tests/relationships/nested-mutations/create-and-connect-singular.test.js index 540275509a1..42012a88c4f 100644 --- a/api-tests/relationships/nested-mutations/create-and-connect-singular.test.js +++ b/api-tests/relationships/nested-mutations/create-and-connect-singular.test.js @@ -1,6 +1,6 @@ -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); function setupKeystone(adapterName) { return setupServer({ diff --git a/api-tests/relationships/nested-mutations/create-many.test.js b/api-tests/relationships/nested-mutations/create-many.test.js index 4c4b90d67da..87735f3c12b 100644 --- a/api-tests/relationships/nested-mutations/create-many.test.js +++ b/api-tests/relationships/nested-mutations/create-many.test.js @@ -1,12 +1,12 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/nested-mutations/create-singular.test.js b/api-tests/relationships/nested-mutations/create-singular.test.js index 69d47890702..d965dd83a6a 100644 --- a/api-tests/relationships/nested-mutations/create-singular.test.js +++ b/api-tests/relationships/nested-mutations/create-singular.test.js @@ -1,12 +1,12 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); function setupKeystone(adapterName) { return setupServer({ diff --git a/api-tests/relationships/nested-mutations/disconnect-all-many.test.js b/api-tests/relationships/nested-mutations/disconnect-all-many.test.js index 691c22ca1b4..515be32bbab 100644 --- a/api-tests/relationships/nested-mutations/disconnect-all-many.test.js +++ b/api-tests/relationships/nested-mutations/disconnect-all-many.test.js @@ -1,12 +1,12 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); const { setupServer, graphqlRequest, multiAdapterRunners, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/nested-mutations/disconnect-all-singular.test.js b/api-tests/relationships/nested-mutations/disconnect-all-singular.test.js index 12a6effb12c..2563c2d16b0 100644 --- a/api-tests/relationships/nested-mutations/disconnect-all-singular.test.js +++ b/api-tests/relationships/nested-mutations/disconnect-all-singular.test.js @@ -1,12 +1,12 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/nested-mutations/disconnect-many.test.js b/api-tests/relationships/nested-mutations/disconnect-many.test.js index 4d4bb649de7..e17b75e4499 100644 --- a/api-tests/relationships/nested-mutations/disconnect-many.test.js +++ b/api-tests/relationships/nested-mutations/disconnect-many.test.js @@ -1,12 +1,12 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/nested-mutations/disconnect-singular.test.js b/api-tests/relationships/nested-mutations/disconnect-singular.test.js index c585b60d325..6d599fa8bc9 100644 --- a/api-tests/relationships/nested-mutations/disconnect-singular.test.js +++ b/api-tests/relationships/nested-mutations/disconnect-singular.test.js @@ -1,12 +1,12 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); const { multiAdapterRunners, setupServer, graphqlRequest, networkedGraphqlRequest, -} = require('@keystone/test-utils'); +} = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.js b/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.js index 05a31bda9d1..46e23156e1e 100644 --- a/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.js +++ b/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.js @@ -1,7 +1,7 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/nested-mutations/two-way-backreference/to-one-required.test.js b/api-tests/relationships/nested-mutations/two-way-backreference/to-one-required.test.js index a6a57ad0267..e6b0fcb6905 100644 --- a/api-tests/relationships/nested-mutations/two-way-backreference/to-one-required.test.js +++ b/api-tests/relationships/nested-mutations/two-way-backreference/to-one-required.test.js @@ -1,7 +1,7 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/relationships/nested-mutations/two-way-backreference/to-one.test.js b/api-tests/relationships/nested-mutations/two-way-backreference/to-one.test.js index 2be657cf2c5..540659f2888 100644 --- a/api-tests/relationships/nested-mutations/two-way-backreference/to-one.test.js +++ b/api-tests/relationships/nested-mutations/two-way-backreference/to-one.test.js @@ -1,7 +1,7 @@ const { gen, sampleOne } = require('testcheck'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); const cuid = require('cuid'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const alphanumGenerator = gen.alphaNumString.notEmpty(); diff --git a/api-tests/required.test.js b/api-tests/required.test.js index 73ed23da7f9..61f5fdaadf8 100644 --- a/api-tests/required.test.js +++ b/api-tests/required.test.js @@ -1,8 +1,8 @@ const fs = require('fs'); const path = require('path'); const cuid = require('cuid'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); -const { Text } = require('@keystone/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); +const { Text } = require('@keystonejs/fields'); describe('Test isRequired flag for all field types', () => { const typesLoc = path.resolve('packages/fields/src/types'); diff --git a/api-tests/uniqueness/unique.test.js b/api-tests/uniqueness/unique.test.js index 381889c270f..ce70dd9b20e 100644 --- a/api-tests/uniqueness/unique.test.js +++ b/api-tests/uniqueness/unique.test.js @@ -1,5 +1,5 @@ -const { Text } = require('@keystone/fields'); -const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { Text } = require('@keystonejs/fields'); +const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const cuid = require('cuid'); function setupKeystone(adapterName) { diff --git a/benchmarks/CHANGELOG.md b/benchmarks/CHANGELOG.md index f8619fb250a..bcaa38274cf 100644 --- a/benchmarks/CHANGELOG.md +++ b/benchmarks/CHANGELOG.md @@ -1,23 +1,4 @@ -# @keystone/benchmarks - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-knex@5.0.0 - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/keystone@5.0.0 - - @keystone/session@5.0.0 - - @keystone/test-utils@5.0.0 +# @keystonejs/benchmarks # @keystone-alpha/benchmarks diff --git a/benchmarks/fixtures/create-related.js b/benchmarks/fixtures/create-related.js index de99a5e7eb8..f2c1800a06c 100644 --- a/benchmarks/fixtures/create-related.js +++ b/benchmarks/fixtures/create-related.js @@ -1,6 +1,6 @@ const cuid = require('cuid'); -const { Text, Relationship } = require('@keystone/fields'); -const { setupServer } = require('@keystone/test-utils'); +const { Text, Relationship } = require('@keystonejs/fields'); +const { setupServer } = require('@keystonejs/test-utils'); const { FixtureGroup, timeQuery, populate, range } = require('../lib/utils'); function setupKeystone(adapterName) { diff --git a/benchmarks/fixtures/create.js b/benchmarks/fixtures/create.js index 74c20400b72..1207fb6fac7 100644 --- a/benchmarks/fixtures/create.js +++ b/benchmarks/fixtures/create.js @@ -1,6 +1,6 @@ const cuid = require('cuid'); -const { Text } = require('@keystone/fields'); -const { setupServer } = require('@keystone/test-utils'); +const { Text } = require('@keystonejs/fields'); +const { setupServer } = require('@keystonejs/test-utils'); const { FixtureGroup, timeQuery, populate, range } = require('../lib/utils'); function setupKeystone(adapterName) { diff --git a/benchmarks/fixtures/query.js b/benchmarks/fixtures/query.js index daa58830488..9f5c7a022d6 100644 --- a/benchmarks/fixtures/query.js +++ b/benchmarks/fixtures/query.js @@ -1,6 +1,6 @@ const cuid = require('cuid'); -const { Text, Relationship } = require('@keystone/fields'); -const { setupServer, graphqlRequest } = require('@keystone/test-utils'); +const { Text, Relationship } = require('@keystonejs/fields'); +const { setupServer, graphqlRequest } = require('@keystonejs/test-utils'); const { FixtureGroup, timeQuery, populate, range } = require('../lib/utils'); function setupKeystone(adapterName) { diff --git a/benchmarks/lib/utils.js b/benchmarks/lib/utils.js index 725d5ffaaf9..b12330c3ef8 100644 --- a/benchmarks/lib/utils.js +++ b/benchmarks/lib/utils.js @@ -1,4 +1,4 @@ -const { multiAdapterRunners, graphqlRequest } = require('@keystone/test-utils'); +const { multiAdapterRunners, graphqlRequest } = require('@keystonejs/test-utils'); const timeQuery = async ({ keystone, query, variables, repeat = 1 }) => { const t0_us = process.hrtime.bigint(); diff --git a/benchmarks/package.json b/benchmarks/package.json index bd4e5943315..3282730667b 100644 --- a/benchmarks/package.json +++ b/benchmarks/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/benchmarks", + "name": "@keystonejs/benchmarks", "description": "A set of benchmarks for running against the KeystoneJS API.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -12,13 +12,13 @@ "go": "node fixtures/index.js" }, "dependencies": { - "@keystone/adapter-knex": "^5.0.0", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/keystone": "^5.0.0", - "@keystone/session": "^5.0.0", - "@keystone/test-utils": "^5.0.0", + "@keystonejs/adapter-knex": "^4.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", + "@keystonejs/session": "^4.0.0", + "@keystonejs/test-utils": "^4.0.0", "body-parser": "^1.18.2", "cookie-signature": "^1.1.0", "cuid": "^2.1.6", diff --git a/demo-projects/blog/CHANGELOG.md b/demo-projects/blog/CHANGELOG.md index 0815ef00c6c..265fcec68a7 100644 --- a/demo-projects/blog/CHANGELOG.md +++ b/demo-projects/blog/CHANGELOG.md @@ -1,29 +1,5 @@ # keystone_demo_blog -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/app-next@5.0.0 - - @keystone/app-static@5.0.0 - - @keystone/auth-password@5.0.0 - - @keystone/fields-markdown@5.0.0 - - @keystone/fields-wysiwyg-tinymce@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/file-adapters@5.0.0 - - @keystone/keystone@5.0.0 - - @keystone/oembed-adapters@5.0.0 - ## 2.3.8 ### Patch Changes diff --git a/demo-projects/blog/index.js b/demo-projects/blog/index.js index d15bc4ca8dd..9b9619268a6 100644 --- a/demo-projects/blog/index.js +++ b/demo-projects/blog/index.js @@ -1,11 +1,11 @@ //imports for Keystone app core -const { Keystone } = require('@keystone/keystone'); -const { PasswordAuthStrategy } = require('@keystone/auth-password'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { NextApp } = require('@keystone/app-next'); -const { StaticApp } = require('@keystone/app-static'); +const { Keystone } = require('@keystonejs/keystone'); +const { PasswordAuthStrategy } = require('@keystonejs/auth-password'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { NextApp } = require('@keystonejs/app-next'); +const { StaticApp } = require('@keystonejs/app-static'); const { staticRoute, staticPath, distDir } = require('./config'); const { User, Post, PostCategory, Comment } = require('./schema'); diff --git a/demo-projects/blog/package.json b/demo-projects/blog/package.json index 2ed863c9562..37acc46bc8e 100644 --- a/demo-projects/blog/package.json +++ b/demo-projects/blog/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/demo-project-blog", + "name": "@keystonejs/demo-project-blog", "description": "An example KeystoneJS project showcasing a Blogging Site.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -18,18 +18,18 @@ "@arch-ui/typography": "^0.0.8", "@emotion/core": "^10.0.14", "@emotion/styled": "^10.0.14", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/app-next": "^5.0.0", - "@keystone/app-static": "^5.0.0", - "@keystone/auth-password": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/fields-markdown": "^5.0.0", - "@keystone/fields-wysiwyg-tinymce": "^5.0.0", - "@keystone/file-adapters": "^5.0.0", - "@keystone/keystone": "^5.0.0", - "@keystone/oembed-adapters": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/app-next": "^4.0.0", + "@keystonejs/app-static": "^4.0.0", + "@keystonejs/auth-password": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/fields-markdown": "^4.0.0", + "@keystonejs/fields-wysiwyg-tinymce": "^4.0.0", + "@keystonejs/file-adapters": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", + "@keystonejs/oembed-adapters": "^4.0.0", "apollo-boost": "^0.3.1", "apollo-client": "^2.5.1", "apollo-upload-client": "^10.0.0", diff --git a/demo-projects/blog/schema.js b/demo-projects/blog/schema.js index 4c962fc8979..c0a9558bd68 100644 --- a/demo-projects/blog/schema.js +++ b/demo-projects/blog/schema.js @@ -9,9 +9,9 @@ const { CalendarDay, DateTime, OEmbed, -} = require('@keystone/fields'); -const { Wysiwyg } = require('@keystone/fields-wysiwyg-tinymce'); -const { LocalFileAdapter } = require('@keystone/file-adapters'); +} = require('@keystonejs/fields'); +const { Wysiwyg } = require('@keystonejs/fields-wysiwyg-tinymce'); +const { LocalFileAdapter } = require('@keystonejs/file-adapters'); const getYear = require('date-fns/get_year'); const { staticRoute, staticPath, distDir } = require('./config'); @@ -20,7 +20,7 @@ const dev = process.env.NODE_ENV !== 'production'; let iframelyAdapter; if (process.env.IFRAMELY_API_KEY) { - const { IframelyOEmbedAdapter } = require('@keystone/oembed-adapters'); + const { IframelyOEmbedAdapter } = require('@keystonejs/oembed-adapters'); iframelyAdapter = new IframelyOEmbedAdapter({ apiKey: process.env.IFRAMELY_API_KEY, }); diff --git a/demo-projects/meetup/CHANGELOG.md b/demo-projects/meetup/CHANGELOG.md index 990f4617f02..ff847f8474b 100644 --- a/demo-projects/meetup/CHANGELOG.md +++ b/demo-projects/meetup/CHANGELOG.md @@ -1,27 +1,4 @@ -# @keystone/demo-project-meetup - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/app-next@5.0.0 - - @keystone/auth-password@5.0.0 - - @keystone/email@5.0.0 - - @keystone/fields-wysiwyg-tinymce@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/file-adapters@5.0.0 - - @keystone/keystone@5.0.0 - - @keystone/session@5.0.0 +# @keystonejs/demo-project-meetup # @keystone-alpha/demo-project-meetup diff --git a/demo-projects/meetup/emails/index.js b/demo-projects/meetup/emails/index.js index 8ac81fa411e..40b0a073051 100644 --- a/demo-projects/meetup/emails/index.js +++ b/demo-projects/meetup/emails/index.js @@ -1,4 +1,4 @@ -const { emailSender } = require('@keystone/email'); +const { emailSender } = require('@keystonejs/email'); const jsxEmailSender = emailSender.jsx({ root: __dirname, diff --git a/demo-projects/meetup/index.js b/demo-projects/meetup/index.js index 63aea94c772..b0453f07def 100644 --- a/demo-projects/meetup/index.js +++ b/demo-projects/meetup/index.js @@ -1,11 +1,11 @@ require('dotenv').config(); -const { Keystone } = require('@keystone/keystone'); -const { PasswordAuthStrategy } = require('@keystone/auth-password'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { NextApp } = require('@keystone/app-next'); +const { Keystone } = require('@keystonejs/keystone'); +const { PasswordAuthStrategy } = require('@keystonejs/auth-password'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { NextApp } = require('@keystonejs/app-next'); const { Event, Talk, User, Rsvp, Organiser, Sponsor, ForgottenPasswordToken } = require('./schema'); diff --git a/demo-projects/meetup/package.json b/demo-projects/meetup/package.json index f5cdd1d9bbe..02f816cae67 100644 --- a/demo-projects/meetup/package.json +++ b/demo-projects/meetup/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/demo-project-meetup", + "name": "@keystonejs/demo-project-meetup", "description": "An example KeystoneJS project showcasing a Meetup Site.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -15,17 +15,17 @@ }, "dependencies": { "@emotion/core": "^10.0.14", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/app-next": "^5.0.0", - "@keystone/auth-password": "^5.0.0", - "@keystone/email": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/fields-wysiwyg-tinymce": "^5.0.0", - "@keystone/file-adapters": "^5.0.0", - "@keystone/keystone": "^5.0.0", - "@keystone/session": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/app-next": "^4.0.0", + "@keystonejs/auth-password": "^4.0.0", + "@keystonejs/email": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/fields-wysiwyg-tinymce": "^4.0.0", + "@keystonejs/file-adapters": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", + "@keystonejs/session": "^4.0.0", "apollo-boost": "^0.3.1", "apollo-client": "^2.5.1", "body-parser": "^1.18.2", diff --git a/demo-projects/meetup/schema.js b/demo-projects/meetup/schema.js index 7f40d85e3d2..04e420806df 100644 --- a/demo-projects/meetup/schema.js +++ b/demo-projects/meetup/schema.js @@ -11,9 +11,9 @@ const { Relationship, Select, Text, -} = require('@keystone/fields'); -const { CloudinaryAdapter } = require('@keystone/file-adapters'); -const { Wysiwyg } = require('@keystone/fields-wysiwyg-tinymce'); +} = require('@keystonejs/fields'); +const { CloudinaryAdapter } = require('@keystonejs/file-adapters'); +const { Wysiwyg } = require('@keystonejs/fields-wysiwyg-tinymce'); const cloudinaryAdapter = new CloudinaryAdapter({ cloudName: process.env.CLOUDINARY_CLOUD_NAME, diff --git a/demo-projects/todo/CHANGELOG.md b/demo-projects/todo/CHANGELOG.md index 0c5c4216a41..4c55e8fbd0d 100644 --- a/demo-projects/todo/CHANGELOG.md +++ b/demo-projects/todo/CHANGELOG.md @@ -1,22 +1,4 @@ -# @keystone/demo-project-todo - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/app-static@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/keystone@5.0.0 +# @keystonejs/demo-project-todo # @keystone-alpha/demo-project-todo diff --git a/demo-projects/todo/index.js b/demo-projects/todo/index.js index 0fcbfdc293b..29d0d489f6f 100644 --- a/demo-projects/todo/index.js +++ b/demo-projects/todo/index.js @@ -1,9 +1,9 @@ -const { Keystone } = require('@keystone/keystone'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); -const { Text } = require('@keystone/fields'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { StaticApp } = require('@keystone/app-static'); +const { Keystone } = require('@keystonejs/keystone'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); +const { Text } = require('@keystonejs/fields'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { StaticApp } = require('@keystonejs/app-static'); const keystone = new Keystone({ name: 'Keystone To-Do List', diff --git a/demo-projects/todo/package.json b/demo-projects/todo/package.json index db60f59b70d..e0c2d05a63b 100644 --- a/demo-projects/todo/package.json +++ b/demo-projects/todo/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/demo-project-todo", + "name": "@keystonejs/demo-project-todo", "description": "An example KeystoneJS project showcasing a simple Todo List.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -14,12 +14,12 @@ "start": "cross-env NODE_ENV=production keystone start" }, "dependencies": { - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/app-static": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/keystone": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/app-static": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", "cross-env": "^5.2.0" } } diff --git a/docs/api/authentication.md b/docs/api/authentication.md index 8894eddae76..d55409c51a9 100644 --- a/docs/api/authentication.md +++ b/docs/api/authentication.md @@ -14,7 +14,7 @@ Authentication strategies allow users to identify themselves to KeystoneJS. This ## Usage ```javascript -const { PasswordAuthStrategy } = require('@keystone/auth-password'); +const { PasswordAuthStrategy } = require('@keystonejs/auth-password'); const authStrategy = keystone.createAuthStrategy({ type: PasswordAuthStrategy, diff --git a/docs/api/validation.md b/docs/api/validation.md index 4ca5a8e4594..692e4b9db32 100644 --- a/docs/api/validation.md +++ b/docs/api/validation.md @@ -9,7 +9,7 @@ order: 6 Stop maliciously complex or invalid queries against your `Keystone` instance. ```javascript -const { validation } = require('@keystone/app-graphql'); +const { validation } = require('@keystonejs/app-graphql'); // ... diff --git a/docs/guides/access-control.md b/docs/guides/access-control.md index 7ea4a802114..5891de55823 100644 --- a/docs/guides/access-control.md +++ b/docs/guides/access-control.md @@ -40,7 +40,7 @@ Here's how we would set that up: _NOTE: The code below depends on having a correct [authentication setup](/guides/authentication)._ ```javascript -const { Text, Select, Checkbox, Password } = require('@keystone/fields'); +const { Text, Select, Checkbox, Password } = require('@keystonejs/fields'); const keystone = // ... diff --git a/docs/guides/add-lists.md b/docs/guides/add-lists.md index 6bf5cbfa072..1740aa20650 100644 --- a/docs/guides/add-lists.md +++ b/docs/guides/add-lists.md @@ -16,7 +16,7 @@ To improve maintainability of your code it is convenient to split List schemas t named 'lists', with a file `Todos.js` inside of it and put the following code inside. ```javascript -const { Text, Checkbox } = require('@keystone/fields'); +const { Text, Checkbox } = require('@keystonejs/fields'); module.exports = { fields: { @@ -49,7 +49,7 @@ Tasks usually have a few more fields. Let's add an ability to set deadlines and ```javascript // import another field type - CalendarDay -const { Text, CalendarDay } = require('@keystone/fields'); +const { Text, CalendarDay } = require('@keystonejs/fields'); // define new field module.exports = { @@ -79,7 +79,7 @@ Take a look at the `assignee` field. Now we're just typing in a name. Why don't Create another file `Users.js` in the `lists` directory. It should look like this: ```javascript -const { Text, Password } = require('@keystone/fields'); +const { Text, Password } = require('@keystonejs/fields'); module.exports = { fields: { diff --git a/docs/guides/apps.md b/docs/guides/apps.md index b8f376923e2..5470bb6a988 100644 --- a/docs/guides/apps.md +++ b/docs/guides/apps.md @@ -25,8 +25,8 @@ API](../../keystone-alpha/app-graphql): `index.js` ```javascript -const { GraphQLApp } = require('@keystone/app-graphql'); -const { Keystone } = require('@keystone/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { Keystone } = require('@keystonejs/keystone'); const keystone = new Keystone(/* ... */); @@ -44,9 +44,9 @@ provides the functionality of the KeystoneJS Admin UI: `index.js` ```diff - const { GraphQLApp } = require('@keystone/app-graphql'); -+const { AdminUIApp } = require('@keystone/app-admin-ui'); - const { Keystone } = require('@keystone/keystone'); + const { GraphQLApp } = require('@keystonejs/app-graphql'); ++const { AdminUIApp } = require('@keystonejs/app-admin-ui'); + const { Keystone } = require('@keystonejs/keystone'); const keystone = new Keystone(/* ... */); diff --git a/docs/guides/authentication.md b/docs/guides/authentication.md index 41989cc5e65..fcb3414386e 100644 --- a/docs/guides/authentication.md +++ b/docs/guides/authentication.md @@ -30,9 +30,9 @@ list used for authentication in `index.js`: Here, we will setup a `PasswordAuthStrategy` instance: ```javascript -const { Text, Password } = require('@keystone/fields'); -const { PasswordAuthStrategy } = require('@keystone/auth-password'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Text, Password } = require('@keystonejs/fields'); +const { PasswordAuthStrategy } = require('@keystonejs/auth-password'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); const keystone = keystone.createList('User', { // ... diff --git a/docs/guides/custom-mutations.md b/docs/guides/custom-mutations.md index ee4cfc1ee5c..fa1801f732c 100644 --- a/docs/guides/custom-mutations.md +++ b/docs/guides/custom-mutations.md @@ -23,7 +23,7 @@ Like any problem there are multiple solutions. You can implement an incrementing First let's define a `Page` list. For the sake of simplicity, we'll give it only two fields: `title` and `views`. ```js -const { Text, Integer } = require('@keystone/fields'); +const { Text, Integer } = require('@keystonejs/fields'); const Page = { fields: { title: { type: Text }, diff --git a/docs/guides/custom-server.md b/docs/guides/custom-server.md index 2fcd8fcca94..8081058b3ed 100644 --- a/docs/guides/custom-server.md +++ b/docs/guides/custom-server.md @@ -69,8 +69,8 @@ module.exports = { `index.js` ```javascript -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); const keystone = new Keystone(/* ... */); module.exports = { keystone, @@ -112,8 +112,8 @@ In this example there is no `index.js` file, instead the `keystone` instance and ```javascript const express = require('express'); -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); const keystone = new Keystone(); keystone.createList(/* ... */); // ... @@ -147,9 +147,9 @@ function directly. ```javascript const express = require('express'); -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); const keystone = new Keystone(); keystone.createList(/* ... */); // ... @@ -184,8 +184,8 @@ KeystoneJS instance in AWS Lambda: ```javascript const express = require('express'); const serverless = require('serverless-http'); -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); const keystone = new Keystone(); keystone.createList(/* ... */); // ... diff --git a/docs/guides/initial-data.md b/docs/guides/initial-data.md index 851f7ffba0b..aaa56eb9261 100644 --- a/docs/guides/initial-data.md +++ b/docs/guides/initial-data.md @@ -12,11 +12,11 @@ This guide will show you how to create a User list and initialise it manually or First let's create a User list and add a `PasswordAuthStrategy`. Our `index.js` might look like this: ```javascript -const { Keystone, PasswordAuthStrategy } = require('@keystone/keystone'); -const { Text, Checkbox, Password } = require('@keystone/fields'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); +const { Keystone, PasswordAuthStrategy } = require('@keystonejs/keystone'); +const { Text, Checkbox, Password } = require('@keystonejs/fields'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); const keystone = new Keystone({ name: 'example-project', diff --git a/docs/guides/migrations.md b/docs/guides/migrations.md index 5326289930c..e5d09e370c8 100644 --- a/docs/guides/migrations.md +++ b/docs/guides/migrations.md @@ -60,7 +60,7 @@ Keystone cannot make this change for you because there could be existing data wi In development sometimes it can be helpful to drop the database everytime Keystone is restarted. To do this using the `KnexAdapter` you can pass the `dropDatabase` option to the adapter: ```js -const { KnexAdapter } = require('@keystone/adapter-knex'); +const { KnexAdapter } = require('@keystonejs/adapter-knex'); const adapter = new KnexAdapter({ dropDatabase: true }); ``` diff --git a/docs/guides/new-project.md b/docs/guides/new-project.md index ca46c7c5065..36888ffd823 100644 --- a/docs/guides/new-project.md +++ b/docs/guides/new-project.md @@ -20,12 +20,12 @@ yarn init ``` Let's start with minimal setup. We will need two packages here: -`@keystone/keystone` which is KeystoneJS' core and `@keystone/adapter-mongoose` which allows our app to connect to MongoDB. +`@keystonejs/keystone` which is KeystoneJS' core and `@keystonejs/adapter-mongoose` which allows our app to connect to MongoDB. Do ``` -yarn add @keystone/keystone @keystone/adapter-mongoose +yarn add @keystonejs/keystone @keystonejs/adapter-mongoose ``` ## First Steps @@ -34,8 +34,8 @@ After installation we can start coding. Main entry point of a KeystoneJS app is ```javascript // import necessary modules -const { Keystone } = require('@keystone/keystone'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); +const { Keystone } = require('@keystonejs/keystone'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); // create an instance of Keystone app const keystone = new Keystone({ @@ -67,13 +67,13 @@ Let's create some routes! For this we will enable a powerful KeystoneJS feature As in the previous step install necessary the package. ``` -yarn add @keystone/app-graphql +yarn add @keystonejs/app-graphql ``` Import it... ```javascript -const { GraphQLApp } = require('@keystone/app-graphql'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); ``` And add a new array export named `apps` with a new instance of `GraphQLApp`, like so. @@ -104,13 +104,13 @@ This code snippet creates a List named 'Todos'. The second argument is a config In our example, the `Todo` list has a single field called `name` of type `Text`. Note the type is *not* a string; it must be imported like so: ``` -yarn add @keystone/fields +yarn add @keystonejs/fields ``` and ```javascript -const { Text } = require('@keystone/fields'); +const { Text } = require('@keystonejs/fields'); ``` That's it! diff --git a/docs/guides/schema.md b/docs/guides/schema.md index ec78ca355d7..151a7bf438d 100644 --- a/docs/guides/schema.md +++ b/docs/guides/schema.md @@ -333,7 +333,7 @@ Relationships are defined using the `Relationship` field type, and require at least 2 configured lists (one will refer to the other). ```javascript -const { Relationship } = require('@keystone/fields'); +const { Relationship } = require('@keystonejs/fields'); keystone.createList('Todo', { fields: { diff --git a/package.json b/package.json index 62361b882e9..4244ed5914b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "@keystone/mono-repo", - "description": "KeystoneJS monorepo for all the @keystone / @arch-ui (and more) packages. Powered by Yarn.", + "name": "@keystonejs/mono-repo", + "description": "KeystoneJS monorepo for all the @keystonejs / @arch-ui (and more) packages. Powered by Yarn.", "private": true, "version": "4.0.0", "author": "The KeystoneJS Development Team", @@ -11,7 +11,7 @@ "website": "yarn --cwd ./website", "arch-docs": "yarn --cwd ./packages/arch/docs", "coverage": "cross-env DISABLE_LOGGING=true NODE_ENV=test jest --maxWorkers=1 --coverage", - "cypress:run": "status=0; yarn workspace @keystone/cypress-project-basic run cypress:run || status=$?; yarn workspace @keystone/cypress-project-login run cypress:run || status=$?; yarn workspace @keystone/cypress-project-twitter-login run cypress:run || status=$?; yarn workspace @keystone/cypress-project-access-control run cypress:run || status=$?; yarn workspace @keystone/cypress-project-client-validation run cypress:run || status=$?; exit $status", + "cypress:run": "status=0; yarn workspace @keystonejs/cypress-project-basic run cypress:run || status=$?; yarn workspace @keystonejs/cypress-project-login run cypress:run || status=$?; yarn workspace @keystonejs/cypress-project-twitter-login run cypress:run || status=$?; yarn workspace @keystonejs/cypress-project-access-control run cypress:run || status=$?; yarn workspace @keystonejs/cypress-project-client-validation run cypress:run || status=$?; exit $status", "format:file": "prettier --write", "format": "prettier --write \"**/*.js{,on}\" \"**/*.md\" && remark . --output", "fresh": "yarn clean && yarn", @@ -24,16 +24,16 @@ "test": "yarn lint && yarn test:unit && yarn cypress:run", "test:unit": "cross-env DISABLE_LOGGING=true NODE_ENV=test jest --maxWorkers=1", "test:unit:debug": "cross-env NODE_ENV=test node --inspect-brk `which jest` --runInBand", - "benchmark": "yarn workspace @keystone/benchmarks go", + "benchmark": "yarn workspace @keystonejs/benchmarks go", "changeset": "changeset", "publish-changed": "yarn build && changeset publish --public", "build:build-field-types": "rimraf packages/build-field-types/lib && babel packages/build-field-types/src --out-dir packages/build-field-types/dist --ignore '**/__tests__/**/*','**/__mocks__/**/*'", - "build": "preconstruct build && yarn workspace @keystone/build-field-types build && node ./packages/build-field-types/bin.js build", + "build": "preconstruct build && yarn workspace @keystonejs/build-field-types build && node ./packages/build-field-types/bin.js build", "prepare": "manypkg check && yarn build:build-field-types && preconstruct dev && node ./packages/build-field-types/bin.js dev && yarn run --silent contributing-guide", "contributing-guide": "is-ci && exit 0 || chalk -t \"{bold 📝 Contributing to KeystoneJS?}\" && link \"🔗 Read the full Contributing Guide\" \"https://github.com/keystonejs/keystone-5/blob/master/CONTRIBUTING.md\"", "contributors:add": "all-contributors add", "contributors:generate": "all-contributors generate", - "heroku-postbuild": "yarn build && yarn workspace @keystone/demo-project-blog build" + "heroku-postbuild": "yarn build && yarn workspace @keystonejs/demo-project-blog build" }, "dependencies": { "@babel/cli": "^7.6.2", diff --git a/packages/access-control/CHANGELOG.md b/packages/access-control/CHANGELOG.md index 7e0f6a2195d..76abc6879ec 100644 --- a/packages/access-control/CHANGELOG.md +++ b/packages/access-control/CHANGELOG.md @@ -1,17 +1,4 @@ -# @keystone/access-control - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/utils@5.0.0 +# @keystonejs/access-control # @keystone-alpha/access-control diff --git a/packages/access-control/lib/access-control.js b/packages/access-control/lib/access-control.js index 66ab622e66d..4bef90732a2 100644 --- a/packages/access-control/lib/access-control.js +++ b/packages/access-control/lib/access-control.js @@ -1,4 +1,4 @@ -const { getType, pick, defaultObj, intersection } = require('@keystone/utils'); +const { getType, pick, defaultObj, intersection } = require('@keystonejs/utils'); const validateGranularConfigTypes = (longHandAccess, validationError) => { const errors = Object.entries(longHandAccess) diff --git a/packages/access-control/package.json b/packages/access-control/package.json index eb786213f41..138e81b6a9c 100644 --- a/packages/access-control/package.json +++ b/packages/access-control/package.json @@ -1,13 +1,13 @@ { - "name": "@keystone/access-control", + "name": "@keystonejs/access-control", "description": "KeystoneJS Access Control parsing and validating utilities.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "dependencies": { - "@keystone/utils": "^5.0.0" + "@keystonejs/utils": "^4.0.0" } } diff --git a/packages/adapter-knex/CHANGELOG.md b/packages/adapter-knex/CHANGELOG.md index c606620dd89..bb42f022dfc 100644 --- a/packages/adapter-knex/CHANGELOG.md +++ b/packages/adapter-knex/CHANGELOG.md @@ -1,20 +1,4 @@ -# @keystone/adapter-knex - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/fields-auto-increment@5.0.0 - - @keystone/keystone@5.0.0 - - @keystone/logger@5.0.0 - - @keystone/utils@5.0.0 +# @keystonejs/adapter-knex # @keystone-alpha/adapter-knex diff --git a/packages/adapter-knex/README.md b/packages/adapter-knex/README.md index e2767dc5b29..369d6d5bb89 100644 --- a/packages/adapter-knex/README.md +++ b/packages/adapter-knex/README.md @@ -12,7 +12,7 @@ At present, the only fully tested backend is `Postgres`, however Knex gives the ## Usage ```javascript -const { KnexAdapter } = require('@keystone/adapter-knex'); +const { KnexAdapter } = require('@keystonejs/adapter-knex'); const keystone = new Keystone({ name: 'My Awesome Project', diff --git a/packages/adapter-knex/lib/adapter-knex.js b/packages/adapter-knex/lib/adapter-knex.js index 593bd00aa08..ada7ed8ee3a 100644 --- a/packages/adapter-knex/lib/adapter-knex.js +++ b/packages/adapter-knex/lib/adapter-knex.js @@ -1,7 +1,7 @@ const knex = require('knex'); const pSettle = require('p-settle'); -const { BaseKeystoneAdapter, BaseListAdapter, BaseFieldAdapter } = require('@keystone/keystone'); -const logger = require('@keystone/logger').logger('knex'); +const { BaseKeystoneAdapter, BaseListAdapter, BaseFieldAdapter } = require('@keystonejs/keystone'); +const logger = require('@keystonejs/logger').logger('knex'); const { escapeRegExp, @@ -10,7 +10,7 @@ const { arrayToObject, resolveAllKeys, identity, -} = require('@keystone/utils'); +} = require('@keystonejs/utils'); const slugify = require('@sindresorhus/slugify'); class KnexAdapter extends BaseKeystoneAdapter { @@ -124,7 +124,7 @@ class KnexAdapter extends BaseKeystoneAdapter { getDefaultPrimaryKeyConfig() { // Required here due to circular refs - const { AutoIncrement } = require('@keystone/fields-auto-increment'); + const { AutoIncrement } = require('@keystonejs/fields-auto-increment'); return AutoIncrement.primaryKeyDefaults[this.name].getConfig(this.client); } } diff --git a/packages/adapter-knex/package.json b/packages/adapter-knex/package.json index 1cfce878cbe..eb59097abd7 100644 --- a/packages/adapter-knex/package.json +++ b/packages/adapter-knex/package.json @@ -1,17 +1,17 @@ { - "name": "@keystone/adapter-knex", + "name": "@keystonejs/adapter-knex", "description": "KeystoneJS Knex Database Adapter", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "dependencies": { - "@keystone/fields-auto-increment": "^5.0.0", - "@keystone/keystone": "^5.0.0", - "@keystone/logger": "^5.0.0", - "@keystone/utils": "^5.0.0", + "@keystonejs/fields-auto-increment": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", + "@keystonejs/logger": "^4.0.0", + "@keystonejs/utils": "^4.0.0", "@sindresorhus/slugify": "^0.6.0", "knex": "^0.19.5", "p-settle": "^3.1.0", diff --git a/packages/adapter-mongoose/CHANGELOG.md b/packages/adapter-mongoose/CHANGELOG.md index ac9a804a2e1..2ff2d1f0c4b 100644 --- a/packages/adapter-mongoose/CHANGELOG.md +++ b/packages/adapter-mongoose/CHANGELOG.md @@ -1,21 +1,4 @@ -# @keystone/adapter-mongoose - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/fields-mongoid@5.0.0 - - @keystone/keystone@5.0.0 - - @keystone/logger@5.0.0 - - @keystone/mongo-join-builder@5.0.0 - - @keystone/utils@5.0.0 +# @keystonejs/adapter-mongoose # @keystone-alpha/adapter-mongoose diff --git a/packages/adapter-mongoose/README.md b/packages/adapter-mongoose/README.md index ed1a2dafcd8..03ec492e3f6 100644 --- a/packages/adapter-mongoose/README.md +++ b/packages/adapter-mongoose/README.md @@ -9,7 +9,7 @@ title: Mongoose Adapter ## Usage ```javascript -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); const keystone = new Keystone({ name: 'My Awesome Project', diff --git a/packages/adapter-mongoose/lib/adapter-mongoose.js b/packages/adapter-mongoose/lib/adapter-mongoose.js index d371936c468..7fef0e7c56d 100644 --- a/packages/adapter-mongoose/lib/adapter-mongoose.js +++ b/packages/adapter-mongoose/lib/adapter-mongoose.js @@ -8,11 +8,11 @@ const { mapKeyNames, identity, mergeWhereClause, -} = require('@keystone/utils'); +} = require('@keystonejs/utils'); -const { BaseKeystoneAdapter, BaseListAdapter, BaseFieldAdapter } = require('@keystone/keystone'); -const { queryParser, pipelineBuilder, mutationBuilder } = require('@keystone/mongo-join-builder'); -const logger = require('@keystone/logger').logger('mongoose'); +const { BaseKeystoneAdapter, BaseListAdapter, BaseFieldAdapter } = require('@keystonejs/keystone'); +const { queryParser, pipelineBuilder, mutationBuilder } = require('@keystonejs/mongo-join-builder'); +const logger = require('@keystonejs/logger').logger('mongoose'); const slugify = require('@sindresorhus/slugify'); @@ -73,7 +73,7 @@ class MongooseAdapter extends BaseKeystoneAdapter { getDefaultPrimaryKeyConfig() { // Required here due to circular refs - const { MongoId } = require('@keystone/fields-mongoid'); + const { MongoId } = require('@keystonejs/fields-mongoid'); return MongoId.primaryKeyDefaults[this.name].getConfig(); } } diff --git a/packages/adapter-mongoose/package.json b/packages/adapter-mongoose/package.json index dd0376e954b..ccb656d7b7e 100644 --- a/packages/adapter-mongoose/package.json +++ b/packages/adapter-mongoose/package.json @@ -1,18 +1,18 @@ { - "name": "@keystone/adapter-mongoose", + "name": "@keystonejs/adapter-mongoose", "description": "KeystoneJS Mongoose Database adapter.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "dependencies": { - "@keystone/fields-mongoid": "^5.0.0", - "@keystone/keystone": "^5.0.0", - "@keystone/logger": "^5.0.0", - "@keystone/mongo-join-builder": "^5.0.0", - "@keystone/utils": "^5.0.0", + "@keystonejs/fields-mongoid": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", + "@keystonejs/logger": "^4.0.0", + "@keystonejs/mongo-join-builder": "^4.0.0", + "@keystonejs/utils": "^4.0.0", "@sindresorhus/slugify": "^0.6.0", "lodash.omitby": "^4.6.0", "mongoose": "^5.6.5", diff --git a/packages/apollo-helpers/CHANGELOG.md b/packages/apollo-helpers/CHANGELOG.md index 310a2eaf18d..05c61d639a5 100644 --- a/packages/apollo-helpers/CHANGELOG.md +++ b/packages/apollo-helpers/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/apollo-helpers - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/apollo-helpers # @keystone-alpha/apollo-helpers diff --git a/packages/apollo-helpers/README.md b/packages/apollo-helpers/README.md index 0ee6fbd5812..95bfb056a9e 100644 --- a/packages/apollo-helpers/README.md +++ b/packages/apollo-helpers/README.md @@ -12,7 +12,7 @@ A set of functions and components to ease using ## Installation ```bash -yarn add @keystone/apollo-helpers +yarn add @keystonejs/apollo-helpers ``` ## Usage @@ -30,7 +30,7 @@ import { ApolloProvider } from 'react-apollo'; import { Query, KeystoneProvider, -} from '@keystone/apollo-helpers'; +} from '@keystonejs/apollo-helpers'; const client = new ApolloClient({ link: new HttpLink({ uri: /* ... */ }), @@ -70,7 +70,7 @@ import { KeystoneProvider, injectIsOptimisticFlag, flattenApollo, -} from '@keystone/apollo-helpers'; +} from '@keystonejs/apollo-helpers'; const cache = new InMemoryCache(); diff --git a/packages/apollo-helpers/package.json b/packages/apollo-helpers/package.json index b6354a33b5c..f44c1661006 100644 --- a/packages/apollo-helpers/package.json +++ b/packages/apollo-helpers/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/apollo-helpers", + "name": "@keystonejs/apollo-helpers", "description": "Utilities to make using react-apollo + KeystoneJS easier.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { diff --git a/packages/app-admin-ui/CHANGELOG.md b/packages/app-admin-ui/CHANGELOG.md index f50ca7e5fc4..892ff00c7b2 100644 --- a/packages/app-admin-ui/CHANGELOG.md +++ b/packages/app-admin-ui/CHANGELOG.md @@ -1,21 +1,4 @@ -# @keystone/app-admin-ui - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/build-field-types@5.0.0 - - @keystone/field-views-loader@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/session@5.0.0 - - @keystone/utils@5.0.0 +# @keystonejs/app-admin-ui # @keystone-alpha/app-admin-ui @@ -335,7 +318,7 @@ Fix Admin UI building on Windows -# @keystone/admin-ui +# @keystonejs/admin-ui # @keystone-alpha/admin-ui diff --git a/packages/app-admin-ui/README.md b/packages/app-admin-ui/README.md index 2fc16ed93ba..abbc7e34bda 100644 --- a/packages/app-admin-ui/README.md +++ b/packages/app-admin-ui/README.md @@ -11,9 +11,9 @@ A KeystoneJS App which provides an Admin UI for content management. ## Usage ```js -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); const authStrategy = keystone.createAuthStrategy({ ... }); diff --git a/packages/app-admin-ui/client/FIELD_TYPES b/packages/app-admin-ui/client/FIELD_TYPES index 7e50426f389..25a20f08199 100644 --- a/packages/app-admin-ui/client/FIELD_TYPES +++ b/packages/app-admin-ui/client/FIELD_TYPES @@ -1,3 +1,3 @@ /** -* This file is purely a stub to allow us to activate the @keystone/field-views-loader +* This file is purely a stub to allow us to activate the @keystonejs/field-views-loader */ diff --git a/packages/app-admin-ui/client/classes/List.js b/packages/app-admin-ui/client/classes/List.js index 46079bd6ad0..deb96e23b17 100644 --- a/packages/app-admin-ui/client/classes/List.js +++ b/packages/app-admin-ui/client/classes/List.js @@ -1,6 +1,6 @@ import gql from 'graphql-tag'; -import { arrayToObject, mapKeys, omit } from '@keystone/utils'; +import { arrayToObject, mapKeys, omit } from '@keystonejs/utils'; export const gqlCountQueries = lists => gql`{ ${lists.map(list => list.countQuery()).join('\n')} diff --git a/packages/app-admin-ui/client/components/CreateItemModal.js b/packages/app-admin-ui/client/components/CreateItemModal.js index dce1c0d7ca7..607b23904e9 100644 --- a/packages/app-admin-ui/client/components/CreateItemModal.js +++ b/packages/app-admin-ui/client/components/CreateItemModal.js @@ -6,7 +6,7 @@ import { useToasts } from 'react-toast-notifications'; import { Button, LoadingButton } from '@arch-ui/button'; import Drawer from '@arch-ui/drawer'; -import { arrayToObject, captureSuspensePromises, countArrays } from '@keystone/utils'; +import { arrayToObject, captureSuspensePromises, countArrays } from '@keystonejs/utils'; import { gridSize } from '@arch-ui/theme'; import { AutocompleteCaptor } from '@arch-ui/input'; diff --git a/packages/app-admin-ui/client/components/ListTable.js b/packages/app-admin-ui/client/components/ListTable.js index 0b4d822f871..21eaf4905e3 100644 --- a/packages/app-admin-ui/client/components/ListTable.js +++ b/packages/app-admin-ui/client/components/ListTable.js @@ -4,7 +4,7 @@ import React, { Component, Suspense, Fragment } from 'react'; import styled from '@emotion/styled'; import { Link } from 'react-router-dom'; -import { captureSuspensePromises, noop } from '@keystone/utils'; +import { captureSuspensePromises, noop } from '@keystonejs/utils'; import { DiffIcon, KebabHorizontalIcon, LinkIcon, ShieldIcon, TrashcanIcon } from '@arch-ui/icons'; import { colors, gridSize } from '@arch-ui/theme'; import { alpha } from '@arch-ui/color-utils'; diff --git a/packages/app-admin-ui/client/components/UpdateManyItemsModal.js b/packages/app-admin-ui/client/components/UpdateManyItemsModal.js index 04bfb0b9a1e..eb40ed346df 100644 --- a/packages/app-admin-ui/client/components/UpdateManyItemsModal.js +++ b/packages/app-admin-ui/client/components/UpdateManyItemsModal.js @@ -6,7 +6,7 @@ import { Button, LoadingButton } from '@arch-ui/button'; import Drawer from '@arch-ui/drawer'; import { FieldContainer, FieldLabel, FieldInput } from '@arch-ui/fields'; import Select from '@arch-ui/select'; -import { omit, arrayToObject, countArrays } from '@keystone/utils'; +import { omit, arrayToObject, countArrays } from '@keystonejs/utils'; import { LoadingIndicator } from '@arch-ui/loading'; import { validateFields } from '../util'; diff --git a/packages/app-admin-ui/client/pages/Item/index.js b/packages/app-admin-ui/client/pages/Item/index.js index 2a4cc67954d..43569d742d5 100644 --- a/packages/app-admin-ui/client/pages/Item/index.js +++ b/packages/app-admin-ui/client/pages/Item/index.js @@ -18,7 +18,7 @@ import { omitBy, captureSuspensePromises, countArrays, -} from '@keystone/utils'; +} from '@keystonejs/utils'; import CreateItemModal from '../../components/CreateItemModal'; import DeleteItemModal from '../../components/DeleteItemModal'; diff --git a/packages/app-admin-ui/client/pages/List/FieldSelect.js b/packages/app-admin-ui/client/pages/List/FieldSelect.js index 5e9ad9cf48a..33d1e0d8e34 100644 --- a/packages/app-admin-ui/client/pages/List/FieldSelect.js +++ b/packages/app-admin-ui/client/pages/List/FieldSelect.js @@ -3,7 +3,7 @@ import { Component } from 'react'; import { jsx } from '@emotion/core'; import { Options } from '@arch-ui/options'; -import { arrayToObject } from '@keystone/utils'; +import { arrayToObject } from '@keystonejs/utils'; function isOptionSelected(opt, selected) { return Boolean(selected.filter(x => x.path === opt.path).length); diff --git a/packages/app-admin-ui/client/pages/List/url-state.js b/packages/app-admin-ui/client/pages/List/url-state.js index 3b3a10cc8da..cce4b8c348c 100644 --- a/packages/app-admin-ui/client/pages/List/url-state.js +++ b/packages/app-admin-ui/client/pages/List/url-state.js @@ -5,7 +5,7 @@ import * as React from 'react'; import List from '../../classes/List'; // $FlowFixMe flow doesn't recognise the `*/Controller` entry point -import type { FieldControllerType } from '@keystone/fields/Controller'; +import type { FieldControllerType } from '@keystonejs/fields/Controller'; import { pseudoLabelField } from './FieldSelect'; import type { AdminMeta } from '../../providers/AdminMeta'; diff --git a/packages/app-admin-ui/package.json b/packages/app-admin-ui/package.json index b02f6cc172a..93d0005ed8a 100644 --- a/packages/app-admin-ui/package.json +++ b/packages/app-admin-ui/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/app-admin-ui", + "name": "@keystonejs/app-admin-ui", "description": "KeystoneJS Admin UI App.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -38,11 +38,11 @@ "@babel/core": "^7.6.2", "@emotion/core": "^10.0.14", "@emotion/styled": "^10.0.14", - "@keystone/build-field-types": "^5.0.0", - "@keystone/field-views-loader": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/session": "^5.0.0", - "@keystone/utils": "^5.0.0", + "@keystonejs/build-field-types": "^4.0.0", + "@keystonejs/field-views-loader": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/session": "^4.0.0", + "@keystonejs/utils": "^4.0.0", "apollo-cache-inmemory": "^1.5.1", "apollo-client": "^2.5.1", "apollo-link": "^1.2.9", diff --git a/packages/app-admin-ui/server/getWebpackConfig.js b/packages/app-admin-ui/server/getWebpackConfig.js index fe3ee2768ad..a3a910f3d06 100644 --- a/packages/app-admin-ui/server/getWebpackConfig.js +++ b/packages/app-admin-ui/server/getWebpackConfig.js @@ -18,7 +18,7 @@ module.exports = function({ adminMeta, entry, outputPath }) { const rules = [ { test: /\.js$/, - exclude: [/node_modules(?!(?:\/|\\)@keystone(?:\/|\\)app-admin-ui)/], + exclude: [/node_modules(?!(?:\/|\\)@keystonejs(?:\/|\\)app-admin-ui)/], use: [ { loader: 'babel-loader', @@ -53,7 +53,7 @@ module.exports = function({ adminMeta, entry, outputPath }) { test: /FIELD_TYPES/, use: [ { - loader: '@keystone/field-views-loader', + loader: '@keystonejs/field-views-loader', options: { adminMeta, }, diff --git a/packages/app-graphql-playground/CHANGELOG.md b/packages/app-graphql-playground/CHANGELOG.md index a2f48310623..97738ac179c 100644 --- a/packages/app-graphql-playground/CHANGELOG.md +++ b/packages/app-graphql-playground/CHANGELOG.md @@ -1,19 +1,4 @@ -# @keystone/app-graphql-playground - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/logger@5.0.0 - - @keystone/session@5.0.0 - - @keystone/utils@5.0.0 +# @keystonejs/app-graphql-playground # @keystone-alpha/app-graphql-playground diff --git a/packages/app-graphql-playground/README.md b/packages/app-graphql-playground/README.md index 58126edf887..057c9bd996e 100644 --- a/packages/app-graphql-playground/README.md +++ b/packages/app-graphql-playground/README.md @@ -12,10 +12,10 @@ A KeystoneJS App that creates an Apollo GraphQL playground. ## Usage ```javascript -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { GraphQLAppPlayground } = require('@keystone/app-graphql-playground'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { GraphQLAppPlayground } = require('@keystonejs/app-graphql-playground'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); // Ensure that the GraphQLApp and GraphQLAppPlayground are referring to the same endpoint const apiPath = '/admin/api'; diff --git a/packages/app-graphql-playground/package.json b/packages/app-graphql-playground/package.json index 1778b070986..7ed118324c3 100644 --- a/packages/app-graphql-playground/package.json +++ b/packages/app-graphql-playground/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/app-graphql-playground", + "name": "@keystonejs/app-graphql-playground", "description": "KeystoneJS GraphQL Playground App.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -10,9 +10,9 @@ "dependencies": { "@apollographql/graphql-playground-html": "^1.6.24", "@apollographql/graphql-playground-react": "^1.7.31", - "@keystone/logger": "^5.0.0", - "@keystone/session": "^5.0.0", - "@keystone/utils": "^5.0.0", + "@keystonejs/logger": "^4.0.0", + "@keystonejs/session": "^4.0.0", + "@keystonejs/utils": "^4.0.0", "body-parser": "^1.18.2", "chalk": "^2.4.2", "falsey": "^1.0.0", diff --git a/packages/app-graphql/CHANGELOG.md b/packages/app-graphql/CHANGELOG.md index 3bdeaaab522..d49da3a7adb 100644 --- a/packages/app-graphql/CHANGELOG.md +++ b/packages/app-graphql/CHANGELOG.md @@ -1,20 +1,4 @@ -# @keystone/app-graphql - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/app-graphql-playground@5.0.0 - - @keystone/logger@5.0.0 - - @keystone/session@5.0.0 - - @keystone/utils@5.0.0 +# @keystonejs/app-graphql # @keystone-alpha/app-graphql @@ -153,7 +137,7 @@ Remove usage of `port` arg from `prepareMiddleware()` and stop doing inline console.logs -# @keystone/server +# @keystonejs/server # @keystone-alpha/server diff --git a/packages/app-graphql/README.md b/packages/app-graphql/README.md index cbece6cfa58..f20f5de8e2a 100644 --- a/packages/app-graphql/README.md +++ b/packages/app-graphql/README.md @@ -14,9 +14,9 @@ For information about writing queries and mutations for KeystoneJS see the [Intr ## Usage ```javascript -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); module.exports = { new Keystone(), diff --git a/packages/app-graphql/index.js b/packages/app-graphql/index.js index 490e1167269..f71c42725f8 100644 --- a/packages/app-graphql/index.js +++ b/packages/app-graphql/index.js @@ -1,6 +1,6 @@ const express = require('express'); -const { restrictAudienceMiddleware } = require('@keystone/session'); -const { GraphQLPlaygroundApp } = require('@keystone/app-graphql-playground'); +const { restrictAudienceMiddleware } = require('@keystonejs/session'); +const { GraphQLPlaygroundApp } = require('@keystonejs/app-graphql-playground'); const { createApolloServer } = require('./lib/apolloServer'); const validation = require('./validation'); diff --git a/packages/app-graphql/lib/apolloServer.js b/packages/app-graphql/lib/apolloServer.js index bab51e3ecb4..a199a25af0a 100644 --- a/packages/app-graphql/lib/apolloServer.js +++ b/packages/app-graphql/lib/apolloServer.js @@ -4,8 +4,8 @@ const ensureError = require('ensure-error'); const serializeError = require('serialize-error'); const StackUtils = require('stack-utils'); const cuid = require('cuid'); -const { omit } = require('@keystone/utils'); -const { logger } = require('@keystone/logger'); +const { omit } = require('@keystonejs/utils'); +const { logger } = require('@keystonejs/logger'); const { NestedError } = require('./graphqlErrors'); diff --git a/packages/app-graphql/package.json b/packages/app-graphql/package.json index c0fb3466f80..5e446425eea 100644 --- a/packages/app-graphql/package.json +++ b/packages/app-graphql/package.json @@ -1,17 +1,17 @@ { - "name": "@keystone/app-graphql", + "name": "@keystonejs/app-graphql", "description": "KeystoneJS GraphQL App.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "dependencies": { - "@keystone/app-graphql-playground": "^5.0.0", - "@keystone/logger": "^5.0.0", - "@keystone/session": "^5.0.0", - "@keystone/utils": "^5.0.0", + "@keystonejs/app-graphql-playground": "^4.0.0", + "@keystonejs/logger": "^4.0.0", + "@keystonejs/session": "^4.0.0", + "@keystonejs/utils": "^4.0.0", "apollo-errors": "^1.9.0", "apollo-server-express": "^2.9.1", "cuid": "^2.1.6", diff --git a/packages/app-next/CHANGELOG.md b/packages/app-next/CHANGELOG.md index d8203b2300b..edf1f3a755f 100644 --- a/packages/app-next/CHANGELOG.md +++ b/packages/app-next/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/app-next - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/app-next # @keystone-alpha/app-next diff --git a/packages/app-next/README.md b/packages/app-next/README.md index a61c2c264e7..e1b4064d61c 100644 --- a/packages/app-next/README.md +++ b/packages/app-next/README.md @@ -11,7 +11,7 @@ A KeystoneJS App for serving a [Next.js](https://nextjs.org/) application. ## Usage ```javascript -const { NextApp } = require('@keystone/app-next'); +const { NextApp } = require('@keystonejs/app-next'); ... diff --git a/packages/app-next/package.json b/packages/app-next/package.json index 1e0d1b99563..c4fa3304b1c 100644 --- a/packages/app-next/package.json +++ b/packages/app-next/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/app-next", + "name": "@keystonejs/app-next", "description": "KeystoneJS Next.js App.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { diff --git a/packages/app-nuxt/CHANGELOG.md b/packages/app-nuxt/CHANGELOG.md index d098a7894eb..cb2452010d9 100644 --- a/packages/app-nuxt/CHANGELOG.md +++ b/packages/app-nuxt/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/app-nuxt - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/app-nuxt # @keystone-alpha/app-nuxt diff --git a/packages/app-nuxt/README.md b/packages/app-nuxt/README.md index e59a0945fd7..4a0a43dafb6 100644 --- a/packages/app-nuxt/README.md +++ b/packages/app-nuxt/README.md @@ -9,7 +9,7 @@ title: Nuxt.js App ## Usage ```javascript -const { NuxtApp } = require('@keystone/app-nuxt'); +const { NuxtApp } = require('@keystonejs/app-nuxt'); ... diff --git a/packages/app-nuxt/package.json b/packages/app-nuxt/package.json index 343a8851193..c6f37da7fbe 100644 --- a/packages/app-nuxt/package.json +++ b/packages/app-nuxt/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/app-nuxt", + "name": "@keystonejs/app-nuxt", "description": "KeystoneJS Nuxt.js App.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { diff --git a/packages/app-schema-router/CHANGELOG.md b/packages/app-schema-router/CHANGELOG.md index 8928dbd783a..c5c991a8b1b 100644 --- a/packages/app-schema-router/CHANGELOG.md +++ b/packages/app-schema-router/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/app-schema-router - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/app-schema-router # @keystone-alpha/app-schema-router diff --git a/packages/app-schema-router/README.md b/packages/app-schema-router/README.md index 54657d907fb..c0506df40ab 100644 --- a/packages/app-schema-router/README.md +++ b/packages/app-schema-router/README.md @@ -16,11 +16,11 @@ a `routerId`, which is used to pick between different GraphQL schemas which exis ## Usage ```javascript -const { Keystone } = require('@keystone/keystone'); -const { GraphQLAppPlayground } = require('@keystone/app-graphql-playground'); -const { SchemaRouterApp } = require('@keystone/app-schema-router'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLAppPlayground } = require('@keystonejs/app-graphql-playground'); +const { SchemaRouterApp } = require('@keystonejs/app-schema-router'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); module.exports = { new Keystone(), diff --git a/packages/app-schema-router/package.json b/packages/app-schema-router/package.json index 522124a7c7f..cdc3aea49c5 100644 --- a/packages/app-schema-router/package.json +++ b/packages/app-schema-router/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/app-schema-router", + "name": "@keystonejs/app-schema-router", "description": "KeystoneJS GraphQL App.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { diff --git a/packages/app-static/CHANGELOG.md b/packages/app-static/CHANGELOG.md index e91b43e2e2e..d683735fc86 100644 --- a/packages/app-static/CHANGELOG.md +++ b/packages/app-static/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/app-static - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/app-static # @keystone-alpha/app-static diff --git a/packages/app-static/README.md b/packages/app-static/README.md index c7356c11c56..de2af08dc46 100644 --- a/packages/app-static/README.md +++ b/packages/app-static/README.md @@ -13,10 +13,10 @@ A KeystoneJS App to serve static files such as images, CSS and JavaScript with s `index.js` ```js -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { StaticApp } = require('@keystone/app-static'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { StaticApp } = require('@keystonejs/app-static'); module.exports = { new Keystone(), diff --git a/packages/app-static/package.json b/packages/app-static/package.json index bb57f9ae7a8..9efbb985f05 100644 --- a/packages/app-static/package.json +++ b/packages/app-static/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/app-static", + "name": "@keystonejs/app-static", "description": "KeystoneJS Static File App.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { diff --git a/packages/arch/packages/alert/package.json b/packages/arch/packages/alert/package.json index 8ae52093346..e1fa426120b 100644 --- a/packages/arch/packages/alert/package.json +++ b/packages/arch/packages/alert/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/alert", - "description": "Alert component as used in @keystone Admin UI.", + "description": "Alert component as used in @keystonejs Admin UI.", "version": "0.0.7", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/badge/package.json b/packages/arch/packages/badge/package.json index 7c0272313ee..50113eafdf6 100644 --- a/packages/arch/packages/badge/package.json +++ b/packages/arch/packages/badge/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/badge", - "description": "Badge Component used in @keystone Admin UI.", + "description": "Badge Component used in @keystonejs Admin UI.", "version": "0.0.7", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/button/package.json b/packages/arch/packages/button/package.json index 60a6b758ca6..db758ce2bf7 100644 --- a/packages/arch/packages/button/package.json +++ b/packages/arch/packages/button/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/button", - "description": "Button Components as used in @keystone Admin UI.", + "description": "Button Components as used in @keystonejs Admin UI.", "version": "0.0.9", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/card/package.json b/packages/arch/packages/card/package.json index 59ab7067d71..fb88d3e7bcd 100644 --- a/packages/arch/packages/card/package.json +++ b/packages/arch/packages/card/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/card", - "description": "Card Component used in @keystone Admin UI.", + "description": "Card Component used in @keystonejs Admin UI.", "version": "0.0.5", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/color-utils/package.json b/packages/arch/packages/color-utils/package.json index f703318206d..0ca4d68a791 100644 --- a/packages/arch/packages/color-utils/package.json +++ b/packages/arch/packages/color-utils/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/color-utils", - "description": "Color Utilities used throughout @arch-ui components & @keystone Admin UI.", + "description": "Color Utilities used throughout @arch-ui components & @keystonejs Admin UI.", "version": "0.0.1", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/common/package.json b/packages/arch/packages/common/package.json index d5e87626421..9ab9754a79f 100644 --- a/packages/arch/packages/common/package.json +++ b/packages/arch/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/common", - "description": "Common config used throughout @arch-ui Components and @keystone Admin UI.", + "description": "Common config used throughout @arch-ui Components and @keystonejs Admin UI.", "version": "0.0.6", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/confirm/package.json b/packages/arch/packages/confirm/package.json index fab1dac87ac..ce8d2b9bd50 100644 --- a/packages/arch/packages/confirm/package.json +++ b/packages/arch/packages/confirm/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/confirm", - "description": "Confirmation UI as used in @keystone Admin UI.", + "description": "Confirmation UI as used in @keystonejs Admin UI.", "version": "0.0.8", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/controls/package.json b/packages/arch/packages/controls/package.json index 11b4740ace6..2613df21c5e 100644 --- a/packages/arch/packages/controls/package.json +++ b/packages/arch/packages/controls/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/controls", - "description": "Form Controls as used in @keystone Admin UI.", + "description": "Form Controls as used in @keystonejs Admin UI.", "version": "0.0.10", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/day-picker/package.json b/packages/arch/packages/day-picker/package.json index 9154c806ccf..ec6636ab788 100644 --- a/packages/arch/packages/day-picker/package.json +++ b/packages/arch/packages/day-picker/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/day-picker", - "description": "Day Picker UI as used in @keystone Admin UI.", + "description": "Day Picker UI as used in @keystonejs Admin UI.", "version": "0.0.13", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/dialog/package.json b/packages/arch/packages/dialog/package.json index 4581a9c55c6..966ec5fc6ee 100644 --- a/packages/arch/packages/dialog/package.json +++ b/packages/arch/packages/dialog/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/dialog", - "description": "Dialog Component as used in @keystone Admin UI.", + "description": "Dialog Component as used in @keystonejs Admin UI.", "version": "0.0.9", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/drawer/package.json b/packages/arch/packages/drawer/package.json index 595dbcdf051..a2a07127ac6 100644 --- a/packages/arch/packages/drawer/package.json +++ b/packages/arch/packages/drawer/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/drawer", - "description": "Drawer Portal UI as used in @keystone Admin UI.", + "description": "Drawer Portal UI as used in @keystonejs Admin UI.", "version": "0.0.10", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/dropdown/package.json b/packages/arch/packages/dropdown/package.json index 0f9a8382dbc..ad75c2e94e9 100644 --- a/packages/arch/packages/dropdown/package.json +++ b/packages/arch/packages/dropdown/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/dropdown", - "description": "Dropdown UI as used in @keystone Admin UI.", + "description": "Dropdown UI as used in @keystonejs Admin UI.", "version": "0.0.8", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/fields/package.json b/packages/arch/packages/fields/package.json index 45c954a03b5..c3d271a8bdc 100644 --- a/packages/arch/packages/fields/package.json +++ b/packages/arch/packages/fields/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/fields", - "description": "Form Field Components used in @keystone Admin UI.", + "description": "Form Field Components used in @keystonejs Admin UI.", "version": "2.0.1", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/filters/package.json b/packages/arch/packages/filters/package.json index c237d29c6e0..0ff79621059 100644 --- a/packages/arch/packages/filters/package.json +++ b/packages/arch/packages/filters/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/filters", - "description": "Filter UI as used in @keystone Admin UI.", + "description": "Filter UI as used in @keystonejs Admin UI.", "version": "0.0.11", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/icons/package.json b/packages/arch/packages/icons/package.json index 87e872303c1..1d1c48507ce 100644 --- a/packages/arch/packages/icons/package.json +++ b/packages/arch/packages/icons/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/icons", - "description": "Common Icons used in @arch-ui packages and @keystone Admin UI.", + "description": "Common Icons used in @arch-ui packages and @keystonejs Admin UI.", "version": "0.0.5", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/input/package.json b/packages/arch/packages/input/package.json index c595db00da1..11fe7a4b28a 100644 --- a/packages/arch/packages/input/package.json +++ b/packages/arch/packages/input/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/input", - "description": "Input component as used in @keystone Admin UI.", + "description": "Input component as used in @keystonejs Admin UI.", "version": "0.1.0", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/layout/package.json b/packages/arch/packages/layout/package.json index 0c5112c9499..1f2aadea71b 100644 --- a/packages/arch/packages/layout/package.json +++ b/packages/arch/packages/layout/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/layout", - "description": "Layout component as used in @keystone Admin UI.", + "description": "Layout component as used in @keystonejs Admin UI.", "version": "0.2.4", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/loading/package.json b/packages/arch/packages/loading/package.json index 7e8cbc989c1..8c452d0e167 100644 --- a/packages/arch/packages/loading/package.json +++ b/packages/arch/packages/loading/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/loading", - "description": "Loading UI as used in @keystone Admin UI.", + "description": "Loading UI as used in @keystonejs Admin UI.", "version": "0.0.8", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/lozenge/package.json b/packages/arch/packages/lozenge/package.json index 122b47e5c8f..36be31dd76b 100644 --- a/packages/arch/packages/lozenge/package.json +++ b/packages/arch/packages/lozenge/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/lozenge", - "description": "Lozenge component as used in @keystone Admin UI.", + "description": "Lozenge component as used in @keystonejs Admin UI.", "version": "0.0.7", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/modal-utils/package.json b/packages/arch/packages/modal-utils/package.json index ebae87541d4..1a07223fcf2 100644 --- a/packages/arch/packages/modal-utils/package.json +++ b/packages/arch/packages/modal-utils/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/modal-utils", - "description": "Modal Utilities as used in @keystone Admin UI.", + "description": "Modal Utilities as used in @keystonejs Admin UI.", "version": "1.0.2", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/navbar/package.json b/packages/arch/packages/navbar/package.json index 494933c4205..0ec455e1462 100644 --- a/packages/arch/packages/navbar/package.json +++ b/packages/arch/packages/navbar/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/navbar", - "description": "Navbar UI as used in @keystone Admin UI.", + "description": "Navbar UI as used in @keystonejs Admin UI.", "version": "0.1.1", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/options/package.json b/packages/arch/packages/options/package.json index 72e74fa18af..8ce4dc56141 100644 --- a/packages/arch/packages/options/package.json +++ b/packages/arch/packages/options/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/options", - "description": "Options UI as used in @keystone Admin UI.", + "description": "Options UI as used in @keystonejs Admin UI.", "version": "0.0.9", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/pagination/package.json b/packages/arch/packages/pagination/package.json index a22a9ee8ca5..aaaa523cf48 100644 --- a/packages/arch/packages/pagination/package.json +++ b/packages/arch/packages/pagination/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/pagination", - "description": "Pagination UI as used in @keystone Admin UI.", + "description": "Pagination UI as used in @keystonejs Admin UI.", "version": "0.0.9", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/pill/package.json b/packages/arch/packages/pill/package.json index 4db2b0c28a2..c9d4cf3c6c4 100644 --- a/packages/arch/packages/pill/package.json +++ b/packages/arch/packages/pill/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/pill", - "description": "Pill Component as used in @keystone Admin UI.", + "description": "Pill Component as used in @keystonejs Admin UI.", "version": "0.1.6", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/popout/package.json b/packages/arch/packages/popout/package.json index 386ce870d9a..cf07e4369d1 100644 --- a/packages/arch/packages/popout/package.json +++ b/packages/arch/packages/popout/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/popout", - "description": "Popout Component used in @keystone Admin UI.", + "description": "Popout Component used in @keystonejs Admin UI.", "version": "0.0.8", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/select/package.json b/packages/arch/packages/select/package.json index f2bac99e382..7c7af868163 100644 --- a/packages/arch/packages/select/package.json +++ b/packages/arch/packages/select/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/select", - "description": "Select Component used in @keystone Admin UI.", + "description": "Select Component used in @keystonejs Admin UI.", "version": "0.1.0", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/theme/package.json b/packages/arch/packages/theme/package.json index 05fd92dd801..6395ddb6011 100644 --- a/packages/arch/packages/theme/package.json +++ b/packages/arch/packages/theme/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/theme", - "description": "Common Theme as used throughout @arch-ui packages and @keystone Admin UI.", + "description": "Common Theme as used throughout @arch-ui packages and @keystonejs Admin UI.", "version": "0.0.5", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/tooltip/package.json b/packages/arch/packages/tooltip/package.json index e4541318925..4c20ab0fda2 100644 --- a/packages/arch/packages/tooltip/package.json +++ b/packages/arch/packages/tooltip/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/tooltip", - "description": "Tooltip UI as used in @keystone Admin UI.", + "description": "Tooltip UI as used in @keystonejs Admin UI.", "version": "0.1.2", "author": "Jed Watson", "license": "MIT", diff --git a/packages/arch/packages/typography/package.json b/packages/arch/packages/typography/package.json index 23e242d7e59..d91836c9aeb 100644 --- a/packages/arch/packages/typography/package.json +++ b/packages/arch/packages/typography/package.json @@ -1,6 +1,6 @@ { "name": "@arch-ui/typography", - "description": "Typography Components used throughout @arch-ui packages and @keystone Admin UI.", + "description": "Typography Components used throughout @arch-ui packages and @keystonejs Admin UI.", "version": "0.0.8", "author": "Jed Watson", "license": "MIT", diff --git a/packages/auth-passport/CHANGELOG.md b/packages/auth-passport/CHANGELOG.md index a256e677ed7..81a5b79c342 100644 --- a/packages/auth-passport/CHANGELOG.md +++ b/packages/auth-passport/CHANGELOG.md @@ -1,18 +1,4 @@ -# @keystone/auth-passport - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/fields@5.0.0 - - @keystone/session@5.0.0 +# @keystonejs/auth-passport # @keystone-alpha/auth-passport diff --git a/packages/auth-passport/README.md b/packages/auth-passport/README.md index 63624d9c762..f36defe4454 100644 --- a/packages/auth-passport/README.md +++ b/packages/auth-passport/README.md @@ -88,12 +88,12 @@ To run this example: `keystone dev`, then visit `index.js` ```javascript -const { Keystone } = require('@keystone/keystone'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); -const { GoogleAuthStrategy } = require('@keystone/auth-passport'); +const { GoogleAuthStrategy } = require('@keystonejs/auth-passport'); const cookieSecret = ''; @@ -163,13 +163,13 @@ the Google authentication process. `server.js` ```javascript -const { Keystone } = require('@keystone/keystone'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); const express = require('express'); -const { GoogleAuthStrategy } = require('@keystone/auth-passport'); +const { GoogleAuthStrategy } = require('@keystonejs/auth-passport'); const cookieSecret = ''; @@ -300,7 +300,7 @@ You can create your own strategies to work with KeystoneJS by extending the ```javascript const PassportWordPress = require('passport-wordpress').Strategy; -const { PassportAuthStrategy } = require('@keystone/auth-passport'); +const { PassportAuthStrategy } = require('@keystonejs/auth-passport'); class WordPressAuthStrategy extends PassportAuthStrategy { constructor(keystone, listKey, config) { diff --git a/packages/auth-passport/lib/Passport.js b/packages/auth-passport/lib/Passport.js index e7500f29127..2baab82c1cd 100644 --- a/packages/auth-passport/lib/Passport.js +++ b/packages/auth-passport/lib/Passport.js @@ -1,7 +1,7 @@ const express = require('express'); const passport = require('passport'); const assert = require('nanoassert'); -const { startAuthedSession } = require('@keystone/session'); +const { startAuthedSession } = require('@keystonejs/session'); const FIELD_SERVICE_NAME = 'service'; const FIELD_USER_ID = 'serviceUserId'; @@ -332,7 +332,7 @@ class PassportAuthStrategy { _createSessionList() { if (!this._getSessionList()) { - const { Text, Relationship } = require('@keystone/fields'); + const { Text, Relationship } = require('@keystonejs/fields'); // TODO: Set read permissions to be 'internal' (within keystone) only so // it doesn't expose a graphQL endpoint, or can be read or modified by diff --git a/packages/auth-passport/package.json b/packages/auth-passport/package.json index 844f7c842f9..262738cd83c 100644 --- a/packages/auth-passport/package.json +++ b/packages/auth-passport/package.json @@ -1,15 +1,15 @@ { - "name": "@keystone/auth-passport", + "name": "@keystonejs/auth-passport", "description": "Provides Social Authentication Strategies based on PassportJS.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "dependencies": { - "@keystone/fields": "^5.0.0", - "@keystone/session": "^5.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/session": "^4.0.0", "express": "^4.17.1", "nanoassert": "^2.0.0", "passport": "^0.4.0", diff --git a/packages/auth-password/CHANGELOG.md b/packages/auth-password/CHANGELOG.md index 00ef2fa773f..99df301c57a 100644 --- a/packages/auth-password/CHANGELOG.md +++ b/packages/auth-password/CHANGELOG.md @@ -1,18 +1,4 @@ -# @keystone/auth-password - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/fields@5.0.0 - - @keystone/session@5.0.0 +# @keystonejs/auth-password # @keystone-alpha/auth-password diff --git a/packages/auth-password/package.json b/packages/auth-password/package.json index 0060ea8ede7..fe1645d2e30 100644 --- a/packages/auth-password/package.json +++ b/packages/auth-password/package.json @@ -1,14 +1,14 @@ { - "name": "@keystone/auth-password", + "name": "@keystonejs/auth-password", "description": "Provides a basic password authentication strategy.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "dependencies": { - "@keystone/fields": "^5.0.0", - "@keystone/session": "^5.0.0" + "@keystonejs/fields": "^4.0.0", + "@keystonejs/session": "^4.0.0" } } diff --git a/packages/build-field-types/CHANGELOG.md b/packages/build-field-types/CHANGELOG.md index 2dfa5b18bdc..cbe4ed4371a 100644 --- a/packages/build-field-types/CHANGELOG.md +++ b/packages/build-field-types/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/build-field-types - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/build-field-types # @keystone-alpha/build-field-types diff --git a/packages/build-field-types/README.md b/packages/build-field-types/README.md index 19c5f250f0a..73434a2d84f 100644 --- a/packages/build-field-types/README.md +++ b/packages/build-field-types/README.md @@ -1,4 +1,4 @@ -# @keystone/build-field-types +# @keystonejs/build-field-types This package is an internal helper package used by Keystone to package field types for the adminUI. diff --git a/packages/build-field-types/__fixtures__/basic-field-type/src/index.js b/packages/build-field-types/__fixtures__/basic-field-type/src/index.js index 63b2e58d8e0..80c48e651c0 100644 --- a/packages/build-field-types/__fixtures__/basic-field-type/src/index.js +++ b/packages/build-field-types/__fixtures__/basic-field-type/src/index.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export let MyCoolFieldType = { views: { diff --git a/packages/build-field-types/package.json b/packages/build-field-types/package.json index d859e0dabc4..dbcfc69b1df 100644 --- a/packages/build-field-types/package.json +++ b/packages/build-field-types/package.json @@ -1,6 +1,6 @@ { - "name": "@keystone/build-field-types", - "version": "5.0.0", + "name": "@keystonejs/build-field-types", + "version": "4.0.0", "description": "A build tool for KeystoneJS 5 Field Types", "main": "dist/index.js", "files": [ diff --git a/packages/build-field-types/src/build/__tests__/__snapshots__/field-types.js.snap b/packages/build-field-types/src/build/__tests__/__snapshots__/field-types.js.snap index a6791ffae32..02c631fb21c 100644 --- a/packages/build-field-types/src/build/__tests__/__snapshots__/field-types.js.snap +++ b/packages/build-field-types/src/build/__tests__/__snapshots__/field-types.js.snap @@ -67,7 +67,7 @@ Object { `; exports[`basic field type: src/index.js 1`] = ` -"import { importView } from '@keystone/build-field-types'; +"import { importView } from '@keystonejs/build-field-types'; export let MyCoolFieldType = { views: { diff --git a/packages/create-keystone-app/CHANGELOG.md b/packages/create-keystone-app/CHANGELOG.md index d8eb794fe6c..9bfea2ab64c 100644 --- a/packages/create-keystone-app/CHANGELOG.md +++ b/packages/create-keystone-app/CHANGELOG.md @@ -1,13 +1,5 @@ # create-keystone-app -## 1.3.0 - -### Minor Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - ## 1.2.1 ### Patch Changes diff --git a/packages/create-keystone-app/example-projects/blank/CHANGELOG.md b/packages/create-keystone-app/example-projects/blank/CHANGELOG.md index d5765dc6e70..7e99ae318f0 100644 --- a/packages/create-keystone-app/example-projects/blank/CHANGELOG.md +++ b/packages/create-keystone-app/example-projects/blank/CHANGELOG.md @@ -1,20 +1,4 @@ -# @keystone/example-projects-blank - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/keystone@5.0.0 +# @keystonejs/example-projects-blank # @keystone-alpha/example-projects-blank diff --git a/packages/create-keystone-app/example-projects/blank/index.js b/packages/create-keystone-app/example-projects/blank/index.js index 769ef92d2a7..2f16f01e66c 100644 --- a/packages/create-keystone-app/example-projects/blank/index.js +++ b/packages/create-keystone-app/example-projects/blank/index.js @@ -1,8 +1,8 @@ -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); /* keystone-cli: generated-code */ -const { MongooseAdapter: Adapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter: Adapter } = require('@keystonejs/adapter-mongoose'); const PROJECT_NAME = 'My KeystoneJS Project'; /* /keystone-cli: generated-code */ diff --git a/packages/create-keystone-app/example-projects/blank/package.json b/packages/create-keystone-app/example-projects/blank/package.json index ab5db56d2d0..6845f882138 100644 --- a/packages/create-keystone-app/example-projects/blank/package.json +++ b/packages/create-keystone-app/example-projects/blank/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/example-projects-blank", + "name": "@keystonejs/example-projects-blank", "description": "A blank KeystoneJS starter project.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -14,10 +14,10 @@ "start": "cross-env NODE_ENV=production keystone start" }, "dependencies": { - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/keystone": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", "cross-env": "^5.2.0" } } diff --git a/packages/create-keystone-app/example-projects/config.js b/packages/create-keystone-app/example-projects/config.js index 5a8701ba9f4..ed19feb129c 100644 --- a/packages/create-keystone-app/example-projects/config.js +++ b/packages/create-keystone-app/example-projects/config.js @@ -1,14 +1,14 @@ const adapters = { Mongoose: { file: 'adapter-mongoose.js', - dependencies: ['@keystone/adapter-mongoose'], + dependencies: ['@keystonejs/adapter-mongoose'], description: 'Connect to a Mongo database.', }, Knex: { file: 'adapter-knex.js', - dependencies: ['@keystone/adapter-knex'], + dependencies: ['@keystonejs/adapter-knex'], description: 'Connect to a Postgres database.', - removeDependencies: ['@keystone/adapter-mongoose'], + removeDependencies: ['@keystonejs/adapter-mongoose'], }, }; diff --git a/packages/create-keystone-app/example-projects/nuxt/CHANGELOG.md b/packages/create-keystone-app/example-projects/nuxt/CHANGELOG.md index 5e534d87714..c6a33c60d0b 100644 --- a/packages/create-keystone-app/example-projects/nuxt/CHANGELOG.md +++ b/packages/create-keystone-app/example-projects/nuxt/CHANGELOG.md @@ -1,22 +1,4 @@ -# @keystone/example-projects-nuxt - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/app-nuxt@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/keystone@5.0.0 +# @keystonejs/example-projects-nuxt # @keystone-alpha/example-projects-nuxt diff --git a/packages/create-keystone-app/example-projects/nuxt/index.js b/packages/create-keystone-app/example-projects/nuxt/index.js index d7fbf63e248..d7fe1ea7c62 100644 --- a/packages/create-keystone-app/example-projects/nuxt/index.js +++ b/packages/create-keystone-app/example-projects/nuxt/index.js @@ -1,11 +1,11 @@ -const { Keystone } = require('@keystone/keystone'); -const { Text } = require('@keystone/fields'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { NuxtApp } = require('@keystone/app-nuxt'); +const { Keystone } = require('@keystonejs/keystone'); +const { Text } = require('@keystonejs/fields'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { NuxtApp } = require('@keystonejs/app-nuxt'); /* keystone-cli: generated-code */ -const { MongooseAdapter: Adapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter: Adapter } = require('@keystonejs/adapter-mongoose'); const PROJECT_NAME = 'Nuxt'; /* /keystone-cli: generated-code */ diff --git a/packages/create-keystone-app/example-projects/nuxt/package.json b/packages/create-keystone-app/example-projects/nuxt/package.json index c7352fdead6..520ce9edff7 100644 --- a/packages/create-keystone-app/example-projects/nuxt/package.json +++ b/packages/create-keystone-app/example-projects/nuxt/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/example-projects-nuxt", + "name": "@keystonejs/example-projects-nuxt", "description": "A NuxtJS example project.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -14,12 +14,12 @@ "start": "cross-env NODE_ENV=production keystone start" }, "dependencies": { - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/app-nuxt": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/keystone": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/app-nuxt": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", "cross-env": "^5.2.0", "express": "^4.17.1", "nuxt": "^2.9.2" diff --git a/packages/create-keystone-app/example-projects/starter/CHANGELOG.md b/packages/create-keystone-app/example-projects/starter/CHANGELOG.md index 9f10a344069..7ec583959b0 100644 --- a/packages/create-keystone-app/example-projects/starter/CHANGELOG.md +++ b/packages/create-keystone-app/example-projects/starter/CHANGELOG.md @@ -1,22 +1,4 @@ -# @keystone/example-projects-starter - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/auth-password@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/keystone@5.0.0 +# @keystonejs/example-projects-starter # @keystone-alpha/example-projects-starter diff --git a/packages/create-keystone-app/example-projects/starter/index.js b/packages/create-keystone-app/example-projects/starter/index.js index 124b73e4799..9574185283f 100644 --- a/packages/create-keystone-app/example-projects/starter/index.js +++ b/packages/create-keystone-app/example-projects/starter/index.js @@ -1,10 +1,10 @@ -const { Keystone } = require('@keystone/keystone'); -const { PasswordAuthStrategy } = require('@keystone/auth-password'); -const { Text, Checkbox, Password } = require('@keystone/fields'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { PasswordAuthStrategy } = require('@keystonejs/auth-password'); +const { Text, Checkbox, Password } = require('@keystonejs/fields'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); /* keystone-cli: generated-code */ -const { MongooseAdapter: Adapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter: Adapter } = require('@keystonejs/adapter-mongoose'); const PROJECT_NAME = 'My KeystoneJS Project'; /* /keystone-cli: generated-code */ diff --git a/packages/create-keystone-app/example-projects/starter/package.json b/packages/create-keystone-app/example-projects/starter/package.json index 2305edeab32..5e5589cb711 100644 --- a/packages/create-keystone-app/example-projects/starter/package.json +++ b/packages/create-keystone-app/example-projects/starter/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/example-projects-starter", + "name": "@keystonejs/example-projects-starter", "description": "An example KeystoneJS project with a User list and Authentication.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -14,12 +14,12 @@ "start": "cross-env NODE_ENV=production keystone start" }, "dependencies": { - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/auth-password": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/keystone": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/auth-password": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", "cross-env": "^5.2.0" } } diff --git a/packages/create-keystone-app/example-projects/todo/CHANGELOG.md b/packages/create-keystone-app/example-projects/todo/CHANGELOG.md index 455cc44152f..60d252f92a1 100644 --- a/packages/create-keystone-app/example-projects/todo/CHANGELOG.md +++ b/packages/create-keystone-app/example-projects/todo/CHANGELOG.md @@ -1,22 +1,4 @@ -# @keystone/example-projects-todo - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/app-static@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/keystone@5.0.0 +# @keystonejs/example-projects-todo # @keystone-alpha/example-projects-todo diff --git a/packages/create-keystone-app/example-projects/todo/index.js b/packages/create-keystone-app/example-projects/todo/index.js index 848fab675a6..90e767f9c8d 100644 --- a/packages/create-keystone-app/example-projects/todo/index.js +++ b/packages/create-keystone-app/example-projects/todo/index.js @@ -1,11 +1,11 @@ -const { Keystone } = require('@keystone/keystone'); -const { Text } = require('@keystone/fields'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { StaticApp } = require('@keystone/app-static'); +const { Keystone } = require('@keystonejs/keystone'); +const { Text } = require('@keystonejs/fields'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { StaticApp } = require('@keystonejs/app-static'); /* keystone-cli: generated-code */ -const { MongooseAdapter: Adapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter: Adapter } = require('@keystonejs/adapter-mongoose'); const PROJECT_NAME = 'My KeystoneJS Project'; /* /keystone-cli: generated-code */ diff --git a/packages/create-keystone-app/example-projects/todo/package.json b/packages/create-keystone-app/example-projects/todo/package.json index 3041d9b8617..c74072e1691 100644 --- a/packages/create-keystone-app/example-projects/todo/package.json +++ b/packages/create-keystone-app/example-projects/todo/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/example-projects-todo", + "name": "@keystonejs/example-projects-todo", "description": "An example KeystoneJS project showcasing a simple Todo List with a Keystone StaticApp front-end.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -14,12 +14,12 @@ "start": "cross-env NODE_ENV=production keystone start" }, "dependencies": { - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/app-static": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/keystone": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/app-static": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", "cross-env": "^5.2.0" } } diff --git a/packages/create-keystone-app/package.json b/packages/create-keystone-app/package.json index 644a543b517..09e39c18eb8 100644 --- a/packages/create-keystone-app/package.json +++ b/packages/create-keystone-app/package.json @@ -1,7 +1,7 @@ { "name": "create-keystone-app", "description": "Generate starter apps for Keystone 5", - "version": "1.3.0", + "version": "1.2.1", "bin": { "create-keystone-app": "bin/cli.js" }, @@ -21,4 +21,4 @@ "prompts": "^2.2.1", "terminal-link": "^1.3.0" } -} +} \ No newline at end of file diff --git a/packages/create-keystone-app/templates/adapter-knex.js b/packages/create-keystone-app/templates/adapter-knex.js index 609eb54ee75..5b099e5d464 100644 --- a/packages/create-keystone-app/templates/adapter-knex.js +++ b/packages/create-keystone-app/templates/adapter-knex.js @@ -1 +1 @@ -const { KnexAdapter: Adapter } = require('@keystone/adapter-knex'); +const { KnexAdapter: Adapter } = require('@keystonejs/adapter-knex'); diff --git a/packages/create-keystone-app/templates/adapter-mongoose.js b/packages/create-keystone-app/templates/adapter-mongoose.js index 028339de143..a04e67fad81 100644 --- a/packages/create-keystone-app/templates/adapter-mongoose.js +++ b/packages/create-keystone-app/templates/adapter-mongoose.js @@ -1 +1 @@ -const { MongooseAdapter: Adapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter: Adapter } = require('@keystonejs/adapter-mongoose'); diff --git a/packages/email/CHANGELOG.md b/packages/email/CHANGELOG.md index 611844d5e6e..63587867dcd 100644 --- a/packages/email/CHANGELOG.md +++ b/packages/email/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/email - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/email # @keystone-alpha/email diff --git a/packages/email/README.md b/packages/email/README.md index a82cbd7b061..1c551478bc2 100644 --- a/packages/email/README.md +++ b/packages/email/README.md @@ -30,7 +30,7 @@ Usage: `index.js` ```javascript -const { emailSender } = require('@keystone/email'); +const { emailSender } = require('@keystonejs/email'); const jsxEmailSender = emailSender.jsx({ // The directory containing the email templates @@ -75,7 +75,7 @@ Usage: `index.js` ```javascript -const { emailSender } = require('@keystone/email'); +const { emailSender } = require('@keystonejs/email'); const mjmlEmailSender = emailSender.mjml({ // The directory containing the email templates @@ -121,7 +121,7 @@ module.exports = class extends React.Component { Usage: ```javascript -const { emailSender } = require('@keystone/email'); +const { emailSender } = require('@keystonejs/email'); const pugEmailSender = emailSender.pug({ // The directory containing the email templates @@ -143,7 +143,7 @@ Above are examples of using 2 renderers, `jsx`, and `pug`. In general, renderers are available directly on the exported object: ```javascript -const { emailSender } = require('@keystone/email'); +const { emailSender } = require('@keystonejs/email'); emailSender.(...); ``` diff --git a/packages/email/lib/email.js b/packages/email/lib/email.js index 479c2aebe57..945e2eace60 100644 --- a/packages/email/lib/email.js +++ b/packages/email/lib/email.js @@ -72,7 +72,7 @@ const mjmlConfigDefault = { * There is also a `jsx` renderer powered by `express-react-views`. * * Usage: - * const { emailSender } = require('@keystone/email'); + * const { emailSender } = require('@keystonejs/email'); * * const jsxEmailSender = emailSender.jsx({ * // The directory containing the email templates diff --git a/packages/email/package.json b/packages/email/package.json index c21a8a6b9e4..231c5dc3983 100644 --- a/packages/email/package.json +++ b/packages/email/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/email", + "name": "@keystonejs/email", "description": "Easily send emails from a KeystoneJS application", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { diff --git a/packages/field-content/CHANGELOG.md b/packages/field-content/CHANGELOG.md index ff1588309c9..d5db7b585b8 100644 --- a/packages/field-content/CHANGELOG.md +++ b/packages/field-content/CHANGELOG.md @@ -1,19 +1,4 @@ -# @keystone/field-content - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/build-field-types@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/utils@5.0.0 +# @keystonejs/field-content # @keystone-alpha/field-content diff --git a/packages/field-content/package.json b/packages/field-content/package.json index 00e850d47a6..61b1abff3b5 100644 --- a/packages/field-content/package.json +++ b/packages/field-content/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/field-content", + "name": "@keystonejs/field-content", "description": "A block-based content field for KeystoneJS", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -18,9 +18,9 @@ "@arch-ui/typography": "^0.0.8", "@babel/runtime": "^7.4.3", "@emotion/core": "^10.0.14", - "@keystone/build-field-types": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/utils": "^5.0.0", + "@keystonejs/build-field-types": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/utils": "^4.0.0", "apply-ref": "^0.2.0", "get-selection-range": "^0.1.0", "image-extensions": "^1.1.0", diff --git a/packages/field-content/src/Block.js b/packages/field-content/src/Block.js index 5b9321427d3..bfcdab2f3d8 100644 --- a/packages/field-content/src/Block.js +++ b/packages/field-content/src/Block.js @@ -1,7 +1,7 @@ export class Block { constructor() { // To be set by a Block if it creates a join table. - // Instance of @keystone/core#List + // Instance of @keystonejs/core#List this.auxList = undefined; } diff --git a/packages/field-content/src/Implementation.js b/packages/field-content/src/Implementation.js index 79c9e02fea4..e92fd208cbb 100644 --- a/packages/field-content/src/Implementation.js +++ b/packages/field-content/src/Implementation.js @@ -1,6 +1,6 @@ import getByPath from 'lodash.get'; -import { Relationship, Text } from '@keystone/fields'; -import { flatMap, unique, objMerge } from '@keystone/utils'; +import { Relationship, Text } from '@keystonejs/fields'; +import { flatMap, unique, objMerge } from '@keystonejs/utils'; import { paragraph } from './blocks'; import { walkSlateNode } from './slate-walker'; @@ -194,7 +194,7 @@ export class Content extends Relationship.implementation { * 1. The block implementation (eg; ./views/editor/blocks/embed.js) * 2. The config (eg; { apiKey: process.env.EMBEDLY_API_KEY }) * Because of the way we bundle the admin UI, we have to split apart these - * two halves and send them seperately (see `@keystone/field-views-loader`): + * two halves and send them seperately (see `@keystonejs/field-views-loader`): * 1. Sent as a "view" (see `extendAdminViews` below), which will be required * (so it's included in the bundle). * 2. Sent as a serialized JSON object (see `extendAdminMeta` below), which diff --git a/packages/field-content/src/blocks/blockquote.js b/packages/field-content/src/blocks/blockquote.js index f364fa678be..49e8bc1a894 100644 --- a/packages/field-content/src/blocks/blockquote.js +++ b/packages/field-content/src/blocks/blockquote.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; export default class BlockquoteBlock extends Block { diff --git a/packages/field-content/src/blocks/caption.js b/packages/field-content/src/blocks/caption.js index 94d88f65c10..b6b843147ce 100644 --- a/packages/field-content/src/blocks/caption.js +++ b/packages/field-content/src/blocks/caption.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; export default class CaptionBlock extends Block { diff --git a/packages/field-content/src/blocks/heading.js b/packages/field-content/src/blocks/heading.js index f927aad4392..d5f637ffc9d 100644 --- a/packages/field-content/src/blocks/heading.js +++ b/packages/field-content/src/blocks/heading.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; import { paragraph } from '../blocks'; diff --git a/packages/field-content/src/blocks/image-container.js b/packages/field-content/src/blocks/image-container.js index 9e2969de680..7023ce3ebf0 100644 --- a/packages/field-content/src/blocks/image-container.js +++ b/packages/field-content/src/blocks/image-container.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; import image from './image'; import caption from './caption'; diff --git a/packages/field-content/src/blocks/image.js b/packages/field-content/src/blocks/image.js index 2a1dfd4eb8f..3d6a058af1d 100644 --- a/packages/field-content/src/blocks/image.js +++ b/packages/field-content/src/blocks/image.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; export default class ImageBlock extends Block { diff --git a/packages/field-content/src/blocks/link.js b/packages/field-content/src/blocks/link.js index 892b3b368f1..fbf3d633c35 100644 --- a/packages/field-content/src/blocks/link.js +++ b/packages/field-content/src/blocks/link.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; export default class LinkBlock extends Block { diff --git a/packages/field-content/src/blocks/list-item.js b/packages/field-content/src/blocks/list-item.js index 47ff0c68e9a..d1cf82a4ab5 100644 --- a/packages/field-content/src/blocks/list-item.js +++ b/packages/field-content/src/blocks/list-item.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; export default class ListItemBlock extends Block { diff --git a/packages/field-content/src/blocks/ordered-list.js b/packages/field-content/src/blocks/ordered-list.js index fcc6ebcdc28..32e22cb51e2 100644 --- a/packages/field-content/src/blocks/ordered-list.js +++ b/packages/field-content/src/blocks/ordered-list.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; import listItem from './list-item'; diff --git a/packages/field-content/src/blocks/paragraph.js b/packages/field-content/src/blocks/paragraph.js index 2509377ef89..12443fff8e5 100644 --- a/packages/field-content/src/blocks/paragraph.js +++ b/packages/field-content/src/blocks/paragraph.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; export default class ParagraphBlock extends Block { diff --git a/packages/field-content/src/blocks/unordered-list.js b/packages/field-content/src/blocks/unordered-list.js index 6d36719a3cb..a437c8abcb5 100644 --- a/packages/field-content/src/blocks/unordered-list.js +++ b/packages/field-content/src/blocks/unordered-list.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Block } from '../Block'; import listItem from './list-item'; diff --git a/packages/field-content/src/index.js b/packages/field-content/src/index.js index 7349a00a12d..3b6500b1cab 100644 --- a/packages/field-content/src/index.js +++ b/packages/field-content/src/index.js @@ -1,5 +1,5 @@ -import { importView } from '@keystone/build-field-types'; -import { Text } from '@keystone/fields'; +import { importView } from '@keystonejs/build-field-types'; +import { Text } from '@keystonejs/fields'; import { Content as ContentType, MongoContentInterface, diff --git a/packages/field-content/src/slate-walker.js b/packages/field-content/src/slate-walker.js index e41c2ef41ba..7d8aeeae8a2 100644 --- a/packages/field-content/src/slate-walker.js +++ b/packages/field-content/src/slate-walker.js @@ -1,4 +1,4 @@ -import { identity } from '@keystone/utils'; +import { identity } from '@keystonejs/utils'; const noop = () => {}; // A depth-first, top-down tree walking algorithm. diff --git a/packages/field-content/src/views/Controller.js b/packages/field-content/src/views/Controller.js index e743e87d8e3..b8870aae9df 100644 --- a/packages/field-content/src/views/Controller.js +++ b/packages/field-content/src/views/Controller.js @@ -1,8 +1,8 @@ import memoizeOne from 'memoize-one'; import isPromise from 'p-is-promise'; -import { captureSuspensePromises } from '@keystone/utils'; +import { captureSuspensePromises } from '@keystonejs/utils'; import { Value } from 'slate'; -import Controller from '@keystone/fields/Controller'; +import Controller from '@keystonejs/fields/Controller'; import { serialize, deserialize } from '../slate-serializer'; import { initialValue } from './editor/constants'; diff --git a/packages/field-views-loader/CHANGELOG.md b/packages/field-views-loader/CHANGELOG.md index 4604140997d..f64e5e792fe 100644 --- a/packages/field-views-loader/CHANGELOG.md +++ b/packages/field-views-loader/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/field-views-loader - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/field-views-loader # @keystone-alpha/field-views-loader diff --git a/packages/field-views-loader/index.js b/packages/field-views-loader/index.js index a874de1d26b..d57e387d7a3 100644 --- a/packages/field-views-loader/index.js +++ b/packages/field-views-loader/index.js @@ -105,7 +105,7 @@ module.exports = function() { .join(',\n')}\n}`; const source = ` - import { captureSuspensePromises } from '@keystone/utils'; + import { captureSuspensePromises } from '@keystonejs/utils'; let promiseCache = new Map(); let valueCache = new Map(); diff --git a/packages/field-views-loader/package.json b/packages/field-views-loader/package.json index ad15de5232c..250763a75f7 100644 --- a/packages/field-views-loader/package.json +++ b/packages/field-views-loader/package.json @@ -1,6 +1,6 @@ { - "name": "@keystone/field-views-loader", - "version": "5.0.0", + "name": "@keystonejs/field-views-loader", + "version": "4.0.0", "description": "A webpack loader used to load all thew field views used in an app", "main": "index.js", "author": "The Keystone Development Team", diff --git a/packages/fields-auto-increment/CHANGELOG.md b/packages/fields-auto-increment/CHANGELOG.md index 5292d620721..1fea2deb60a 100644 --- a/packages/fields-auto-increment/CHANGELOG.md +++ b/packages/fields-auto-increment/CHANGELOG.md @@ -1,18 +1,4 @@ -# @keystone/fields-auto-increment - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-knex@5.0.0 - - @keystone/fields@5.0.0 +# @keystonejs/fields-auto-increment # @keystone-alpha/fields-auto-increment diff --git a/packages/fields-auto-increment/README.md b/packages/fields-auto-increment/README.md index dd0f58f3c72..e4931c6ce02 100644 --- a/packages/fields-auto-increment/README.md +++ b/packages/fields-auto-increment/README.md @@ -52,8 +52,8 @@ Specifically: ## Usage ```js -const { Keystone } = require('@keystone/keystone'); -const { AutoIncrement } = require('@keystone/fields-auto-increment'); +const { Keystone } = require('@keystonejs/keystone'); +const { AutoIncrement } = require('@keystonejs/fields-auto-increment'); const keystone = new Keystone(/* ... */); diff --git a/packages/fields-auto-increment/package.json b/packages/fields-auto-increment/package.json index 9c3de0ef72e..32291c61f41 100644 --- a/packages/fields-auto-increment/package.json +++ b/packages/fields-auto-increment/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/fields-auto-increment", + "name": "@keystonejs/fields-auto-increment", "description": "KeystoneJS AutoIncrement Field Type", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "repository": "https://github.com/keystonejs/keystone-5.git", @@ -10,8 +10,8 @@ }, "dependencies": { "@babel/runtime": "^7.4.3", - "@keystone/adapter-knex": "^5.0.0", - "@keystone/fields": "^5.0.0" + "@keystonejs/adapter-knex": "^4.0.0", + "@keystonejs/fields": "^4.0.0" }, "main": "dist/fields-auto-increment.cjs.js", "module": "dist/fields-auto-increment.esm.js" diff --git a/packages/fields-auto-increment/src/Implementation.js b/packages/fields-auto-increment/src/Implementation.js index 7ca3323e793..6e08d2d1c5e 100644 --- a/packages/fields-auto-increment/src/Implementation.js +++ b/packages/fields-auto-increment/src/Implementation.js @@ -1,5 +1,5 @@ -import { Implementation } from '@keystone/fields'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { Implementation } from '@keystonejs/fields'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class AutoIncrementImplementation extends Implementation { constructor(path, config = {}, context = {}) { diff --git a/packages/fields-auto-increment/src/index.js b/packages/fields-auto-increment/src/index.js index e5b7e2b0177..a89826520e6 100644 --- a/packages/fields-auto-increment/src/index.js +++ b/packages/fields-auto-increment/src/index.js @@ -1,5 +1,5 @@ import { AutoIncrementImplementation, KnexAutoIncrementInterface } from './Implementation'; -import { Integer } from '@keystone/fields'; +import { Integer } from '@keystonejs/fields'; export const AutoIncrement = { type: 'AutoIncrement', diff --git a/packages/fields-datetime-utc/CHANGELOG.md b/packages/fields-datetime-utc/CHANGELOG.md index 4d7e16a4eb7..521924eb6a8 100644 --- a/packages/fields-datetime-utc/CHANGELOG.md +++ b/packages/fields-datetime-utc/CHANGELOG.md @@ -1,19 +1,4 @@ -# @keystone/fields-datetime-utc - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-knex@5.0.0 - - @keystone/adapter-mongoose@5.0.0 - - @keystone/fields@5.0.0 +# @keystonejs/fields-datetime-utc # @keystone-alpha/fields-datetime-utc diff --git a/packages/fields-datetime-utc/package.json b/packages/fields-datetime-utc/package.json index e411f97212e..116fa8ce54a 100644 --- a/packages/fields-datetime-utc/package.json +++ b/packages/fields-datetime-utc/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/fields-datetime-utc", + "name": "@keystonejs/fields-datetime-utc", "description": "KeystoneJS DatetimeUtc Field Type", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "repository": "https://github.com/keystonejs/keystone-5.git", @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/runtime": "^7.4.3", - "@keystone/adapter-knex": "^5.0.0", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/fields": "^5.0.0", + "@keystonejs/adapter-knex": "^4.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/fields": "^4.0.0", "luxon": "^1.11.4" }, "main": "dist/fields-datetime-utc.cjs.js", diff --git a/packages/fields-datetime-utc/src/Implementation.js b/packages/fields-datetime-utc/src/Implementation.js index 64dc599687c..db84d55262c 100644 --- a/packages/fields-datetime-utc/src/Implementation.js +++ b/packages/fields-datetime-utc/src/Implementation.js @@ -1,7 +1,7 @@ import { DateTime } from 'luxon'; -import { Implementation } from '@keystone/fields'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; +import { Implementation } from '@keystonejs/fields'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; export class DateTimeUtcImplementation extends Implementation { gqlOutputFields() { diff --git a/packages/fields-datetime-utc/src/index.js b/packages/fields-datetime-utc/src/index.js index 97f746a0ca4..7c71bea12da 100644 --- a/packages/fields-datetime-utc/src/index.js +++ b/packages/fields-datetime-utc/src/index.js @@ -3,7 +3,7 @@ import { MongoDateTimeUtcInterface, KnexDateTimeUtcInterface, } from './Implementation'; -import { DateTime } from '@keystone/fields'; +import { DateTime } from '@keystonejs/fields'; export const DateTimeUtc = { type: 'DateTimeUtc', diff --git a/packages/fields-markdown/CHANGELOG.md b/packages/fields-markdown/CHANGELOG.md index 55dbed7e82d..f34582181ba 100644 --- a/packages/fields-markdown/CHANGELOG.md +++ b/packages/fields-markdown/CHANGELOG.md @@ -1,18 +1,4 @@ -# @keystone/fields-markdown - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/build-field-types@5.0.0 - - @keystone/fields@5.0.0 +# @keystonejs/fields-markdown # @keystone-alpha/fields-markdown diff --git a/packages/fields-markdown/package.json b/packages/fields-markdown/package.json index aa253a75fe8..04c753e1e52 100644 --- a/packages/fields-markdown/package.json +++ b/packages/fields-markdown/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/fields-markdown", + "name": "@keystonejs/fields-markdown", "description": "KeystoneJS Markdown Field Type", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -16,8 +16,8 @@ "@arch-ui/typography": "^0.0.8", "@babel/runtime": "^7.4.3", "@emotion/core": "^10.0.14", - "@keystone/build-field-types": "^5.0.0", - "@keystone/fields": "^5.0.0", + "@keystonejs/build-field-types": "^4.0.0", + "@keystonejs/fields": "^4.0.0", "codemirror": "^5.48.0", "prop-types": "^15.7.2", "react": "^16.8.6", diff --git a/packages/fields-markdown/src/index.js b/packages/fields-markdown/src/index.js index c014b199b5d..680d5b727fc 100644 --- a/packages/fields-markdown/src/index.js +++ b/packages/fields-markdown/src/index.js @@ -1,5 +1,5 @@ -import { Text } from '@keystone/fields'; -import { importView } from '@keystone/build-field-types'; +import { Text } from '@keystonejs/fields'; +import { importView } from '@keystonejs/build-field-types'; export let Markdown = { type: 'Markdown', diff --git a/packages/fields-mongoid/CHANGELOG.md b/packages/fields-mongoid/CHANGELOG.md index 5f76194619b..bab92739053 100644 --- a/packages/fields-mongoid/CHANGELOG.md +++ b/packages/fields-mongoid/CHANGELOG.md @@ -1,20 +1,4 @@ -# @keystone/fields-mongoid - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-knex@5.0.0 - - @keystone/adapter-mongoose@5.0.0 - - @keystone/build-field-types@5.0.0 - - @keystone/fields@5.0.0 +# @keystonejs/fields-mongoid # @keystone-alpha/fields-mongoid diff --git a/packages/fields-mongoid/README.md b/packages/fields-mongoid/README.md index da1e5e69908..09c0a4d341b 100644 --- a/packages/fields-mongoid/README.md +++ b/packages/fields-mongoid/README.md @@ -19,8 +19,8 @@ It supports the core Mongoose and Knex adapters: ## Usage ```js -const { Keystone } = require('@keystone/keystone'); -const { MongoId } = require('@keystone/fields-mongoid'); +const { Keystone } = require('@keystonejs/keystone'); +const { MongoId } = require('@keystonejs/fields-mongoid'); const keystone = new Keystone(/* ... */); diff --git a/packages/fields-mongoid/package.json b/packages/fields-mongoid/package.json index 72f3fa3054b..5c54a5ed217 100644 --- a/packages/fields-mongoid/package.json +++ b/packages/fields-mongoid/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/fields-mongoid", + "name": "@keystonejs/fields-mongoid", "description": "KeystoneJS MongoId Field Type", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "main": "dist/fields-mongoid.cjs.js", @@ -12,10 +12,10 @@ "dependencies": { "@arch-ui/input": "^0.1.0", "@babel/runtime": "^7.4.3", - "@keystone/adapter-knex": "^5.0.0", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/build-field-types": "^5.0.0", - "@keystone/fields": "^5.0.0", + "@keystonejs/adapter-knex": "^4.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/build-field-types": "^4.0.0", + "@keystonejs/fields": "^4.0.0", "react": "^16.8.6" }, "module": "dist/fields-mongoid.esm.js" diff --git a/packages/fields-mongoid/src/Implementation.js b/packages/fields-mongoid/src/Implementation.js index bc878a2710f..fc4ddca636f 100644 --- a/packages/fields-mongoid/src/Implementation.js +++ b/packages/fields-mongoid/src/Implementation.js @@ -1,6 +1,6 @@ -import { Implementation } from '@keystone/fields'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { Implementation } from '@keystonejs/fields'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class MongoIdImplementation extends Implementation { gqlOutputFields() { diff --git a/packages/fields-mongoid/src/index.js b/packages/fields-mongoid/src/index.js index 1881572a010..a6b0563b493 100644 --- a/packages/fields-mongoid/src/index.js +++ b/packages/fields-mongoid/src/index.js @@ -3,8 +3,8 @@ import { MongooseMongoIdInterface, KnexMongoIdInterface, } from './Implementation'; -import { Text } from '@keystone/fields'; -import { importView } from '@keystone/build-field-types'; +import { Text } from '@keystonejs/fields'; +import { importView } from '@keystonejs/build-field-types'; export const MongoId = { type: 'MongoId', @@ -24,7 +24,7 @@ export const MongoId = { getConfig: () => { throw `The Uuid field type doesn't provide a default primary key field configuration for knex. ` + `You'll need to supply your own 'id' field for each list or use a different field type for your ` + - `ids (eg '@keystone/fields-auto-increment').`; + `ids (eg '@keystonejs/fields-auto-increment').`; }, }, mongoose: { diff --git a/packages/fields-mongoid/src/views/Controller.js b/packages/fields-mongoid/src/views/Controller.js index 40eba712d83..4d1583ad082 100644 --- a/packages/fields-mongoid/src/views/Controller.js +++ b/packages/fields-mongoid/src/views/Controller.js @@ -1,4 +1,4 @@ -import FieldController from '@keystone/fields/Controller'; +import FieldController from '@keystonejs/fields/Controller'; export default class TextController extends FieldController { getFilterGraphQL = ({ type, value }) => { diff --git a/packages/fields-wysiwyg-tinymce/CHANGELOG.md b/packages/fields-wysiwyg-tinymce/CHANGELOG.md index 2cac64234df..bc23c184cf8 100644 --- a/packages/fields-wysiwyg-tinymce/CHANGELOG.md +++ b/packages/fields-wysiwyg-tinymce/CHANGELOG.md @@ -1,18 +1,4 @@ -# @keystone/fields-wysiwyg-tinymce - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/build-field-types@5.0.0 - - @keystone/fields@5.0.0 +# @keystonejs/fields-wysiwyg-tinymce # @keystone-alpha/fields-wysiwyg-tinymce diff --git a/packages/fields-wysiwyg-tinymce/package.json b/packages/fields-wysiwyg-tinymce/package.json index d24d55b81f6..3e85cb521cd 100644 --- a/packages/fields-wysiwyg-tinymce/package.json +++ b/packages/fields-wysiwyg-tinymce/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/fields-wysiwyg-tinymce", + "name": "@keystonejs/fields-wysiwyg-tinymce", "description": "KeystoneJS WYSIWYG HTML Field Type, powered by TinyMCE", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -14,8 +14,8 @@ "@arch-ui/theme": "^0.0.5", "@babel/runtime": "^7.4.3", "@emotion/core": "^10.0.14", - "@keystone/build-field-types": "^5.0.0", - "@keystone/fields": "^5.0.0", + "@keystonejs/build-field-types": "^4.0.0", + "@keystonejs/fields": "^4.0.0", "cuid": "^2.1.6", "prop-types": "^15.7.2", "react": "^16.8.6", diff --git a/packages/fields-wysiwyg-tinymce/src/index.js b/packages/fields-wysiwyg-tinymce/src/index.js index e8823ba6566..66cad28ba7a 100644 --- a/packages/fields-wysiwyg-tinymce/src/index.js +++ b/packages/fields-wysiwyg-tinymce/src/index.js @@ -1,7 +1,7 @@ import { dirname } from 'path'; import express from 'express'; -import { Text } from '@keystone/fields'; -import { importView } from '@keystone/build-field-types'; +import { Text } from '@keystonejs/fields'; +import { importView } from '@keystonejs/build-field-types'; function prepareMiddleware() { const tinymcePath = dirname(require.resolve('tinymce')); diff --git a/packages/fields/CHANGELOG.md b/packages/fields/CHANGELOG.md index 0cb009f0a18..e1b3d140800 100644 --- a/packages/fields/CHANGELOG.md +++ b/packages/fields/CHANGELOG.md @@ -1,23 +1,4 @@ -# @keystone/fields - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/access-control@5.0.0 - - @keystone/adapter-knex@5.0.0 - - @keystone/adapter-mongoose@5.0.0 - - @keystone/build-field-types@5.0.0 - - @keystone/field-content@5.0.0 - - @keystone/test-utils@5.0.0 - - @keystone/utils@5.0.0 +# @keystonejs/fields # @keystone-alpha/fields diff --git a/packages/fields/README.md b/packages/fields/README.md index dd402e6c182..c3b3183c88e 100644 --- a/packages/fields/README.md +++ b/packages/fields/README.md @@ -6,7 +6,7 @@ order: 3 # Fields -KeystoneJS contains a set of primitive fields types that can be imported from `@keystone/fields`. These include: +KeystoneJS contains a set of primitive fields types that can be imported from `@keystonejs/fields`. These include: - [CalendarDay](keystone-alpha/fields/src/types/calendar-day) - [Checkbox](keystone-alpha/fields/src/types/checkbox) diff --git a/packages/fields/package.json b/packages/fields/package.json index fe40bf489f2..925468123f5 100644 --- a/packages/fields/package.json +++ b/packages/fields/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/fields", + "name": "@keystonejs/fields", "description": "KeystoneJS Field Types including Text, Password, DateTime, Integer, and more.", - "version": "5.0.0", + "version": "4.0.0", "main": "dist/fields.cjs.js", "module": "dist/fields.esm.js", "author": "The KeystoneJS Development Team", @@ -30,12 +30,12 @@ "@arch-ui/typography": "^0.0.8", "@babel/runtime": "^7.4.3", "@emotion/core": "^10.0.14", - "@keystone/access-control": "^5.0.0", - "@keystone/adapter-knex": "^5.0.0", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/build-field-types": "^5.0.0", - "@keystone/field-content": "^5.0.0", - "@keystone/utils": "^5.0.0", + "@keystonejs/access-control": "^4.0.0", + "@keystonejs/adapter-knex": "^4.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/build-field-types": "^4.0.0", + "@keystonejs/field-content": "^4.0.0", + "@keystonejs/utils": "^4.0.0", "@sindresorhus/slugify": "^0.6.0", "apollo-errors": "^1.9.0", "bcrypt": "^3.0.6", @@ -72,7 +72,7 @@ "unsplash-js": "^5.0.0" }, "devDependencies": { - "@keystone/test-utils": "^5.0.0" + "@keystonejs/test-utils": "^4.0.0" }, "field-types": { "entrypoints": [ diff --git a/packages/fields/src/Implementation.js b/packages/fields/src/Implementation.js index fc515ac80f7..77fe3b2d5ba 100644 --- a/packages/fields/src/Implementation.js +++ b/packages/fields/src/Implementation.js @@ -1,5 +1,5 @@ import inflection from 'inflection'; -import { parseFieldAccess } from '@keystone/access-control'; +import { parseFieldAccess } from '@keystonejs/access-control'; class Field { constructor( diff --git a/packages/fields/src/types/CalendarDay/Implementation.js b/packages/fields/src/types/CalendarDay/Implementation.js index 5aa56eaf53c..e5a8ebf8254 100644 --- a/packages/fields/src/types/CalendarDay/Implementation.js +++ b/packages/fields/src/types/CalendarDay/Implementation.js @@ -1,8 +1,8 @@ import parse from 'date-fns/parse'; import format from 'date-fns/format'; import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class CalendarDay extends Implementation { constructor(path, { format, yearRangeFrom, yearRangeTo, yearPickerType }) { diff --git a/packages/fields/src/types/CalendarDay/filterTests.js b/packages/fields/src/types/CalendarDay/filterTests.js index b1b80c5581d..329aa31b5cc 100644 --- a/packages/fields/src/types/CalendarDay/filterTests.js +++ b/packages/fields/src/types/CalendarDay/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Text from '../Text'; import CalendarDay from './'; diff --git a/packages/fields/src/types/CalendarDay/index.js b/packages/fields/src/types/CalendarDay/index.js index 7b7e26e94f8..badaaac839d 100644 --- a/packages/fields/src/types/CalendarDay/index.js +++ b/packages/fields/src/types/CalendarDay/index.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { CalendarDay, MongoCalendarDayInterface, KnexCalendarDayInterface } from './Implementation'; export default { diff --git a/packages/fields/src/types/Checkbox/Implementation.js b/packages/fields/src/types/Checkbox/Implementation.js index d531f6e706f..e74ff3e2b90 100644 --- a/packages/fields/src/types/Checkbox/Implementation.js +++ b/packages/fields/src/types/Checkbox/Implementation.js @@ -1,6 +1,6 @@ import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class Checkbox extends Implementation { constructor() { diff --git a/packages/fields/src/types/Checkbox/filterTests.js b/packages/fields/src/types/Checkbox/filterTests.js index fe0a1ce43eb..d759d0d060c 100644 --- a/packages/fields/src/types/Checkbox/filterTests.js +++ b/packages/fields/src/types/Checkbox/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Text from '../Text'; import Checkbox from './'; diff --git a/packages/fields/src/types/Checkbox/index.js b/packages/fields/src/types/Checkbox/index.js index 0e39357298b..54747e57e7c 100644 --- a/packages/fields/src/types/Checkbox/index.js +++ b/packages/fields/src/types/Checkbox/index.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Checkbox, MongoCheckboxInterface, KnexCheckboxInterface } from './Implementation'; export default { diff --git a/packages/fields/src/types/CloudinaryImage/ImageBlock.js b/packages/fields/src/types/CloudinaryImage/ImageBlock.js index a60049fb645..371097ef602 100644 --- a/packages/fields/src/types/CloudinaryImage/ImageBlock.js +++ b/packages/fields/src/types/CloudinaryImage/ImageBlock.js @@ -1,8 +1,8 @@ import pluralize from 'pluralize'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; -import { Block } from '@keystone/field-content/Block'; -import { imageContainer, caption } from '@keystone/field-content/blocks'; +import { Block } from '@keystonejs/field-content/Block'; +import { imageContainer, caption } from '@keystonejs/field-content/blocks'; import CloudinaryImage from './'; import SelectType from '../Select'; import RelationshipType from '../Relationship'; diff --git a/packages/fields/src/types/CloudinaryImage/index.js b/packages/fields/src/types/CloudinaryImage/index.js index 6852646278c..07985aac982 100644 --- a/packages/fields/src/types/CloudinaryImage/index.js +++ b/packages/fields/src/types/CloudinaryImage/index.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { CloudinaryImage, diff --git a/packages/fields/src/types/Color/index.js b/packages/fields/src/types/Color/index.js index a4f254814cb..57e87ccc3e9 100644 --- a/packages/fields/src/types/Color/index.js +++ b/packages/fields/src/types/Color/index.js @@ -1,5 +1,5 @@ import { Text, MongoTextInterface, KnexTextInterface } from '../Text/Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Color', diff --git a/packages/fields/src/types/DateTime/Implementation.js b/packages/fields/src/types/DateTime/Implementation.js index 391eb40b666..7a002684a1d 100644 --- a/packages/fields/src/types/DateTime/Implementation.js +++ b/packages/fields/src/types/DateTime/Implementation.js @@ -1,8 +1,8 @@ import { GraphQLScalarType } from 'graphql'; import { Kind } from 'graphql/language'; import { DateTime, FixedOffsetZone } from 'luxon'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; import { Implementation } from '../../Implementation'; class _DateTime extends Implementation { diff --git a/packages/fields/src/types/DateTime/README.md b/packages/fields/src/types/DateTime/README.md index 10f4008a915..30851e1c026 100644 --- a/packages/fields/src/types/DateTime/README.md +++ b/packages/fields/src/types/DateTime/README.md @@ -9,7 +9,7 @@ title: DateTime ## Usage ```js -const { DateTime } = require('@keystone/fields'); +const { DateTime } = require('@keystonejs/fields'); keystone.createList('User', { fields: { diff --git a/packages/fields/src/types/DateTime/filterTests.js b/packages/fields/src/types/DateTime/filterTests.js index f24738739ec..be21146c5d1 100644 --- a/packages/fields/src/types/DateTime/filterTests.js +++ b/packages/fields/src/types/DateTime/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Text from '../Text'; import DateTime from './'; diff --git a/packages/fields/src/types/DateTime/index.js b/packages/fields/src/types/DateTime/index.js index 33b01b19060..eb90bf4a80c 100644 --- a/packages/fields/src/types/DateTime/index.js +++ b/packages/fields/src/types/DateTime/index.js @@ -1,5 +1,5 @@ import { DateTime, MongoDateTimeInterface, KnexDateTimeInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'DateTime', diff --git a/packages/fields/src/types/Decimal/Implementation.js b/packages/fields/src/types/Decimal/Implementation.js index b7b1cdb675c..fa986c2ec50 100644 --- a/packages/fields/src/types/Decimal/Implementation.js +++ b/packages/fields/src/types/Decimal/Implementation.js @@ -1,7 +1,7 @@ import mongoose from 'mongoose'; import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class Decimal extends Implementation { constructor(path, { symbol }) { diff --git a/packages/fields/src/types/Decimal/filterTests.js b/packages/fields/src/types/Decimal/filterTests.js index 4e11a2a8da4..486a86e9c2f 100644 --- a/packages/fields/src/types/Decimal/filterTests.js +++ b/packages/fields/src/types/Decimal/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Text from '../Text'; import Decimal from './'; diff --git a/packages/fields/src/types/Decimal/index.js b/packages/fields/src/types/Decimal/index.js index 306f02c3442..31e3c4ee3af 100644 --- a/packages/fields/src/types/Decimal/index.js +++ b/packages/fields/src/types/Decimal/index.js @@ -1,5 +1,5 @@ import { Decimal, MongoDecimalInterface, KnexDecimalInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Decimal', diff --git a/packages/fields/src/types/File/Implementation.js b/packages/fields/src/types/File/Implementation.js index b628f340914..e6693e17169 100644 --- a/packages/fields/src/types/File/Implementation.js +++ b/packages/fields/src/types/File/Implementation.js @@ -1,6 +1,6 @@ import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; import mongoose from 'mongoose'; // Disabling the getter of mongoose >= 5.1.0 diff --git a/packages/fields/src/types/File/index.js b/packages/fields/src/types/File/index.js index f3c00518b6d..3a467bb5efe 100644 --- a/packages/fields/src/types/File/index.js +++ b/packages/fields/src/types/File/index.js @@ -1,5 +1,5 @@ import { File, MongoFileInterface, KnexFileInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'File', diff --git a/packages/fields/src/types/Float/Implementation.js b/packages/fields/src/types/Float/Implementation.js index 5bd15b16e60..bc5f3766771 100644 --- a/packages/fields/src/types/Float/Implementation.js +++ b/packages/fields/src/types/Float/Implementation.js @@ -1,6 +1,6 @@ import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class Float extends Implementation { constructor() { diff --git a/packages/fields/src/types/Float/filterTests.js b/packages/fields/src/types/Float/filterTests.js index 91d5ef907eb..d2676b63b1a 100644 --- a/packages/fields/src/types/Float/filterTests.js +++ b/packages/fields/src/types/Float/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Text from '../Text'; import Float from '.'; diff --git a/packages/fields/src/types/Float/index.js b/packages/fields/src/types/Float/index.js index 74c029c0a28..debcf2355a0 100644 --- a/packages/fields/src/types/Float/index.js +++ b/packages/fields/src/types/Float/index.js @@ -1,5 +1,5 @@ import { Float, MongoFloatInterface, KnexFloatInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Float', diff --git a/packages/fields/src/types/Integer/Implementation.js b/packages/fields/src/types/Integer/Implementation.js index 133c5a10125..0b9e0e078f2 100644 --- a/packages/fields/src/types/Integer/Implementation.js +++ b/packages/fields/src/types/Integer/Implementation.js @@ -1,6 +1,6 @@ import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class Integer extends Implementation { constructor() { diff --git a/packages/fields/src/types/Integer/filterTests.js b/packages/fields/src/types/Integer/filterTests.js index 3ec0f40af06..41529f0647a 100644 --- a/packages/fields/src/types/Integer/filterTests.js +++ b/packages/fields/src/types/Integer/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Text from '../Text'; import Integer from './'; diff --git a/packages/fields/src/types/Integer/index.js b/packages/fields/src/types/Integer/index.js index ef3ac217371..cb20c57adb1 100644 --- a/packages/fields/src/types/Integer/index.js +++ b/packages/fields/src/types/Integer/index.js @@ -1,5 +1,5 @@ import { Integer, MongoIntegerInterface, KnexIntegerInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Integer', diff --git a/packages/fields/src/types/Location/Implementation.js b/packages/fields/src/types/Location/Implementation.js index fa84d76231a..f5a4a92ed69 100644 --- a/packages/fields/src/types/Location/Implementation.js +++ b/packages/fields/src/types/Location/Implementation.js @@ -1,6 +1,6 @@ import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; import mongoose from 'mongoose'; import fetch from 'node-fetch'; diff --git a/packages/fields/src/types/Location/README.md b/packages/fields/src/types/Location/README.md index 809134ba9eb..829664e31f2 100644 --- a/packages/fields/src/types/Location/README.md +++ b/packages/fields/src/types/Location/README.md @@ -11,8 +11,8 @@ The Location Field Type enables storing data from the Google Maps API. ## Usage ```javascript -const { Location } = require('@keystone/fields'); -const { Keystone } = require('@keystone/keystone'); +const { Location } = require('@keystonejs/fields'); +const { Keystone } = require('@keystonejs/keystone'); const keystone = new Keystone(/* ... */); diff --git a/packages/fields/src/types/Location/index.js b/packages/fields/src/types/Location/index.js index 88b07bb5044..8ea973c94cd 100644 --- a/packages/fields/src/types/Location/index.js +++ b/packages/fields/src/types/Location/index.js @@ -1,5 +1,5 @@ import { Location, MongoLocationInterface, KnexLocationInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Location', diff --git a/packages/fields/src/types/OEmbed/Implementation.js b/packages/fields/src/types/OEmbed/Implementation.js index 90f140869d0..56a7c19f38e 100644 --- a/packages/fields/src/types/OEmbed/Implementation.js +++ b/packages/fields/src/types/OEmbed/Implementation.js @@ -1,6 +1,6 @@ import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class OEmbed extends Implementation { constructor(path, { adapter, parameters = {} }, { listKey }) { diff --git a/packages/fields/src/types/OEmbed/OEmbedBlock.js b/packages/fields/src/types/OEmbed/OEmbedBlock.js index eb4d6051484..70a7c9950aa 100644 --- a/packages/fields/src/types/OEmbed/OEmbedBlock.js +++ b/packages/fields/src/types/OEmbed/OEmbedBlock.js @@ -1,7 +1,7 @@ import pluralize from 'pluralize'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; -import { Block } from '@keystone/field-content/Block'; +import { Block } from '@keystonejs/field-content/Block'; import OEmbed from './'; import RelationshipType from '../Relationship'; import queryFragment from './query-fragment.js'; diff --git a/packages/fields/src/types/OEmbed/README.md b/packages/fields/src/types/OEmbed/README.md index 4c929d088c0..08ee45399dc 100644 --- a/packages/fields/src/types/OEmbed/README.md +++ b/packages/fields/src/types/OEmbed/README.md @@ -16,9 +16,9 @@ title: OEmbed ## Usage ```js -const { Keystone } = require('@keystone/keystone'); -const { OEmbed } = require('@keystone/fields'); -const { IframelyOEmbedAdapter } = require('@keystone/oembed-adapters'); +const { Keystone } = require('@keystonejs/keystone'); +const { OEmbed } = require('@keystonejs/fields'); +const { IframelyOEmbedAdapter } = require('@keystonejs/oembed-adapters'); const keystone = new Keystone(/* ... */); diff --git a/packages/fields/src/types/OEmbed/index.js b/packages/fields/src/types/OEmbed/index.js index d007b8f7a9b..d931ffe01f0 100644 --- a/packages/fields/src/types/OEmbed/index.js +++ b/packages/fields/src/types/OEmbed/index.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { OEmbed, MongoOEmbedInterface, KnexOEmbedInterface } from './Implementation'; import { OEmbedBlock } from './OEmbedBlock'; diff --git a/packages/fields/src/types/Password/Implementation.js b/packages/fields/src/types/Password/Implementation.js index 77a68f8364f..6e136f90c24 100644 --- a/packages/fields/src/types/Password/Implementation.js +++ b/packages/fields/src/types/Password/Implementation.js @@ -1,6 +1,6 @@ import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; import bcrypt from 'bcrypt'; import dumbPasswords from 'dumb-passwords'; diff --git a/packages/fields/src/types/Password/filterTests.js b/packages/fields/src/types/Password/filterTests.js index 6d8e067bbcc..d21f746e43e 100644 --- a/packages/fields/src/types/Password/filterTests.js +++ b/packages/fields/src/types/Password/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Password from './'; import Text from '../Text'; diff --git a/packages/fields/src/types/Password/index.js b/packages/fields/src/types/Password/index.js index 9e30c5a2798..ac901ae4c5c 100644 --- a/packages/fields/src/types/Password/index.js +++ b/packages/fields/src/types/Password/index.js @@ -1,5 +1,5 @@ import { Password, MongoPasswordInterface, KnexPasswordInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Password', diff --git a/packages/fields/src/types/Relationship/Implementation.js b/packages/fields/src/types/Relationship/Implementation.js index ae969dcc9db..d1a5a4478f9 100644 --- a/packages/fields/src/types/Relationship/Implementation.js +++ b/packages/fields/src/types/Relationship/Implementation.js @@ -1,6 +1,6 @@ import mongoose from 'mongoose'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; const { Schema: { diff --git a/packages/fields/src/types/Relationship/index.js b/packages/fields/src/types/Relationship/index.js index c8cff8dd805..a0ccca9596f 100644 --- a/packages/fields/src/types/Relationship/index.js +++ b/packages/fields/src/types/Relationship/index.js @@ -4,7 +4,7 @@ import { KnexRelationshipInterface, } from './Implementation'; import { resolveBacklinks } from './backlinks'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Relationship', diff --git a/packages/fields/src/types/Relationship/nested-mutations.js b/packages/fields/src/types/Relationship/nested-mutations.js index be31772aab5..f3c224a5eed 100644 --- a/packages/fields/src/types/Relationship/nested-mutations.js +++ b/packages/fields/src/types/Relationship/nested-mutations.js @@ -1,6 +1,6 @@ import groupBy from 'lodash.groupby'; import pSettle from 'p-settle'; -import { intersection, pick } from '@keystone/utils'; +import { intersection, pick } from '@keystonejs/utils'; import { ParameterError } from './graphqlErrors'; const NESTED_MUTATIONS = ['create', 'connect', 'disconnect', 'disconnectAll']; diff --git a/packages/fields/src/types/Relationship/tests/implementation.test.js b/packages/fields/src/types/Relationship/tests/implementation.test.js index 303ae44aa1a..8b81b39e503 100644 --- a/packages/fields/src/types/Relationship/tests/implementation.test.js +++ b/packages/fields/src/types/Relationship/tests/implementation.test.js @@ -43,7 +43,7 @@ class MockList { }, }; } - // The actual implementation in `@keystone/keystone/List/index.js` returns + // The actual implementation in `@keystonejs/keystone/List/index.js` returns // more, but we only want to test that this codepath is called getGraphqlFilterFragment = () => mockFilterFragment; } diff --git a/packages/fields/src/types/Relationship/views/CreateItemModal.js b/packages/fields/src/types/Relationship/views/CreateItemModal.js index 14b2c5eb8f5..41c2e8ce33f 100644 --- a/packages/fields/src/types/Relationship/views/CreateItemModal.js +++ b/packages/fields/src/types/Relationship/views/CreateItemModal.js @@ -5,7 +5,7 @@ import { Mutation } from 'react-apollo'; import { Button, LoadingButton } from '@arch-ui/button'; import Drawer from '@arch-ui/drawer'; -import { arrayToObject, captureSuspensePromises, countArrays } from '@keystone/utils'; +import { arrayToObject, captureSuspensePromises, countArrays } from '@keystonejs/utils'; import { gridSize } from '@arch-ui/theme'; import { AutocompleteCaptor } from '@arch-ui/input'; import { LoadingIndicator } from '@arch-ui/loading'; diff --git a/packages/fields/src/types/Select/Implementation.js b/packages/fields/src/types/Select/Implementation.js index 23024d1bba1..8bc4c2eef1f 100644 --- a/packages/fields/src/types/Select/Implementation.js +++ b/packages/fields/src/types/Select/Implementation.js @@ -1,7 +1,7 @@ import inflection from 'inflection'; import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; function initOptions(options) { let optionsArray = options; diff --git a/packages/fields/src/types/Select/filterTests.js b/packages/fields/src/types/Select/filterTests.js index 155610c1850..b1e60ae8959 100644 --- a/packages/fields/src/types/Select/filterTests.js +++ b/packages/fields/src/types/Select/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Select from './'; import Text from '../Text'; diff --git a/packages/fields/src/types/Select/index.js b/packages/fields/src/types/Select/index.js index 4f8fe441c53..fd926fbc579 100644 --- a/packages/fields/src/types/Select/index.js +++ b/packages/fields/src/types/Select/index.js @@ -1,5 +1,5 @@ import { Select, MongoSelectInterface, KnexSelectInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Select', diff --git a/packages/fields/src/types/Slug/Implementation.test.js b/packages/fields/src/types/Slug/Implementation.test.js index 394151ef95e..a69d10e5a83 100644 --- a/packages/fields/src/types/Slug/Implementation.test.js +++ b/packages/fields/src/types/Slug/Implementation.test.js @@ -1,4 +1,4 @@ -import { multiAdapterRunners, setupServer, graphqlRequest } from '@keystone/test-utils'; +import { multiAdapterRunners, setupServer, graphqlRequest } from '@keystonejs/test-utils'; import cuid from 'cuid'; import Text from '../Text'; diff --git a/packages/fields/src/types/Slug/README.md b/packages/fields/src/types/Slug/README.md index 772c834ad93..21984378efb 100644 --- a/packages/fields/src/types/Slug/README.md +++ b/packages/fields/src/types/Slug/README.md @@ -23,8 +23,8 @@ As we have specified a `title` field, its value will be used to generate a unique slug. ```javascript -const { Slug, Text } = require('@keystone/fields'); -const { Keystone } = require('@keystone/keystone'); +const { Slug, Text } = require('@keystonejs/fields'); +const { Keystone } = require('@keystonejs/keystone'); const keystone = new Keystone(/* ... */); @@ -41,8 +41,8 @@ keystone.createList('Post', { The item's `username` value will be used to generate a unique slug. ```javascript -const { Slug, Text } = require('@keystone/fields'); -const { Keystone } = require('@keystone/keystone'); +const { Slug, Text } = require('@keystonejs/fields'); +const { Keystone } = require('@keystonejs/keystone'); const keystone = new Keystone(/* ... */); @@ -60,8 +60,8 @@ keystone.createList('User', { ### A custom `generate` method ```javascript -const { Slug, Text, DateTime } = require('@keystone/fields'); -const { Keystone } = require('@keystone/keystone'); +const { Slug, Text, DateTime } = require('@keystonejs/fields'); +const { Keystone } = require('@keystonejs/keystone'); const slugify = require('slugify'); const keystone = new Keystone(/* ... */); diff --git a/packages/fields/src/types/Slug/index.js b/packages/fields/src/types/Slug/index.js index 092415ad2cd..be7f10eb1b2 100644 --- a/packages/fields/src/types/Slug/index.js +++ b/packages/fields/src/types/Slug/index.js @@ -1,5 +1,5 @@ import { SlugImplementation, MongoSlugInterface, KnexSlugInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; const Slug = { type: 'Slug', diff --git a/packages/fields/src/types/Text/Implementation.js b/packages/fields/src/types/Text/Implementation.js index 3c5bda16436..7e8c7ea82f1 100644 --- a/packages/fields/src/types/Text/Implementation.js +++ b/packages/fields/src/types/Text/Implementation.js @@ -1,6 +1,6 @@ import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class Text extends Implementation { constructor(path, { isMultiline }) { diff --git a/packages/fields/src/types/Text/filterTests.js b/packages/fields/src/types/Text/filterTests.js index 65988713d00..360194fd536 100644 --- a/packages/fields/src/types/Text/filterTests.js +++ b/packages/fields/src/types/Text/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Text from './'; const fieldType = 'Text'; diff --git a/packages/fields/src/types/Text/index.js b/packages/fields/src/types/Text/index.js index 97d0b6fabae..109795a6b4a 100644 --- a/packages/fields/src/types/Text/index.js +++ b/packages/fields/src/types/Text/index.js @@ -1,5 +1,5 @@ import { Text, MongoTextInterface, KnexTextInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Text', diff --git a/packages/fields/src/types/Unsplash/Implementation.js b/packages/fields/src/types/Unsplash/Implementation.js index 6dd5773fc97..4c97cd16fb5 100644 --- a/packages/fields/src/types/Unsplash/Implementation.js +++ b/packages/fields/src/types/Unsplash/Implementation.js @@ -1,5 +1,5 @@ -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; import UnsplashAPI, { toJson } from 'unsplash-js'; import queryString from 'query-string'; diff --git a/packages/fields/src/types/Unsplash/README.md b/packages/fields/src/types/Unsplash/README.md index 37118283abf..86c60aaccc1 100644 --- a/packages/fields/src/types/Unsplash/README.md +++ b/packages/fields/src/types/Unsplash/README.md @@ -17,8 +17,8 @@ generating URLs to dynamically transformed images. ## Usage ```javascript -const { Keystone } = require('@keystone/keystone'); -const { Unsplash } = require('@keystone/fields'); +const { Keystone } = require('@keystonejs/keystone'); +const { Unsplash } = require('@keystonejs/fields'); const keystone = new Keystone(/* ... */); diff --git a/packages/fields/src/types/Unsplash/UnsplashBlock.js b/packages/fields/src/types/Unsplash/UnsplashBlock.js index e4496e7001a..cde7cce576a 100644 --- a/packages/fields/src/types/Unsplash/UnsplashBlock.js +++ b/packages/fields/src/types/Unsplash/UnsplashBlock.js @@ -1,7 +1,7 @@ import pluralize from 'pluralize'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; -import { Block } from '@keystone/field-content/Block'; +import { Block } from '@keystonejs/field-content/Block'; import Unsplash from './'; import RelationshipType from '../Relationship'; diff --git a/packages/fields/src/types/Unsplash/index.js b/packages/fields/src/types/Unsplash/index.js index b1cd29baaa9..d1bded212c8 100644 --- a/packages/fields/src/types/Unsplash/index.js +++ b/packages/fields/src/types/Unsplash/index.js @@ -1,4 +1,4 @@ -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; import { Unsplash, MongoUnsplashInterface, KnexUnsplashInterface } from './Implementation'; import { UnsplashBlock } from './UnsplashBlock'; diff --git a/packages/fields/src/types/Url/index.js b/packages/fields/src/types/Url/index.js index d76efde45bf..541f50ac096 100644 --- a/packages/fields/src/types/Url/index.js +++ b/packages/fields/src/types/Url/index.js @@ -1,5 +1,5 @@ import { Text, MongoTextInterface, KnexTextInterface } from '../Text/Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; export default { type: 'Url', diff --git a/packages/fields/src/types/Uuid/Implementation.js b/packages/fields/src/types/Uuid/Implementation.js index 83dbef5ed91..0319d3512e9 100644 --- a/packages/fields/src/types/Uuid/Implementation.js +++ b/packages/fields/src/types/Uuid/Implementation.js @@ -1,6 +1,6 @@ import { Implementation } from '../../Implementation'; -import { MongooseFieldAdapter } from '@keystone/adapter-mongoose'; -import { KnexFieldAdapter } from '@keystone/adapter-knex'; +import { MongooseFieldAdapter } from '@keystonejs/adapter-mongoose'; +import { KnexFieldAdapter } from '@keystonejs/adapter-knex'; export class UuidImplementation extends Implementation { constructor(path, { caseTo = 'lower' }) { diff --git a/packages/fields/src/types/Uuid/filterTests.js b/packages/fields/src/types/Uuid/filterTests.js index e708c42bfc8..1c4215822d9 100644 --- a/packages/fields/src/types/Uuid/filterTests.js +++ b/packages/fields/src/types/Uuid/filterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Text from '../Text'; import Uuid from './'; diff --git a/packages/fields/src/types/Uuid/index.js b/packages/fields/src/types/Uuid/index.js index 736b92074a8..aeec1ad170f 100644 --- a/packages/fields/src/types/Uuid/index.js +++ b/packages/fields/src/types/Uuid/index.js @@ -1,5 +1,5 @@ import { UuidImplementation, MongoUuidInterface, KnexUuidInterface } from './Implementation'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; const Uuid = { type: 'Uuid', @@ -25,14 +25,14 @@ const Uuid = { } throw `The Uuid field type doesn't provide a default primary key field configuration for the ` + `'${client}' knex client. You'll need to supply your own 'id' field for each list or use a ` + - `different field type for your ids (eg '@keystone/fields-auto-increment').`; + `different field type for your ids (eg '@keystonejs/fields-auto-increment').`; }, }, mongoose: { getConfig: () => { throw `The Uuid field type doesn't provide a default primary key field configuration for mongoose. ` + `You'll need to supply your own 'id' field for each list or use a different field type for your ` + - `ids (eg '@keystone/fields-mongoid').`; + `ids (eg '@keystonejs/fields-mongoid').`; }, }, }, diff --git a/packages/fields/tests/idFilterTests.js b/packages/fields/tests/idFilterTests.js index 27b7604e6f1..692f5144149 100644 --- a/packages/fields/tests/idFilterTests.js +++ b/packages/fields/tests/idFilterTests.js @@ -1,4 +1,4 @@ -import { matchFilter } from '@keystone/test-utils'; +import { matchFilter } from '@keystonejs/test-utils'; import Text from '../src/types/Text'; export const name = 'ID'; diff --git a/packages/file-adapters/CHANGELOG.md b/packages/file-adapters/CHANGELOG.md index 050c89e2301..d2aa0370ad8 100644 --- a/packages/file-adapters/CHANGELOG.md +++ b/packages/file-adapters/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/file-adapters - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/file-adapters # @keystone-alpha/file-adapters diff --git a/packages/file-adapters/package.json b/packages/file-adapters/package.json index ef67b40e6eb..720384e9de1 100644 --- a/packages/file-adapters/package.json +++ b/packages/file-adapters/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/file-adapters", + "name": "@keystonejs/file-adapters", "description": "Adapters for handling storage of the File type", - "version": "5.0.0", + "version": "4.0.0", "main": "index.js", "repository": "https://github.com/keystonejs/keystone-5.git", "author": "The Keystone Development Team", diff --git a/packages/keystone/CHANGELOG.md b/packages/keystone/CHANGELOG.md index 0172e621512..9556e64e02b 100644 --- a/packages/keystone/CHANGELOG.md +++ b/packages/keystone/CHANGELOG.md @@ -1,23 +1,4 @@ -# @keystone/keystone - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/access-control@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/build-field-types@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/logger@5.0.0 - - @keystone/session@5.0.0 - - @keystone/utils@5.0.0 +# @keystonejs/keystone # @keystone-alpha/keystone @@ -952,7 +933,7 @@ - [patch] Remove tests and markdown from npm [dc3ee7d](dc3ee7d) -# @keystone/core +# @keystonejs/core # @keystone-alpha/core diff --git a/packages/keystone/README.md b/packages/keystone/README.md index 1ab26a091b4..1b44d20b200 100644 --- a/packages/keystone/README.md +++ b/packages/keystone/README.md @@ -11,7 +11,7 @@ order: 1 ### Usage ```javascript -const { Keystone } = require('@keystone/keystone'); +const { Keystone } = require('@keystonejs/keystone'); const keystone = new Keystone({ /*...config */ diff --git a/packages/keystone/lib/Keystone/index.js b/packages/keystone/lib/Keystone/index.js index 70b1264a2cb..dcc60e17277 100644 --- a/packages/keystone/lib/Keystone/index.js +++ b/packages/keystone/lib/Keystone/index.js @@ -16,19 +16,19 @@ const { unique, filterValues, compose, -} = require('@keystone/utils'); +} = require('@keystonejs/utils'); const { validateFieldAccessControl, validateListAccessControl, validateCustomAccessControl, parseCustomAccess, -} = require('@keystone/access-control'); +} = require('@keystonejs/access-control'); const { startAuthedSession, endAuthedSession, commonSessionMiddleware, -} = require('@keystone/session'); -const { logger } = require('@keystone/logger'); +} = require('@keystonejs/session'); +const { logger } = require('@keystonejs/logger'); const { unmergeRelationships, @@ -233,7 +233,7 @@ module.exports = class Keystone { if (!graphQLQuery) { return Promise.reject( new Error( - `No executable schema named '${passThroughContext.schemaName}' is available. Have you setup '@keystone/app-graphql'?` + `No executable schema named '${passThroughContext.schemaName}' is available. Have you setup '@keystonejs/app-graphql'?` ) ); } diff --git a/packages/keystone/lib/Keystone/relationship-utils.js b/packages/keystone/lib/Keystone/relationship-utils.js index 76f3f0ce520..3b1bc8c862d 100644 --- a/packages/keystone/lib/Keystone/relationship-utils.js +++ b/packages/keystone/lib/Keystone/relationship-utils.js @@ -1,4 +1,4 @@ -const { resolveAllKeys, mapKeys } = require('@keystone/utils'); +const { resolveAllKeys, mapKeys } = require('@keystonejs/utils'); function isRelationshipField({ list, fieldKey }) { return !!list._fields[fieldKey].type.isRelationship; diff --git a/packages/keystone/lib/List/index.js b/packages/keystone/lib/List/index.js index 4318814fe1e..ecfb3186cfc 100644 --- a/packages/keystone/lib/List/index.js +++ b/packages/keystone/lib/List/index.js @@ -12,9 +12,9 @@ const { flatten, zipObj, createLazyDeferred, -} = require('@keystone/utils'); -const { parseListAccess } = require('@keystone/access-control'); -const { logger } = require('@keystone/logger'); +} = require('@keystonejs/utils'); +const { parseListAccess } = require('@keystonejs/access-control'); +const { logger } = require('@keystonejs/logger'); const graphqlLogger = logger('graphql'); const keystoneLogger = logger('keystone'); @@ -62,7 +62,7 @@ const opToType = { const getAuthMutationName = (prefix, authType) => `${prefix}With${upcase(authType)}`; const mapNativeTypeToKeystoneType = (type, listKey, fieldPath) => { - const { Text, Checkbox, Float } = require('@keystone/fields'); + const { Text, Checkbox, Float } = require('@keystonejs/fields'); const nativeTypeMap = new Map([ [ @@ -96,7 +96,7 @@ const mapNativeTypeToKeystoneType = (type, listKey, fieldPath) => { keystoneLogger.warn( { nativeType: type, keystoneType, listKey, fieldPath }, - `Mapped field ${listKey}.${fieldPath} from native JavaScript type '${name}', to '${keystoneType.type.type}' from the @keystone/fields package.` + `Mapped field ${listKey}.${fieldPath} from native JavaScript type '${name}', to '${keystoneType.type.type}' from the @keystonejs/fields package.` ); return keystoneType; @@ -1403,7 +1403,7 @@ module.exports = class List { } async _nestedMutation(mutationState, context, mutation) { - const { Relationship } = require('@keystone/fields'); + const { Relationship } = require('@keystonejs/fields'); // Set up a fresh mutation state if we're the root mutation const isRootMutation = !mutationState; if (isRootMutation) { diff --git a/packages/keystone/package.json b/packages/keystone/package.json index fc965aa4bbd..a8bb9814de9 100644 --- a/packages/keystone/package.json +++ b/packages/keystone/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/keystone", - "description": "The main @keystone class & CLI. This is where the magic happens.", - "version": "5.0.0", + "name": "@keystonejs/keystone", + "description": "The main @keystonejs class & CLI. This is where the magic happens.", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -11,13 +11,13 @@ "keystone": "bin/cli.js" }, "dependencies": { - "@keystone/access-control": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/build-field-types": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/logger": "^5.0.0", - "@keystone/session": "^5.0.0", - "@keystone/utils": "^5.0.0", + "@keystonejs/access-control": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/build-field-types": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/logger": "^4.0.0", + "@keystonejs/session": "^4.0.0", + "@keystonejs/utils": "^4.0.0", "apollo-errors": "^1.9.0", "arg": "^4.1.1", "chalk": "^2.4.2", diff --git a/packages/keystone/tests/Keystone.test.js b/packages/keystone/tests/Keystone.test.js index ba3737aafa9..2a2b251dc36 100644 --- a/packages/keystone/tests/Keystone.test.js +++ b/packages/keystone/tests/Keystone.test.js @@ -1,7 +1,7 @@ const isPromise = require('p-is-promise'); const Keystone = require('../lib/Keystone'); const List = require('../lib/List'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); class MockFieldAdapter {} diff --git a/packages/keystone/tests/List.test.js b/packages/keystone/tests/List.test.js index 70408ca9983..fa4a4ee221f 100644 --- a/packages/keystone/tests/List.test.js +++ b/packages/keystone/tests/List.test.js @@ -2,17 +2,17 @@ const gql = require('graphql-tag'); const { print } = require('graphql/language/printer'); // We don't want to actually log, so we mock it before we require the class -jest.doMock('@keystone/logger', () => ({ +jest.doMock('@keystonejs/logger', () => ({ logger: jest.fn(() => ({ warn: () => {}, log: () => {}, debug: () => {}, info: () => {} })), })); const List = require('../lib/List'); const { AccessDeniedError } = require('../lib/List/graphqlErrors'); -const { Text, Checkbox, Float, Relationship, Integer } = require('@keystone/fields'); -const { getType } = require('@keystone/utils'); +const { Text, Checkbox, Float, Relationship, Integer } = require('@keystonejs/fields'); +const { getType } = require('@keystonejs/utils'); const path = require('path'); -let fieldsPackagePath = path.dirname(require.resolve('@keystone/fields/package.json')); +let fieldsPackagePath = path.dirname(require.resolve('@keystonejs/fields/package.json')); function resolveViewPath(viewPath) { return path.join(fieldsPackagePath, 'src', 'types', viewPath); } diff --git a/packages/keystone/tests/relationship-utils.test.js b/packages/keystone/tests/relationship-utils.test.js index bace02376af..df066acd46f 100644 --- a/packages/keystone/tests/relationship-utils.test.js +++ b/packages/keystone/tests/relationship-utils.test.js @@ -3,7 +3,7 @@ const { unmergeRelationships, createRelationships, } = require('../lib/Keystone/relationship-utils'); -const { Text, Relationship } = require('@keystone/fields'); +const { Text, Relationship } = require('@keystonejs/fields'); describe('mergeRelationships', () => { test('merges relationships', () => { diff --git a/packages/list-plugins/CHANGELOG.md b/packages/list-plugins/CHANGELOG.md index 3a3d7b1bf7a..642fb61a05e 100644 --- a/packages/list-plugins/CHANGELOG.md +++ b/packages/list-plugins/CHANGELOG.md @@ -1,17 +1,4 @@ -# @keystone/list-plugins - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/fields@5.0.0 +# @keystonejs/list-plugins # @keystone-alpha/list-plugins diff --git a/packages/list-plugins/README.md b/packages/list-plugins/README.md index 8bdf01ce430..99d9a447319 100644 --- a/packages/list-plugins/README.md +++ b/packages/list-plugins/README.md @@ -7,7 +7,7 @@ Adds `createdAt` and `updatedAt` fields to a list. These fields are read-only by ## Usage ```js -const { atTracking } = require('@keystone/list-plugins'); +const { atTracking } = require('@keystonejs/list-plugins'); keystone.createList('ListWithPlugin', { fields: { @@ -47,7 +47,7 @@ By default access control on at tracking fields is read only: You can import _either_ `createdAt` or `updatedAt` to apply a single tracking field: ```javascript -const { createdAt, updatedAt } = require('@keystone/list-plugins'); +const { createdAt, updatedAt } = require('@keystonejs/list-plugins'); ``` _Note_: The API is the same. @@ -59,7 +59,7 @@ Adds `createdBy` and `updatedBy` fields to a list. These fields are read-only by ## Usage ```js -const { byTracking } = require('@keystone/list-plugins'); +const { byTracking } = require('@keystonejs/list-plugins'); keystone.createList('ListWithPlugin', { fields: { @@ -99,7 +99,7 @@ By default access control on at tracking fields is read only: You can import _either_ `createdBy` or `updatedBy` to apply a single tracking field: ```javascript -const { createdBy, updatedBy } = require('@keystone/list-plugins'); +const { createdBy, updatedBy } = require('@keystonejs/list-plugins'); ``` _Note_: The API is the same. diff --git a/packages/list-plugins/atTracking.md b/packages/list-plugins/atTracking.md index 3cd03391112..5a1c962bda6 100644 --- a/packages/list-plugins/atTracking.md +++ b/packages/list-plugins/atTracking.md @@ -10,7 +10,7 @@ Adds `createdAt` and `updatedAt` fields to a list. These fields are read-only by ## Usage ```js -const { atTracking } = require('@keystone/list-plugins'); +const { atTracking } = require('@keystonejs/list-plugins'); keystone.createList('ListWithPlugin', { fields: { @@ -50,7 +50,7 @@ By default access control on at tracking fields is read only: You can import _either_ `createdAt` or `updatedAt` to apply a single tracking field: ```javascript -const { createdAt, updatedAt } = require('@keystone/list-plugins'); +const { createdAt, updatedAt } = require('@keystonejs/list-plugins'); ``` _Note_: The API is the same. diff --git a/packages/list-plugins/byTracking.md b/packages/list-plugins/byTracking.md index eec412be268..039aa7cd696 100644 --- a/packages/list-plugins/byTracking.md +++ b/packages/list-plugins/byTracking.md @@ -10,7 +10,7 @@ Adds `createdBy` and `updatedBy` fields to a list. These fields are read-only by ## Usage ```js -const { byTracking } = require('@keystone/list-plugins'); +const { byTracking } = require('@keystonejs/list-plugins'); keystone.createList('ListWithPlugin', { fields: { @@ -50,7 +50,7 @@ By default access control on at tracking fields is read only: You can import _either_ `createdBy` or `updatedBy` to apply a single tracking field: ```javascript -const { createdBy, updatedBy } = require('@keystone/list-plugins'); +const { createdBy, updatedBy } = require('@keystonejs/list-plugins'); ``` _Note_: The API is the same. diff --git a/packages/list-plugins/lib/tracking/atTracking.js b/packages/list-plugins/lib/tracking/atTracking.js index 80bdfcdfb19..e4c001bfb22 100644 --- a/packages/list-plugins/lib/tracking/atTracking.js +++ b/packages/list-plugins/lib/tracking/atTracking.js @@ -1,4 +1,4 @@ -const { DateTime } = require('@keystone/fields'); +const { DateTime } = require('@keystonejs/fields'); const { composeResolveInput } = require('../utils'); const _atTracking = ({ created = true, updated = true }) => ({ diff --git a/packages/list-plugins/lib/tracking/byTracking.js b/packages/list-plugins/lib/tracking/byTracking.js index 0442570754a..ad3393b5e97 100644 --- a/packages/list-plugins/lib/tracking/byTracking.js +++ b/packages/list-plugins/lib/tracking/byTracking.js @@ -1,4 +1,4 @@ -const { Relationship } = require('@keystone/fields'); +const { Relationship } = require('@keystonejs/fields'); const { composeResolveInput } = require('../utils'); const _byTracking = ({ created = true, updated = true }) => ({ diff --git a/packages/list-plugins/package.json b/packages/list-plugins/package.json index 013892f2f8d..25a85e6098c 100644 --- a/packages/list-plugins/package.json +++ b/packages/list-plugins/package.json @@ -1,13 +1,13 @@ { - "name": "@keystone/list-plugins", + "name": "@keystonejs/list-plugins", "description": "List level plugins which can update list config during list initialization including adding additional fields", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "dependencies": { - "@keystone/fields": "^5.0.0" + "@keystonejs/fields": "^4.0.0" } } diff --git a/packages/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md index c109a508c02..0f82ae79054 100644 --- a/packages/logger/CHANGELOG.md +++ b/packages/logger/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/logger - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/logger # @keystone-alpha/logger diff --git a/packages/logger/README.md b/packages/logger/README.md index 031a0f41cae..304a65a2634 100644 --- a/packages/logger/README.md +++ b/packages/logger/README.md @@ -8,7 +8,7 @@ title: Logger ## API -### `require('@keystone/logger').logger(name)` +### `require('@keystonejs/logger').logger(name)` Provides an instance of [`pino`](https://github.com/pinojs/pino) based on the given `name`. diff --git a/packages/logger/package.json b/packages/logger/package.json index 75fa5e6560f..5f2fb3ca826 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/logger", - "description": "Common logging functionality used within @keystone/* packages.", - "version": "5.0.0", + "name": "@keystonejs/logger", + "description": "Common logging functionality used within @keystonejs/* packages.", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { diff --git a/packages/mongo-join-builder/CHANGELOG.md b/packages/mongo-join-builder/CHANGELOG.md index b226ee60701..d0cddb1163f 100644 --- a/packages/mongo-join-builder/CHANGELOG.md +++ b/packages/mongo-join-builder/CHANGELOG.md @@ -1,17 +1,4 @@ -# @keystone/mongo-join-builder - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/utils@5.0.0 +# @keystonejs/mongo-join-builder # @keystone-alpha/mongo-join-builder diff --git a/packages/mongo-join-builder/README.md b/packages/mongo-join-builder/README.md index e5ad7f0721b..cef079d8b15 100644 --- a/packages/mongo-join-builder/README.md +++ b/packages/mongo-join-builder/README.md @@ -155,7 +155,7 @@ Instead, we can use `mongo-join-builder`! _NOTE: This example is incomplete, and only for documentation purposes. See the examples directory for complete examples._ ```javascript -const { mongoJoinBuilder } = require('@keystone/mongo-join-builder'); +const { mongoJoinBuilder } = require('@keystonejs/mongo-join-builder'); const database = require('./my-mongodb-connection'); const builder = mongoJoinBuilder({ diff --git a/packages/mongo-join-builder/lib/join-builder.js b/packages/mongo-join-builder/lib/join-builder.js index 186a8386e00..377eca73328 100644 --- a/packages/mongo-join-builder/lib/join-builder.js +++ b/packages/mongo-join-builder/lib/join-builder.js @@ -1,5 +1,5 @@ const omitBy = require('lodash.omitby'); -const { flatten, compose, defaultObj } = require('@keystone/utils'); +const { flatten, compose, defaultObj } = require('@keystonejs/utils'); /** * Format of input object: diff --git a/packages/mongo-join-builder/lib/query-parser.js b/packages/mongo-join-builder/lib/query-parser.js index d6c78f845d1..e0670af2c26 100644 --- a/packages/mongo-join-builder/lib/query-parser.js +++ b/packages/mongo-join-builder/lib/query-parser.js @@ -1,5 +1,5 @@ const cuid = require('cuid'); -const { getType, flatten, objMerge } = require('@keystone/utils'); +const { getType, flatten, objMerge } = require('@keystonejs/utils'); const { simpleTokenizer } = require('./tokenizers/simple'); const { relationshipTokenizer } = require('./tokenizers/relationship'); diff --git a/packages/mongo-join-builder/lib/tokenizers/simple.js b/packages/mongo-join-builder/lib/tokenizers/simple.js index f7f4543efda..ace3f381ffb 100644 --- a/packages/mongo-join-builder/lib/tokenizers/simple.js +++ b/packages/mongo-join-builder/lib/tokenizers/simple.js @@ -1,4 +1,4 @@ -const { objMerge, getType, escapeRegExp } = require('@keystone/utils'); +const { objMerge, getType, escapeRegExp } = require('@keystonejs/utils'); const { getRelatedListAdapterFromQueryPath } = require('./relationship-path'); const simpleTokenizer = (listAdapter, query, queryKey, path) => { diff --git a/packages/mongo-join-builder/package.json b/packages/mongo-join-builder/package.json index 62d27ae0a4c..d92524e8173 100644 --- a/packages/mongo-join-builder/package.json +++ b/packages/mongo-join-builder/package.json @@ -1,14 +1,14 @@ { - "name": "@keystone/mongo-join-builder", + "name": "@keystonejs/mongo-join-builder", "description": "Programatically build JOIN-like Mongo aggregations based on arbitrarily nested relationships.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "dependencies": { - "@keystone/utils": "^5.0.0", + "@keystonejs/utils": "^4.0.0", "cuid": "^2.1.6", "lodash.omitby": "^4.6.0" }, diff --git a/packages/oembed-adapters/CHANGELOG.md b/packages/oembed-adapters/CHANGELOG.md index 3b90167113d..de91ad74398 100644 --- a/packages/oembed-adapters/CHANGELOG.md +++ b/packages/oembed-adapters/CHANGELOG.md @@ -1,17 +1,4 @@ -# @keystone/oembed-adapters - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/build-field-types@5.0.0 +# @keystonejs/oembed-adapters # @keystone-alpha/oembed-adapters diff --git a/packages/oembed-adapters/README.md b/packages/oembed-adapters/README.md index 1bc2c377c05..449a3fe1422 100644 --- a/packages/oembed-adapters/README.md +++ b/packages/oembed-adapters/README.md @@ -6,7 +6,7 @@ title: OEmbed Adapters # OEmbed Adapters -The `OEmbed` field type (from `@keystone/fields`) can fetch oEmbed data +The `OEmbed` field type (from `@keystonejs/fields`) can fetch oEmbed data from a number of providers such as [Iframely](https://iframely.com). This package contains adapters for different providers. @@ -14,9 +14,9 @@ This package contains adapters for different providers. ## `IframelyOEmbedAdapter` ```javascript -const { Keystone } = require('@keystone/keystone'); -const { OEmbed } = require('@keystone/fields'); -const { IframelyOEmbedAdapter } = require('@keystone/oembed-adapters'); +const { Keystone } = require('@keystonejs/keystone'); +const { OEmbed } = require('@keystonejs/fields'); +const { IframelyOEmbedAdapter } = require('@keystonejs/oembed-adapters'); const keystone = new Keystone(/* ... */); diff --git a/packages/oembed-adapters/package.json b/packages/oembed-adapters/package.json index aceda154cb4..44493e80a8c 100644 --- a/packages/oembed-adapters/package.json +++ b/packages/oembed-adapters/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/oembed-adapters", + "name": "@keystonejs/oembed-adapters", "description": "Adapters for fetching oEmbed data for the OEmbed field type", - "version": "5.0.0", + "version": "4.0.0", "main": "dist/oembed-adapters.cjs.js", "module": "dist/oembed-adapters.esm.js", "repository": "https://github.com/keystonejs/keystone-5.git", @@ -11,7 +11,7 @@ "@babel/runtime": "^7.4.3", "@emotion/core": "^10.0.14", "@iframely/embed.js": "^1.1.1", - "@keystone/build-field-types": "^5.0.0", + "@keystonejs/build-field-types": "^4.0.0", "node-fetch": "^2.3.0" }, "peerDependencies": { diff --git a/packages/oembed-adapters/src/iframely.js b/packages/oembed-adapters/src/iframely.js index a6c494ca4fe..3e29e0a7607 100644 --- a/packages/oembed-adapters/src/iframely.js +++ b/packages/oembed-adapters/src/iframely.js @@ -1,6 +1,6 @@ import fetch from 'node-fetch'; import crypto from 'crypto'; -import { importView } from '@keystone/build-field-types'; +import { importView } from '@keystonejs/build-field-types'; const VALID_URL = /^https?:\/\//i; const IS_MD5 = /[a-f0-9]{32}/i; diff --git a/packages/session/CHANGELOG.md b/packages/session/CHANGELOG.md index 01545dd0ebe..0ff4ad27651 100644 --- a/packages/session/CHANGELOG.md +++ b/packages/session/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/session - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/session # @keystone-alpha/session diff --git a/packages/session/package.json b/packages/session/package.json index ebac98eb30f..1da90565840 100644 --- a/packages/session/package.json +++ b/packages/session/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/session", + "name": "@keystonejs/session", "description": "Tools to assist with setting up session management in your Keystone system.", - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md index 9ed96b671e4..23c4b41649a 100644 --- a/packages/test-utils/CHANGELOG.md +++ b/packages/test-utils/CHANGELOG.md @@ -1,20 +1,4 @@ -# @keystone/test-utils - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-knex@5.0.0 - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/keystone@5.0.0 +# @keystonejs/test-utils # @keystone-alpha/test-utils diff --git a/packages/test-utils/README.md b/packages/test-utils/README.md index d79cea98756..15752716af4 100644 --- a/packages/test-utils/README.md +++ b/packages/test-utils/README.md @@ -11,7 +11,7 @@ This package is an internal KeystoneJS package which contains utility functions ## Installation ```bash -yarn add @keystone/test-utils +yarn add @keystonejs/test-utils ``` ## Usage diff --git a/packages/test-utils/lib/test-utils.js b/packages/test-utils/lib/test-utils.js index e865c0e3b1e..5117434dd0f 100644 --- a/packages/test-utils/lib/test-utils.js +++ b/packages/test-utils/lib/test-utils.js @@ -3,10 +3,10 @@ const supertest = require('supertest-light'); const MongoDBMemoryServer = require('mongodb-memory-server').default; const pFinally = require('p-finally'); const url = require('url'); -const { Keystone } = require('@keystone/keystone'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { KnexAdapter } = require('@keystone/adapter-knex'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); +const { Keystone } = require('@keystonejs/keystone'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { KnexAdapter } = require('@keystonejs/adapter-knex'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); async function setupServer({ name, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 79bb9d9be8c..3a8e731ccd6 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,17 +1,17 @@ { - "name": "@keystone/test-utils", - "description": "Common utilities used while testing @keystone/* packages.", - "version": "5.0.0", + "name": "@keystonejs/test-utils", + "description": "Common utilities used while testing @keystonejs/* packages.", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { "node": ">=8.4.0" }, "dependencies": { - "@keystone/adapter-knex": "^5.0.0", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/keystone": "^5.0.0", + "@keystonejs/adapter-knex": "^4.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", "express": "^4.17.1", "mongodb-memory-server": "^5.1.5", "p-finally": "^2.0.1", diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 271b85b26dd..1d407f82b0e 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/utils - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/utils # @keystone-alpha/utils diff --git a/packages/utils/package.json b/packages/utils/package.json index 176425b1f7a..ac87dc516d0 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,7 +1,7 @@ { - "name": "@keystone/utils", - "description": "Common utility functions used throughout @keystone packages.", - "version": "5.0.0", + "name": "@keystonejs/utils", + "description": "Common utility functions used throughout @keystonejs packages.", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "main": "dist/utils.cjs.js", diff --git a/test-projects/access-control/CHANGELOG.md b/test-projects/access-control/CHANGELOG.md index b989ddf3c9f..380ace6108a 100644 --- a/test-projects/access-control/CHANGELOG.md +++ b/test-projects/access-control/CHANGELOG.md @@ -1,23 +1,4 @@ -# @keystone/cypress-project-access-control - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/auth-password@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/keystone@5.0.0 - - @keystone/utils@5.0.0 +# @keystonejs/cypress-project-access-control # @keystone-alpha/cypress-project-access-control diff --git a/test-projects/access-control/index.js b/test-projects/access-control/index.js index 847958fa665..3559b41043a 100644 --- a/test-projects/access-control/index.js +++ b/test-projects/access-control/index.js @@ -1,9 +1,9 @@ -const { Keystone } = require('@keystone/keystone'); -const { PasswordAuthStrategy } = require('@keystone/auth-password'); -const { Text, Password, Select } = require('@keystone/fields'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { objMerge } = require('@keystone/utils'); +const { Keystone } = require('@keystonejs/keystone'); +const { PasswordAuthStrategy } = require('@keystonejs/auth-password'); +const { Text, Password, Select } = require('@keystonejs/fields'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { objMerge } = require('@keystonejs/utils'); const { getStaticListName, getImperativeListName, @@ -15,7 +15,7 @@ const { const { projectName } = require('./config'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); const keystone = new Keystone({ name: projectName, diff --git a/test-projects/access-control/package.json b/test-projects/access-control/package.json index 72ededc7bf4..18737403bf9 100644 --- a/test-projects/access-control/package.json +++ b/test-projects/access-control/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/cypress-project-access-control", - "description": "A KeystoneJS demo project for integration testing. See @keystone/keystone for more.", + "name": "@keystonejs/cypress-project-access-control", + "description": "A KeystoneJS demo project for integration testing. See @keystonejs/keystone for more.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -18,13 +18,13 @@ "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a test-projects/access-control/.env file.\nSee test-projects/access-control/.env.example for values\n\"; exit 1; fi" }, "dependencies": { - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/auth-password": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/keystone": "^5.0.0", - "@keystone/utils": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/auth-password": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", + "@keystonejs/utils": "^4.0.0", "cross-env": "^5.2.0", "express": "^4.17.1" }, diff --git a/test-projects/basic/CHANGELOG.md b/test-projects/basic/CHANGELOG.md index 9a07e3229df..1e1f07c15eb 100644 --- a/test-projects/basic/CHANGELOG.md +++ b/test-projects/basic/CHANGELOG.md @@ -1,26 +1,4 @@ -# @keystone/cypress-project-basic - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/app-static@5.0.0 - - @keystone/field-content@5.0.0 - - @keystone/fields-markdown@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/file-adapters@5.0.0 - - @keystone/keystone@5.0.0 - - @keystone/oembed-adapters@5.0.0 +# @keystonejs/cypress-project-basic # @keystone-alpha/cypress-project-basic diff --git a/test-projects/basic/custom-fields/Stars/Implementation.js b/test-projects/basic/custom-fields/Stars/Implementation.js index 3c237b67288..bd9701b271d 100644 --- a/test-projects/basic/custom-fields/Stars/Implementation.js +++ b/test-projects/basic/custom-fields/Stars/Implementation.js @@ -1,4 +1,4 @@ -const { Integer } = require('@keystone/fields'); +const { Integer } = require('@keystonejs/fields'); class Stars extends Integer.implementation { extendAdminMeta(meta) { diff --git a/test-projects/basic/custom-fields/Stars/README.md b/test-projects/basic/custom-fields/Stars/README.md index 6484fdc5eba..0654aff7d55 100644 --- a/test-projects/basic/custom-fields/Stars/README.md +++ b/test-projects/basic/custom-fields/Stars/README.md @@ -91,7 +91,7 @@ For now, `Implementation.js` is only going to re-export from the `Integer` imple const { Integer, MongoIntegerInterface, -} = require('@keystone/fields/types/Integer/Implementation'); +} = require('@keystonejs/fields/types/Integer/Implementation'); class Stars extends Integer {} @@ -104,7 +104,7 @@ module.exports = { `Controller.js` is also going to re-export from the `Integer` Controller. ```jsx -export { default } from '@keystone/fields/types/Integer/Controller'; +export { default } from '@keystonejs/fields/types/Integer/Controller'; ``` ### Views @@ -126,7 +126,7 @@ export default function Cell(props) { We're going to reuse the Integer filter here so we'll re-export it. ```jsx -export { default } from '@keystone/fields/types/Integer/views/Filter'; +export { default } from '@keystonejs/fields/types/Integer/views/Filter'; ``` #### views/Field.js @@ -134,7 +134,7 @@ export { default } from '@keystone/fields/types/Integer/views/Filter'; For now, we're also going to re-export the Integer Field Type. ```jsx -export { default } from '@keystone/fields/types/Integer/views/Field'; +export { default } from '@keystonejs/fields/types/Integer/views/Field'; ``` ## Use the Field Type @@ -212,7 +212,7 @@ First we need to expose it to the Admin UI, to do this, we can define a `extendA const { Integer, MongoIntegerInterface, -} = require('@keystone/fields/types/Integer/Implementation'); +} = require('@keystonejs/fields/types/Integer/Implementation'); class Stars extends Integer { extendAdminMeta(meta) { diff --git a/test-projects/basic/custom-fields/Stars/index.js b/test-projects/basic/custom-fields/Stars/index.js index 62773c89774..e7d430be801 100644 --- a/test-projects/basic/custom-fields/Stars/index.js +++ b/test-projects/basic/custom-fields/Stars/index.js @@ -1,6 +1,6 @@ const { Stars, MongoIntegerInterface, KnexIntegerInterface } = require('./Implementation'); -const { Integer } = require('@keystone/fields'); +const { Integer } = require('@keystonejs/fields'); module.exports = { type: 'Stars', diff --git a/test-projects/basic/index.js b/test-projects/basic/index.js index 4a2cfb8bf5b..c1d6114494e 100644 --- a/test-projects/basic/index.js +++ b/test-projects/basic/index.js @@ -1,4 +1,4 @@ -const { Keystone } = require('@keystone/keystone'); +const { Keystone } = require('@keystonejs/keystone'); const { File, Text, @@ -15,17 +15,17 @@ const { Decimal, OEmbed, Unsplash, -} = require('@keystone/fields'); -const { Content } = require('@keystone/field-content'); -const { CloudinaryAdapter, LocalFileAdapter } = require('@keystone/file-adapters'); -const { Markdown } = require('@keystone/fields-markdown'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { StaticApp } = require('@keystone/app-static'); +} = require('@keystonejs/fields'); +const { Content } = require('@keystonejs/field-content'); +const { CloudinaryAdapter, LocalFileAdapter } = require('@keystonejs/file-adapters'); +const { Markdown } = require('@keystonejs/fields-markdown'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { StaticApp } = require('@keystonejs/app-static'); const { graphql } = require('graphql'); const { staticRoute, staticPath, cloudinary, iframely, unsplash } = require('./config'); -const { IframelyOEmbedAdapter } = require('@keystone/oembed-adapters'); +const { IframelyOEmbedAdapter } = require('@keystonejs/oembed-adapters'); const MockOEmbedAdapter = require('./mocks/oembed-adapter'); const LOCAL_FILE_SRC = `${staticPath}/avatars`; @@ -37,7 +37,7 @@ const getYear = require('date-fns/get_year'); // TODO: Make this work again // const SecurePassword = require('./custom-fields/SecurePassword'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); const keystone = new Keystone({ name: 'Cypress Test Project Basic', diff --git a/test-projects/basic/package.json b/test-projects/basic/package.json index 59d382b1b9b..0736e7aef27 100644 --- a/test-projects/basic/package.json +++ b/test-projects/basic/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/cypress-project-basic", - "description": "A KeystoneJS demo project for integration testing. See @keystone/keystone for more.", + "name": "@keystonejs/cypress-project-basic", + "description": "A KeystoneJS demo project for integration testing. See @keystonejs/keystone for more.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -20,16 +20,16 @@ }, "dependencies": { "@arch-ui/fields": "^2.0.1", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/app-static": "^5.0.0", - "@keystone/field-content": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/fields-markdown": "^5.0.0", - "@keystone/file-adapters": "^5.0.0", - "@keystone/keystone": "^5.0.0", - "@keystone/oembed-adapters": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/app-static": "^4.0.0", + "@keystonejs/field-content": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/fields-markdown": "^4.0.0", + "@keystonejs/file-adapters": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", + "@keystonejs/oembed-adapters": "^4.0.0", "cross-env": "^5.2.0", "date-fns": "^1.30.1", "express": "^4.17.1", diff --git a/test-projects/client-validation/CHANGELOG.md b/test-projects/client-validation/CHANGELOG.md index c306b371cd0..715473546ec 100644 --- a/test-projects/client-validation/CHANGELOG.md +++ b/test-projects/client-validation/CHANGELOG.md @@ -1,23 +1,4 @@ -# @keystone/cypress-project-client-validation - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/app-static@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/file-adapters@5.0.0 - - @keystone/keystone@5.0.0 +# @keystonejs/cypress-project-client-validation # @keystone-alpha/cypress-project-client-validation diff --git a/test-projects/client-validation/index.js b/test-projects/client-validation/index.js index a3cfcb0e102..9f7177e1f1c 100644 --- a/test-projects/client-validation/index.js +++ b/test-projects/client-validation/index.js @@ -1,12 +1,12 @@ -const { Keystone } = require('@keystone/keystone'); -const { Text, Password, Checkbox } = require('@keystone/fields'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { StaticApp } = require('@keystone/app-static'); +const { Keystone } = require('@keystonejs/keystone'); +const { Text, Password, Checkbox } = require('@keystonejs/fields'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { StaticApp } = require('@keystonejs/app-static'); const { staticRoute, staticPath } = require('./config'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); const keystone = new Keystone({ name: 'Cypress Test Project Client Validation', diff --git a/test-projects/client-validation/package.json b/test-projects/client-validation/package.json index 2ae1ddc0e22..d017afc7189 100644 --- a/test-projects/client-validation/package.json +++ b/test-projects/client-validation/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/cypress-project-client-validation", - "description": "A KeystoneJS demo project for integration testing. See @keystone/keystone for more.", + "name": "@keystonejs/cypress-project-client-validation", + "description": "A KeystoneJS demo project for integration testing. See @keystonejs/keystone for more.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -19,13 +19,13 @@ }, "dependencies": { "@arch-ui/fields": "^2.0.1", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/app-static": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/file-adapters": "^5.0.0", - "@keystone/keystone": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/app-static": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/file-adapters": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", "cross-env": "^5.2.0", "date-fns": "^1.30.1", "express": "^4.17.1", diff --git a/test-projects/login/CHANGELOG.md b/test-projects/login/CHANGELOG.md index 03c4b897f1b..6cde37a903a 100644 --- a/test-projects/login/CHANGELOG.md +++ b/test-projects/login/CHANGELOG.md @@ -1,25 +1,4 @@ -# @keystone/cypress-project-login - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/app-static@5.0.0 - - @keystone/auth-password@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/keystone@5.0.0 - - @keystone/list-plugins@5.0.0 - - @keystone/session@5.0.0 +# @keystonejs/cypress-project-login # @keystone-alpha/cypress-project-login diff --git a/test-projects/login/index.js b/test-projects/login/index.js index d76fc673bd6..87d225400c5 100644 --- a/test-projects/login/index.js +++ b/test-projects/login/index.js @@ -1,9 +1,9 @@ -const { Keystone } = require('@keystone/keystone'); -const { PasswordAuthStrategy } = require('@keystone/auth-password'); -const { Text, Password, Relationship, Checkbox } = require('@keystone/fields'); -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); +const { Keystone } = require('@keystonejs/keystone'); +const { PasswordAuthStrategy } = require('@keystonejs/auth-password'); +const { Text, Password, Relationship, Checkbox } = require('@keystonejs/fields'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); const { createdAt, @@ -12,7 +12,7 @@ const { updatedBy, atTracking, byTracking, -} = require('@keystone/list-plugins'); +} = require('@keystonejs/list-plugins'); const defaultAccess = ({ authentication: { item } }) => !!item; diff --git a/test-projects/login/package.json b/test-projects/login/package.json index 59e28ffac4f..2626fc2ea43 100644 --- a/test-projects/login/package.json +++ b/test-projects/login/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/cypress-project-login", - "description": "A KeystoneJS demo project for integration testing. See @keystone/keystone for more.", + "name": "@keystonejs/cypress-project-login", + "description": "A KeystoneJS demo project for integration testing. See @keystonejs/keystone for more.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -18,15 +18,15 @@ "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a test-projects/login/.env file.\nSee test-projects/login/.env.example for values\n\"; exit 1; fi" }, "dependencies": { - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/app-static": "^5.0.0", - "@keystone/auth-password": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/keystone": "^5.0.0", - "@keystone/list-plugins": "^5.0.0", - "@keystone/session": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/app-static": "^4.0.0", + "@keystonejs/auth-password": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", + "@keystonejs/list-plugins": "^4.0.0", + "@keystonejs/session": "^4.0.0", "body-parser": "^1.18.2", "cross-env": "^5.2.0", "express": "^4.17.1" diff --git a/test-projects/social-login/CHANGELOG.md b/test-projects/social-login/CHANGELOG.md index 2a04ac07ac9..45e14884638 100644 --- a/test-projects/social-login/CHANGELOG.md +++ b/test-projects/social-login/CHANGELOG.md @@ -1,25 +1,4 @@ -# @keystone/cypress-project-facebook-login - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. - -### Patch Changes - -- Updated dependencies [[`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be)]: - - @keystone/adapter-mongoose@5.0.0 - - @keystone/app-admin-ui@5.0.0 - - @keystone/app-graphql@5.0.0 - - @keystone/app-static@5.0.0 - - @keystone/auth-passport@5.0.0 - - @keystone/auth-password@5.0.0 - - @keystone/fields@5.0.0 - - @keystone/file-adapters@5.0.0 - - @keystone/keystone@5.0.0 +# @keystonejs/cypress-project-facebook-login # @keystone-alpha/cypress-project-facebook-login diff --git a/test-projects/social-login/index.js b/test-projects/social-login/index.js index 9035827b576..efb9249ad0b 100644 --- a/test-projects/social-login/index.js +++ b/test-projects/social-login/index.js @@ -1,5 +1,5 @@ -const { Keystone } = require('@keystone/keystone'); -const { PasswordAuthStrategy } = require('@keystone/auth-password'); +const { Keystone } = require('@keystonejs/keystone'); +const { PasswordAuthStrategy } = require('@keystonejs/auth-password'); const { File, Text, @@ -8,11 +8,11 @@ const { Select, Password, CloudinaryImage, -} = require('@keystone/fields'); -const { CloudinaryAdapter, LocalFileAdapter } = require('@keystone/file-adapters'); -const { GraphQLApp } = require('@keystone/app-graphql'); -const { AdminUIApp } = require('@keystone/app-admin-ui'); -const { StaticApp } = require('@keystone/app-static'); +} = require('@keystonejs/fields'); +const { CloudinaryAdapter, LocalFileAdapter } = require('@keystonejs/file-adapters'); +const { GraphQLApp } = require('@keystonejs/app-graphql'); +const { AdminUIApp } = require('@keystonejs/app-admin-ui'); +const { StaticApp } = require('@keystonejs/app-static'); const { staticRoute, staticPath, cloudinary, cookieSecret } = require('./config'); @@ -20,7 +20,7 @@ const { DISABLE_AUTH } = process.env; const LOCAL_FILE_SRC = `${staticPath}/avatars`; const LOCAL_FILE_ROUTE = `${staticRoute}/avatars`; -const { MongooseAdapter } = require('@keystone/adapter-mongoose'); +const { MongooseAdapter } = require('@keystonejs/adapter-mongoose'); const keystone = new Keystone({ name: 'Cypress Test for Social Login', diff --git a/test-projects/social-login/package.json b/test-projects/social-login/package.json index 52ae57438c1..b676061263f 100644 --- a/test-projects/social-login/package.json +++ b/test-projects/social-login/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/cypress-project-social-login", - "description": "A KeystoneJS demo project for integration testing. See @keystone/keystone for more.", + "name": "@keystonejs/cypress-project-social-login", + "description": "A KeystoneJS demo project for integration testing. See @keystonejs/keystone for more.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": { @@ -17,15 +17,15 @@ "dependencies": { "@arch-ui/fields": "^2.0.1", "@arch-ui/input": "^0.1.0", - "@keystone/adapter-mongoose": "^5.0.0", - "@keystone/app-admin-ui": "^5.0.0", - "@keystone/app-graphql": "^5.0.0", - "@keystone/app-static": "^5.0.0", - "@keystone/auth-passport": "^5.0.0", - "@keystone/auth-password": "^5.0.0", - "@keystone/fields": "^5.0.0", - "@keystone/file-adapters": "^5.0.0", - "@keystone/keystone": "^5.0.0", + "@keystonejs/adapter-mongoose": "^4.0.0", + "@keystonejs/app-admin-ui": "^4.0.0", + "@keystonejs/app-graphql": "^4.0.0", + "@keystonejs/app-static": "^4.0.0", + "@keystonejs/auth-passport": "^4.0.0", + "@keystonejs/auth-password": "^4.0.0", + "@keystonejs/fields": "^4.0.0", + "@keystonejs/file-adapters": "^4.0.0", + "@keystonejs/keystone": "^4.0.0", "cookie-parser": "^1.4.4", "express": "^4.17.1", "passport-wordpress": "^0.0.4", diff --git a/test-projects/social-login/server.js b/test-projects/social-login/server.js index 0f7277224d4..47b24c56dec 100644 --- a/test-projects/social-login/server.js +++ b/test-projects/social-login/server.js @@ -5,7 +5,7 @@ const { FacebookAuthStrategy, TwitterAuthStrategy, GitHubAuthStrategy, -} = require('@keystone/auth-passport'); +} = require('@keystonejs/auth-passport'); const { keystone, apps } = require('./index'); const { google, facebook, twitter, github, port } = require('./config'); diff --git a/website/CHANGELOG.md b/website/CHANGELOG.md index 38b0651135c..f125b636c78 100644 --- a/website/CHANGELOG.md +++ b/website/CHANGELOG.md @@ -1,12 +1,4 @@ -# @keystone/website - -## 5.0.0 - -### Major Changes - -- [`c7ba40ec`](https://github.com/keystonejs/keystone-5/commit/c7ba40ec98116603c6b7a501d2442e16170ec6be) [#1813](https://github.com/keystonejs/keystone-5/pull/1813) Thanks [@jesstelford](https://github.com/jesstelford)! - - This is the first release of `@keystone/*` packages (previously `@keystone-alpha/*`). - - All packages in the `@keystone-alpha` namespace are now available in the `@keystone` namespace, starting at version `5.0.0`. - - To upgrade your project you must update any `@keystone-alpha/*` dependencies in `package.json` to point to `"@keystone/*": "^5.0.0"` and update any `require`/`import` statements in your code. +# @keystonejs/website # @keystone-alpha/website diff --git a/website/package.json b/website/package.json index 2442f0e89b7..e9a516f5dc3 100644 --- a/website/package.json +++ b/website/package.json @@ -1,8 +1,8 @@ { - "name": "@keystone/website", + "name": "@keystonejs/website", "description": "KeystoneJS documentation. Powered by Gatsby.", "private": true, - "version": "5.0.0", + "version": "4.0.0", "author": "The KeystoneJS Development Team", "license": "MIT", "engines": {