Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): pull main into develop post release v3.21.0 #1790

Merged
merged 14 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/deploy-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_call:
inputs:
is_called:
type: boolean
type: string
required: true
secrets:
RS_PROD_BUGSNAG_API_KEY:
Expand Down Expand Up @@ -74,6 +74,14 @@ jobs:
run: |
npm run setup:ci

- name: Build release artifacts
env:
BUGSNAG_API_KEY: ${{ secrets.RS_PROD_BUGSNAG_API_KEY }}
BUGSNAG_RELEASE_STAGE: 'production'
run: |
npm run build:package
npm run build:package:modern

- name: Get the two latest monorepo versions
run: |
CURRENT_VERSION=$(git tag -l "v3*" --sort=-version:refname | head -n 1)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
name: Publish packages to NPM
uses: ./.github/workflows/deploy-npm.yml
with:
is_called: true
is_called: 'true'
secrets:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
RS_PROD_BUGSNAG_API_KEY: ${{ secrets.RS_PROD_BUGSNAG_API_KEY }}
Expand Down
22 changes: 11 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rudderstack/analytics-js-monorepo",
"version": "3.20.0",
"version": "3.21.0",
"private": true,
"description": "Monorepo for RudderStack Analytics JS SDK",
"workspaces": [
Expand Down
12 changes: 12 additions & 0 deletions packages/analytics-js-common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [3.7.0](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-19)


### Features

* error reporting plugin ([#1601](https://github.com/rudderlabs/rudder-sdk-js/issues/1601)) ([1f2629e](https://github.com/rudderlabs/rudder-sdk-js/commit/1f2629e594740763ce9bd54a21213b92d80ae085))


### Bug Fixes

* event API overloads ([#1782](https://github.com/rudderlabs/rudder-sdk-js/issues/1782)) ([02c5b47](https://github.com/rudderlabs/rudder-sdk-js/commit/02c5b47d0a83250fb5180e9ed467a92361663dab))

## [3.6.1](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-05)


Expand Down
9 changes: 7 additions & 2 deletions packages/analytics-js-common/CHANGELOG_LATEST.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
## [3.6.1](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-05)
## [3.7.0](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-19)


### Features

* error reporting plugin ([#1601](https://github.com/rudderlabs/rudder-sdk-js/issues/1601)) ([1f2629e](https://github.com/rudderlabs/rudder-sdk-js/commit/1f2629e594740763ce9bd54a21213b92d80ae085))


### Bug Fixes

* package lint issues ([#1773](https://github.com/rudderlabs/rudder-sdk-js/issues/1773)) ([8e45d05](https://github.com/rudderlabs/rudder-sdk-js/commit/8e45d052bd6366d647d06226aa89b1fa2e512f9d))
* event API overloads ([#1782](https://github.com/rudderlabs/rudder-sdk-js/issues/1782)) ([02c5b47](https://github.com/rudderlabs/rudder-sdk-js/commit/02c5b47d0a83250fb5180e9ed467a92361663dab))

2 changes: 1 addition & 1 deletion packages/analytics-js-common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rudderstack/analytics-js-common",
"version": "3.6.1",
"version": "3.7.0",
"private": true,
"description": "RudderStack JavaScript SDK common code",
"module": "dist/npm/index.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/analytics-js-common/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"github": {
"executor": "@jscutlery/semver:github",
"options": {
"tag": "@rudderstack/analytics-js-common@3.6.1",
"title": "@rudderstack/analytics-js-common@3.6.1",
"discussion-category": "@rudderstack/analytics-js-common@3.6.1",
"tag": "@rudderstack/analytics-js-common@3.7.0",
"title": "@rudderstack/analytics-js-common@3.7.0",
"discussion-category": "@rudderstack/analytics-js-common@3.7.0",
"notesFile": "./packages/analytics-js-common/CHANGELOG_LATEST.md"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ErrorState } from '@rudderstack/analytics-js-common/types/ErrorHandler';
import type { ErrorState } from '../../types/ErrorHandler';
import type { ILogger } from '../../types/Logger';

export interface IExternalSourceLoadConfig {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,31 +73,31 @@ const pageArgumentsToCallOptions = (
payload.name = name as string;
payload.properties = properties as Nullable<ApiObject>;
payload.options = undefined;
payload.callback = options as ApiCallback;
payload.callback = options;
}

if (isFunction(properties)) {
payload.category = category as string;
payload.name = name as string;
payload.properties = undefined;
payload.options = undefined;
payload.callback = properties as ApiCallback;
payload.callback = properties;
}

if (isFunction(name)) {
payload.category = category as string;
payload.name = undefined;
payload.properties = undefined;
payload.options = undefined;
payload.callback = name as ApiCallback;
payload.callback = name;
}

if (isFunction(category)) {
payload.category = undefined;
payload.name = undefined;
payload.properties = undefined;
payload.options = undefined;
payload.callback = category as ApiCallback;
payload.callback = category;
}

if (isObjectLiteralAndNotNull(category)) {
Expand All @@ -123,7 +123,7 @@ const pageArgumentsToCallOptions = (
// use it as name and set category to undefined
if (isString(category) && !isString(name)) {
payload.category = undefined;
payload.name = category as string;
payload.name = category;
}

// Rest of the code is just to clean up undefined values
Expand Down Expand Up @@ -185,13 +185,13 @@ const trackArgumentsToCallOptions = (
if (isFunction(options)) {
payload.properties = properties as Nullable<ApiObject>;
payload.options = undefined;
payload.callback = options as ApiCallback;
payload.callback = options;
}

if (isFunction(properties)) {
payload.properties = undefined;
payload.options = undefined;
payload.callback = properties as ApiCallback;
payload.callback = properties;
}

// Rest of the code is just to clean up undefined values
Expand Down Expand Up @@ -232,14 +232,14 @@ const identifyArgumentsToCallOptions = (
payload.userId = userId as string;
payload.traits = traits as Nullable<IdentifyTraits>;
payload.options = undefined;
payload.callback = options as ApiCallback;
payload.callback = options;
}

if (isFunction(traits)) {
payload.userId = userId as string;
payload.traits = undefined;
payload.options = undefined;
payload.callback = traits as ApiCallback;
payload.callback = traits;
}

if (isObjectLiteralAndNotNull(userId) || isNull(userId)) {
Expand Down Expand Up @@ -298,14 +298,14 @@ const aliasArgumentsToCallOptions = (
payload.to = to;
payload.from = from as string;
payload.options = undefined;
payload.callback = options as ApiCallback;
payload.callback = options;
}

if (isFunction(from)) {
payload.to = to;
payload.from = undefined;
payload.options = undefined;
payload.callback = from as ApiCallback;
payload.callback = from;
} else if (isObjectLiteralAndNotNull(from) || isNull(from)) {
payload.to = to;
payload.from = undefined;
Expand Down Expand Up @@ -358,14 +358,14 @@ const groupArgumentsToCallOptions = (
payload.groupId = groupId as string;
payload.traits = traits as Nullable<ApiObject>;
payload.options = undefined;
payload.callback = options as ApiCallback;
payload.callback = options;
}

if (isFunction(traits)) {
payload.groupId = groupId as string;
payload.traits = undefined;
payload.options = undefined;
payload.callback = traits as ApiCallback;
payload.callback = traits;
}

if (isObjectLiteralAndNotNull(groupId) || isNull(groupId)) {
Expand Down
10 changes: 10 additions & 0 deletions packages/analytics-js-cookies/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [0.3.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-19)

### Dependency Updates

* `@rudderstack/analytics-js-common` updated to version `0.3.2`

### Bug Fixes

* event API overloads ([#1782](https://github.com/rudderlabs/rudder-sdk-js/issues/1782)) ([02c5b47](https://github.com/rudderlabs/rudder-sdk-js/commit/02c5b47d0a83250fb5180e9ed467a92361663dab))

## [0.3.2](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-05)

### Dependency Updates
Expand Down
6 changes: 3 additions & 3 deletions packages/analytics-js-cookies/CHANGELOG_LATEST.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
## [0.3.2](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].1...@rudderstack/[email protected].2) (2024-07-05)
## [0.3.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].2...@rudderstack/[email protected].3) (2024-07-19)

### Dependency Updates

* `@rudderstack/analytics-js-common` updated to version `0.3.1`
* `@rudderstack/analytics-js-common` updated to version `0.3.2`

### Bug Fixes

* package lint issues ([#1773](https://github.com/rudderlabs/rudder-sdk-js/issues/1773)) ([8e45d05](https://github.com/rudderlabs/rudder-sdk-js/commit/8e45d052bd6366d647d06226aa89b1fa2e512f9d))
* event API overloads ([#1782](https://github.com/rudderlabs/rudder-sdk-js/issues/1782)) ([02c5b47](https://github.com/rudderlabs/rudder-sdk-js/commit/02c5b47d0a83250fb5180e9ed467a92361663dab))

2 changes: 1 addition & 1 deletion packages/analytics-js-cookies/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rudderstack/analytics-js-cookies",
"version": "0.3.2",
"version": "0.3.3",
"description": "RudderStack JavaScript SDK Cookies Utilities",
"main": "dist/npm/modern/cjs/index.cjs",
"module": "dist/npm/modern/esm/index.mjs",
Expand Down
6 changes: 3 additions & 3 deletions packages/analytics-js-cookies/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"github": {
"executor": "@jscutlery/semver:github",
"options": {
"tag": "@rudderstack/[email protected].2",
"title": "@rudderstack/[email protected].2",
"discussion-category": "@rudderstack/[email protected].2",
"tag": "@rudderstack/[email protected].3",
"title": "@rudderstack/[email protected].3",
"discussion-category": "@rudderstack/[email protected].3",
"notesFile": "./packages/analytics-js-cookies/CHANGELOG_LATEST.md"
}
}
Expand Down
10 changes: 10 additions & 0 deletions packages/analytics-js-integrations/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [3.4.5](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-19)

### Dependency Updates

* `@rudderstack/analytics-js-common` updated to version `3.4.4`

### Bug Fixes

* event API overloads ([#1782](https://github.com/rudderlabs/rudder-sdk-js/issues/1782)) ([02c5b47](https://github.com/rudderlabs/rudder-sdk-js/commit/02c5b47d0a83250fb5180e9ed467a92361663dab))

## [3.4.4](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-17)


Expand Down
7 changes: 5 additions & 2 deletions packages/analytics-js-integrations/CHANGELOG_LATEST.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
## [3.4.4](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].3...@rudderstack/[email protected].4) (2024-07-17)
## [3.4.5](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].4...@rudderstack/[email protected].5) (2024-07-19)

### Dependency Updates

* `@rudderstack/analytics-js-common` updated to version `3.4.4`

### Bug Fixes

* upgrade braze version from 5.0 to 5.3 ([#1784](https://github.com/rudderlabs/rudder-sdk-js/issues/1784)) ([60a3111](https://github.com/rudderlabs/rudder-sdk-js/commit/60a31116f4401f1c0cb3e82cf55f94420474429a))
* event API overloads ([#1782](https://github.com/rudderlabs/rudder-sdk-js/issues/1782)) ([02c5b47](https://github.com/rudderlabs/rudder-sdk-js/commit/02c5b47d0a83250fb5180e9ed467a92361663dab))

2 changes: 1 addition & 1 deletion packages/analytics-js-integrations/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rudderstack/analytics-js-integrations",
"version": "3.4.4",
"version": "3.4.5",
"private": true,
"description": "RudderStack JavaScript SDK device mode integrations",
"main": "dist/npm/modern/cjs/index.js",
Expand Down
Loading
Loading