Skip to content

Commit

Permalink
refactor: turn into dual node package with additional browser bundle (#…
Browse files Browse the repository at this point in the history
…2169)

* refactor: turn into dual node package with additional browser bundle

* build: remove unused renamer dependency

* prettier

* build(deps-dev): bump express from 4.18.2 to 4.18.3 (#2174)

Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.2...4.18.3)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: unown package files [] (#2165)

* build(deps-dev): bump typedoc from 0.25.9 to 0.25.10 (#2176)

Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.25.9 to 0.25.10.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Changelog](https://github.com/TypeStrong/typedoc/blob/master/CHANGELOG.md)
- [Commits](TypeStrong/typedoc@v0.25.9...v0.25.10)

---
updated-dependencies:
- dependency-name: typedoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump type-fest from 4.10.3 to 4.11.0 (#2177)

Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 4.10.3 to 4.11.0.
- [Release notes](https://github.com/sindresorhus/type-fest/releases)
- [Commits](sindresorhus/type-fest@v4.10.3...v4.11.0)

---
updated-dependencies:
- dependency-name: type-fest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump @contentful/rich-text-types from 16.3.4 to 16.3.5 (#2178)

Bumps [@contentful/rich-text-types](https://github.com/contentful/rich-text) from 16.3.4 to 16.3.5.
- [Release notes](https://github.com/contentful/rich-text/releases)
- [Changelog](https://github.com/contentful/rich-text/blob/master/CHANGELOG.md)
- [Commits](https://github.com/contentful/rich-text/compare/@contentful/[email protected]...@contentful/[email protected])

---
updated-dependencies:
- dependency-name: "@contentful/rich-text-types"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump type-fest from 4.11.0 to 4.11.1 (#2179)

Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 4.11.0 to 4.11.1.
- [Release notes](https://github.com/sindresorhus/type-fest/releases)
- [Commits](sindresorhus/type-fest@v4.11.0...v4.11.1)

---
updated-dependencies:
- dependency-name: type-fest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: github migration [EXT-5014]

* feat: github migration [EXT-5014]

* adding vault context

* fix: [] - fix build

* build(deps-dev): bump typedoc from 0.25.10 to 0.25.11 (#2182)

Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.25.10 to 0.25.11.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Changelog](https://github.com/TypeStrong/typedoc/blob/master/CHANGELOG.md)
- [Commits](TypeStrong/typedoc@v0.25.10...v0.25.11)

---
updated-dependencies:
- dependency-name: typedoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump typedoc from 0.25.11 to 0.25.12 (#2183)

Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.25.11 to 0.25.12.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Changelog](https://github.com/TypeStrong/typedoc/blob/master/CHANGELOG.md)
- [Commits](TypeStrong/typedoc@v0.25.11...v0.25.12)

---
updated-dependencies:
- dependency-name: typedoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump type-fest from 4.11.1 to 4.12.0 (#2184)

Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 4.11.1 to 4.12.0.
- [Release notes](https://github.com/sindresorhus/type-fest/releases)
- [Commits](sindresorhus/type-fest@v4.11.1...v4.12.0)

---
updated-dependencies:
- dependency-name: type-fest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* wip: use rollup to bundle

* refactor: improve rollup integration

* WIP - replace Jest with Vitest

* refactor: fix all integration tests and clean up

* build: fix rollup browser bundle

* build: fix rollup process resolve

* build: readd tsd

* build: remove bundle size check again from postbuild to avoid issues on CI

* ci: move to latest node v18 to avoid warnings while installing

* build: adjust for new structure of contentful-sdk-core

* fix: to ensure we are ECMA2018 compatible with browser bundle

* test: fix mocks of sdk-core

* build: use rollup to inject plugin version into ESM export

* build: ensure types are defined in the exports in package.json

* deps: remove obsolete dependencies

* refactor: make it work with react-native and other bundlers

* build: update to latest sdk-core version

* build: update to latest sdk-core version

* build: add missing fast-copy dev dependency

* build: minor and patch updates of dependencies

* Revert "build: minor and patch updates of dependencies"

This reverts commit c2573fc.

* build: increase browser bundle size limit - sorry - updates forced me

* build: v11.0.0-alpha.8

* build: remove local verdaccio traces

* test: ensure output-integration browser test is working again and using vitest instead of jest

* build: upgrade CTF source maps to latest

* build: load rich-text-types for now from npm

* build: update rollup and typescript dependencies to latest

* build: upgrade to vitest v2

* test: update broken integration tests from git merge

* fix: reset version number to valid semver

* chore: no need to hard code the bin directory for tsd

* chore: test types on push as its very fast and avoids useless waiting for CI

* test: slightly increase bundle sizes

* docs: update README.md to include information about the new ESM support

* docs: update TOC and fix format of tables in README

* docs: update import syntax in readme

* build: npm dedupe

* fix: bundle size

* fix: plock

* fix: remove bundle size

* fix: tsc "Right operand of ?? is unreachable because the left operand is never nullish"

* fix: regen plock

* test: fix query params

* fix: bump size

* test: test updates

* chore: adding dry run flag, BC commit tag to force major (#2325)

* build(deps-dev): bump express in the dev-dependencies group (#2326)

Bumps the dev-dependencies group with 1 update: [express](https://github.com/expressjs/express).


Updates `express` from 4.19.2 to 4.20.0
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.19.2...4.20.0)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump express in the dev-dependencies group (#2327)

Bumps the dev-dependencies group with 1 update: [express](https://github.com/expressjs/express).


Updates `express` from 4.20.0 to 4.21.0
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md)
- [Commits](expressjs/express@4.20.0...4.21.0)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump the production-dependencies group with 2 updates (#2328)

Bumps the production-dependencies group with 2 updates: [@contentful/content-source-maps](https://github.com/contentful/live-preview) and [contentful-sdk-core](https://github.com/contentful/contentful-sdk-core).


Updates `@contentful/content-source-maps` from 0.11.2 to 0.11.3
- [Release notes](https://github.com/contentful/live-preview/releases)
- [Commits](https://github.com/contentful/live-preview/compare/@contentful/[email protected]...@contentful/[email protected])

Updates `contentful-sdk-core` from 8.3.1 to 8.3.2
- [Release notes](https://github.com/contentful/contentful-sdk-core/releases)
- [Commits](contentful/contentful-sdk-core@v8.3.1...v8.3.2)

---
updated-dependencies:
- dependency-name: "@contentful/content-source-maps"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: contentful-sdk-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump babel-loader in the dev-dependencies group (#2329)

Bumps the dev-dependencies group with 1 update: [babel-loader](https://github.com/babel/babel-loader).


Updates `babel-loader` from 9.1.3 to 9.2.1
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](babel/babel-loader@v9.1.3...v9.2.1)

---
updated-dependencies:
- dependency-name: babel-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump nodemon in the dev-dependencies group (#2330)

Bumps the dev-dependencies group with 1 update: [nodemon](https://github.com/remy/nodemon).


Updates `nodemon` from 3.1.4 to 3.1.5
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v3.1.4...v3.1.5)

---
updated-dependencies:
- dependency-name: nodemon
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump nodemon in the dev-dependencies group (#2330)

Bumps the dev-dependencies group with 1 update: [nodemon](https://github.com/remy/nodemon).

Updates `nodemon` from 3.1.4 to 3.1.5
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v3.1.4...v3.1.5)

---
updated-dependencies:
- dependency-name: nodemon
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: rm dry-run flag

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Mitch Goudy <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gary Hepting <[email protected]>
Co-authored-by: david shibley <[email protected]>
Co-authored-by: Cormac de Barra <[email protected]>
Co-authored-by: Mitch Goudy <[email protected]>
  • Loading branch information
7 people authored Sep 19, 2024
1 parent a81da10 commit 72864fb
Show file tree
Hide file tree
Showing 41 changed files with 11,323 additions and 40,164 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ orbs:
jobs:
lint:
docker:
- image: cimg/node:18.19-browsers
- image: 'cimg/node:18.20.1-browsers'
steps:
- checkout
- vault/get-secrets: # Loads vault secrets
Expand All @@ -28,7 +28,7 @@ jobs:
steps:
- checkout
- node/install:
node-version: '18.17'
node-version: '18.20.1'
- vault/get-secrets: # Loads vault secrets
template-preset: 'packages-read'
- run: echo "//npm.pkg.github.com/:_authToken=${GITHUB_PACKAGES_READ_TOKEN}" > ~/.npmrc
Expand All @@ -42,7 +42,7 @@ jobs:
steps:
- checkout
- node/install:
node-version: '18.17'
node-version: '18.20.1'
- vault/get-secrets: # Loads vault secrets
template-preset: 'packages-read'
- run: echo "//npm.pkg.github.com/:_authToken=${GITHUB_PACKAGES_READ_TOKEN}" > ~/.npmrc
Expand All @@ -52,7 +52,7 @@ jobs:

release:
docker:
- image: cimg/node:18.19-browsers
- image: 'cimg/node:18.20.1-browsers'
steps:
- checkout
- browser-tools/install-chrome
Expand Down
3 changes: 2 additions & 1 deletion .eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
parser: '@typescript-eslint/parser',
plugins: ['standard', 'promise'],
env: {
jest: true,
node: true,
},
globals: {
Expand All @@ -12,6 +12,7 @@ module.exports = {
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'prettier',
'plugin:vitest-globals/recommended',
],
ignorePatterns: ['**/test/output-integration/**', '**/webpack.config.js'],
rules: {
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
dist
gh-pages
test/output-integration/browser/public/contentful*.js

# Esdoc dirs
out
Expand Down
2 changes: 2 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
npm run lint
npm run prettier:check
1 change: 1 addition & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npm run test:prepush
137 changes: 83 additions & 54 deletions README.md

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions jest.config.js

This file was deleted.

14 changes: 9 additions & 5 deletions lib/contentful.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
* with access to the Contentful Content Delivery API.
*/

import type { AxiosAdapter, AxiosRequestConfig, AxiosResponse } from 'axios'
import axios from 'axios'
import type { AxiosAdapter, AxiosRequestConfig, AxiosResponse } from 'axios'

import { createHttpClient, getUserAgentHeader } from 'contentful-sdk-core'
import { createGlobalOptions } from './create-global-options'
import { makeClient } from './make-client'
import { ContentfulClientApi } from './types'
import { validateRemoveUnresolvedParam, validateResolveLinksParam } from './utils/validate-params'
import { createGlobalOptions } from './create-global-options.js'
import { makeClient } from './make-client.js'
import {
validateRemoveUnresolvedParam,
validateResolveLinksParam,
} from './utils/validate-params.js'
import type { ContentfulClientApi } from './types/client.js'

/**
* @category Client
Expand Down
32 changes: 16 additions & 16 deletions lib/create-contentful-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,38 @@
import { encodeCPAResponse } from '@contentful/content-source-maps'
import { AxiosInstance, createRequestConfig, errorHandler } from 'contentful-sdk-core'
import { CreateClientParams } from './contentful'
import { GetGlobalOptions } from './create-global-options'
import pagedSync from './paged-sync'
import {
import { GetGlobalOptions } from './create-global-options.js'
import pagedSync from './paged-sync.js'
import type {
Asset,
AssetCollection,
AssetKey,
ContentfulClientApi,
ContentType,
ContentTypeCollection,
EntryCollection,
EntrySkeletonType,
LocaleCode,
LocaleCollection,
Space,
SyncOptions,
SyncQuery,
Tag,
TagCollection,
} from './types'
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers'
import normalizeSearchParameters from './utils/normalize-search-parameters'
import normalizeSelect from './utils/normalize-select'
EntryCollection,
SyncQuery,
SyncOptions,
EntrySkeletonType,
LocaleCode,
} from './types/index.js'
import normalizeSearchParameters from './utils/normalize-search-parameters.js'
import normalizeSelect from './utils/normalize-select.js'
import resolveCircular from './utils/resolve-circular.js'
import getQuerySelectionSet from './utils/query-selection-set'
import resolveCircular from './utils/resolve-circular'
import validateTimestamp from './utils/validate-timestamp.js'
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers.js'
import {
checkIncludeContentSourceMapsParamIsAllowed,
validateLocaleParam,
validateRemoveUnresolvedParam,
validateResolveLinksParam,
} from './utils/validate-params'
import validateSearchParameters from './utils/validate-search-parameters'
import validateTimestamp from './utils/validate-timestamp'

const ASSET_KEY_MAX_LIFETIME = 48 * 60 * 60

Expand Down Expand Up @@ -275,7 +275,7 @@ export default function createContentfulApi<OptionType extends ChainOptions>(
})

return resolveCircular(entries, {
resolveLinks: !withoutLinkResolution ?? true,
resolveLinks: !withoutLinkResolution,
removeUnresolved: withoutUnresolvableLinks ?? false,
})
} catch (error) {
Expand Down Expand Up @@ -462,7 +462,7 @@ export default function createContentfulApi<OptionType extends ChainOptions>(
const { withoutLinkResolution, withoutUnresolvableLinks } = options

return resolveCircular(data, {
resolveLinks: !withoutLinkResolution ?? true,
resolveLinks: !withoutLinkResolution,
removeUnresolved: withoutUnresolvableLinks ?? false,
})
}
Expand Down
12 changes: 6 additions & 6 deletions lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export * from './contentful'
export * from './create-global-options'
export * from './mixins/stringify-safe'
export * from './utils/normalize-select'
export * from './utils/resolve-circular'
export * from './contentful.js'
export * from './create-global-options.js'
export * from './mixins/stringify-safe.js'
export * from './utils/normalize-select.js'
export * from './utils/resolve-circular.js'

export * from './types'
export * from './types/index.js'
6 changes: 3 additions & 3 deletions lib/make-client.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import createContentfulApi, { CreateContentfulApiParams } from './create-contentful-api'
import createContentfulApi, { CreateContentfulApiParams } from './create-contentful-api.js'
import {
ChainOptions,
DefaultChainOption,
ChainOption,
ModifiersFromOptions,
} from './utils/client-helpers'
import { ContentfulClientApi } from './types'
} from './utils/client-helpers.js'
import type { ContentfulClientApi } from './types/index.js'

function create<OptionsType extends ChainOptions>(
{ http, getGlobalOptions }: CreateContentfulApiParams,
Expand Down
8 changes: 4 additions & 4 deletions lib/paged-sync.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import resolveResponse from 'contentful-resolve-response'
import { AxiosInstance, createRequestConfig, freezeSys, toPlainObject } from 'contentful-sdk-core'
import mixinStringifySafe from './mixins/stringify-safe'
import {
import mixinStringifySafe from './mixins/stringify-safe.js'
import type {
SyncPageQuery,
SyncResponse,
SyncPageResponse,
Expand All @@ -11,8 +11,8 @@ import {
SyncQuery,
LocaleCode,
EntrySkeletonType,
} from './types'
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers'
} from './types/index.js'
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers.js'

/**
* Retrieves all the available pages for a sync operation
Expand Down
30 changes: 15 additions & 15 deletions lib/types/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
export * from './asset'
export * from './asset-key'
export { AddChainModifier, ChainModifiers, ContentfulClientApi } from './client'
export * from './collection'
export * from './content-type'
export * from './entry'
export * from './link'
export * from './locale'
export * from './metadata'
export * from './query'
export * from './resource-link'
export * from './space'
export * from './sync'
export * from './sys'
export * from './tag'
export * from './asset.js'
export * from './asset-key.js'
export { AddChainModifier, ChainModifiers, ContentfulClientApi } from './client.js'
export * from './collection.js'
export * from './content-type.js'
export * from './entry.js'
export * from './link.js'
export * from './locale.js'
export * from './metadata.js'
export * from './query/index.js'
export * from './resource-link.js'
export * from './space.js'
export * from './sync.js'
export * from './sys.js'
export * from './tag.js'
24 changes: 12 additions & 12 deletions lib/types/query/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ export {
EntrySkeletonType,
type ConditionalFixedQueries,
type ConditionalListQueries,
} from './util'
} from './util.js'

export * from './equality'
export * from './existence'
export * from './location'
export * from './order'
export * from './query'
export * from './range'
export * from './reference'
export * from './search'
export * from './select'
export * from './set'
export * from './subset'
export * from './equality.js'
export * from './existence.js'
export * from './location.js'
export * from './order.js'
export * from './query.js'
export * from './range.js'
export * from './reference.js'
export * from './search.js'
export * from './select.js'
export * from './set.js'
export * from './subset.js'
3 changes: 2 additions & 1 deletion lib/utils/resolve-circular.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import mixinStringifySafe from '../mixins/stringify-safe'
import resolveResponse from 'contentful-resolve-response'

import mixinStringifySafe from '../mixins/stringify-safe.js'

export default function resolveCircular(data: any, { resolveLinks, removeUnresolved }): any {
const wrappedData = mixinStringifySafe(data)
if (resolveLinks) {
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/validate-params.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ValidationError } from './validation-error'
import { ValidationError } from './validation-error.js'

function checkLocaleParamIsAll(query) {
if (query.locale === '*') {
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/validate-timestamp.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ValidationError } from './validation-error'
import { ValidationError } from './validation-error.js'

type Options = {
maximum?: number
Expand Down
Loading

0 comments on commit 72864fb

Please sign in to comment.