Skip to content

Commit

Permalink
Merge branch 'segmentio:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
agustinespildora authored Aug 9, 2024
2 parents 6b0c007 + 06d0d12 commit c50f40f
Show file tree
Hide file tree
Showing 171 changed files with 7,961 additions and 1,724 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
}
},
{
files: ['packages/cli/**/*.ts', 'packages/cli-internal/**/*.ts'],
files: ['packages/cli/**/*.ts'],
rules: {
'lodash/import-scope': ['error', 'member'],
'@typescript-eslint/no-var-requires': 'off'
Expand Down
18 changes: 7 additions & 11 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,28 @@

# Actions common lib folder

actions-shared/ @segmentio/build-experience-team @segmentio/strategic-connections-team
actions-shared/ @segmentio/strategic-connections-team

# AJV utils

ajv-human-errors/ @segmentio/build-experience-team @segmentio/strategic-connections-team
ajv-human-errors/ @segmentio/strategic-connections-team

# Browser destinations

browser-destinations/ @segmentio/libraries-web-team @segmentio/strategic-connections-team @segmentio/build-experience-team

# CLI private libs

cli-internal/ @segmentio/build-experience-team @segmentio/strategic-connections-team
browser-destinations/ @segmentio/libraries-web-team @segmentio/strategic-connections-team

# CLI binary

cli/ @segmentio/build-experience-team @segmentio/strategic-connections-team
cli/ @segmentio/strategic-connections-team

# Core actions runtime

core/ @segmentio/build-experience-team @segmentio/strategic-connections-team
core/ @segmentio/strategic-connections-team

# Destination definitions and their actions

destination-actions/ @segmentio/strategic-connections-team @segmentio/build-experience-team
destination-actions/ @segmentio/strategic-connections-team

# Utilities for event payload validation against an action's subscription AST.

destination-subscriptions/ @segmentio/build-experience-team @segmentio/strategic-connections-team
destination-subscriptions/ @segmentio/strategic-connections-team
25 changes: 0 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,10 @@ jobs:
registry-url: 'https://registry.npmjs.org'
cache: yarn

- name: Use Github Personal Access Token
run: git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf ssh://git@github.com/

- uses: nrwl/nx-set-shas@v3 # nx recipe

- name: Install Dependencies
run: yarn install --frozen-lockfile
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Build # TODO: This monorepo should be refactored so packages can be linted invidually. "affected" will not work ATM.
run: NODE_ENV=production yarn build # nx recipe
Expand Down Expand Up @@ -105,15 +100,10 @@ jobs:
registry-url: 'https://registry.npmjs.org'
cache: yarn

- name: Use Github Personal Access Token
run: git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf ssh://git@github.com/

- uses: nrwl/nx-set-shas@v3 # nx recipe

- name: Install Dependencies
run: yarn install --frozen-lockfile
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Assert yarn.lock is up-to-date
run: bash scripts/assert-lockfile-updated.sh
Expand Down Expand Up @@ -156,13 +146,8 @@ jobs:
registry-url: 'https://registry.npmjs.org'
cache: yarn

- name: Use Github Personal Access Token
run: git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf ssh://git@github.com/

- name: Install Dependencies
run: yarn install --frozen-lockfile
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Build
run: NODE_ENV=production yarn build:browser-bundles
Expand Down Expand Up @@ -208,13 +193,8 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- name: Use Github Personal Access Token
run: git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf ssh://git@github.com/

- name: Install Dependencies
run: yarn install --frozen-lockfile
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Install Browser Dependencies
run: npx playwright install-deps
Expand Down Expand Up @@ -258,13 +238,8 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- name: Use Github Personal Access Token
run: git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf ssh://git@github.com/

- name: Install Dependencies
run: yarn install --frozen-lockfile
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Run Snyk to check for vulnerabilities
uses: snyk/actions/node@master
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/publish-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ jobs:

- name: Install Dependencies
run: yarn install --frozen-lockfile --ignore-optional
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Build
run: NODE_ENV=production yarn build
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
token: ${{ secrets.GH_PAT }}

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
Expand All @@ -34,13 +32,8 @@ jobs:
registry-url: 'https://registry.npmjs.org'
cache: yarn

- name: Use Github Personal Access Token
run: git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf ssh://git@github.com/

- name: Install Dependencies
run: yarn install --frozen-lockfile
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Build
run: NODE_ENV=production yarn build
Expand Down
1 change: 0 additions & 1 deletion .nxignore
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
packages/cli-internal
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"canary": "./scripts/canary.sh",
"clean": "sh scripts/clean.sh",
"cli": "yarn workspace @segment/actions-cli",
"cli-internal": "yarn workspace @segment/actions-cli-internal",
"cloud": "yarn workspace @segment/action-destinations",
"core": "yarn workspace @segment/actions-core",
"lint": "ls -d ./packages/* | xargs -I {} eslint '{}/**/*.ts' --cache",
Expand Down
4 changes: 2 additions & 2 deletions packages/actions-shared/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@segment/actions-shared",
"description": "Shared destination action methods and definitions.",
"version": "1.105.0",
"version": "1.108.0",
"repository": {
"type": "git",
"url": "https://github.com/segmentio/action-destinations",
Expand Down Expand Up @@ -37,7 +37,7 @@
},
"dependencies": {
"@amplitude/ua-parser-js": "^0.7.25",
"@segment/actions-core": "^3.124.0",
"@segment/actions-core": "^3.127.0",
"cheerio": "^1.0.0-rc.10",
"dayjs": "^1.10.7",
"escape-goat": "^3",
Expand Down
4 changes: 2 additions & 2 deletions packages/browser-destination-runtime/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/browser-destination-runtime",
"version": "1.53.0",
"version": "1.56.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand Down Expand Up @@ -62,7 +62,7 @@
}
},
"dependencies": {
"@segment/actions-core": "^3.124.0"
"@segment/actions-core": "^3.127.0"
},
"devDependencies": {
"@segment/analytics-next": "*"
Expand Down
4 changes: 2 additions & 2 deletions packages/browser-destinations/destinations/1flow/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/analytics-browser-actions-1flow",
"version": "1.36.0",
"version": "1.39.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand All @@ -15,7 +15,7 @@
},
"typings": "./dist/esm",
"dependencies": {
"@segment/browser-destination-runtime": "^1.53.0"
"@segment/browser-destination-runtime": "^1.56.0"
},
"peerDependencies": {
"@segment/analytics-next": ">=1.55.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/analytics-browser-actions-adobe-target",
"version": "1.54.0",
"version": "1.57.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand All @@ -16,7 +16,7 @@
},
"typings": "./dist/esm",
"dependencies": {
"@segment/browser-destination-runtime": "^1.53.0"
"@segment/browser-destination-runtime": "^1.56.0"
},
"peerDependencies": {
"@segment/analytics-next": ">=1.55.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/analytics-browser-actions-algolia-plugins",
"version": "1.31.0",
"version": "1.34.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand All @@ -15,7 +15,7 @@
},
"typings": "./dist/esm",
"dependencies": {
"@segment/browser-destination-runtime": "^1.53.0"
"@segment/browser-destination-runtime": "^1.56.0"
},
"peerDependencies": {
"@segment/analytics-next": ">=1.55.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/analytics-browser-actions-amplitude-plugins",
"version": "1.54.0",
"version": "1.57.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand All @@ -15,7 +15,7 @@
},
"typings": "./dist/esm",
"dependencies": {
"@segment/browser-destination-runtime": "^1.53.0"
"@segment/browser-destination-runtime": "^1.56.0"
},
"peerDependencies": {
"@segment/analytics-next": ">=1.55.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/analytics-browser-actions-braze-cloud-plugins",
"version": "1.57.0",
"version": "1.61.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand All @@ -15,8 +15,8 @@
},
"typings": "./dist/esm",
"dependencies": {
"@segment/analytics-browser-actions-braze": "^1.57.0",
"@segment/browser-destination-runtime": "^1.53.0"
"@segment/analytics-browser-actions-braze": "^1.61.0",
"@segment/browser-destination-runtime": "^1.56.0"
},
"peerDependencies": {
"@segment/analytics-next": ">=1.55.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/browser-destinations/destinations/braze/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/analytics-browser-actions-braze",
"version": "1.57.0",
"version": "1.61.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand Down Expand Up @@ -35,8 +35,8 @@
"dependencies": {
"@braze/web-sdk": "npm:@braze/web-sdk@^4.1.0",
"@braze/web-sdk-v3": "npm:@braze/web-sdk@^3.5.1",
"@segment/actions-core": "^3.124.0",
"@segment/browser-destination-runtime": "^1.53.0"
"@segment/actions-core": "^3.127.0",
"@segment/browser-destination-runtime": "^1.56.0"
},
"peerDependencies": {
"@segment/analytics-next": ">=1.55.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ exports[`loads different versions from CDN undefined version:
1`] = `
NodeList [
<script
src="https://js.appboycdn.com/web-sdk/4.8/braze.no-module.min.js"
src="https://js.appboycdn.com/web-sdk/4.10/braze.no-module.min.js"
status="loaded"
type="text/javascript"
/>,
Expand Down
9 changes: 7 additions & 2 deletions packages/browser-destinations/destinations/braze/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ declare global {
}
}

const defaultVersion = '4.8'
const defaultVersion = '4.10'

const presets: DestinationDefinition['presets'] = [
{
Expand Down Expand Up @@ -85,6 +85,10 @@ export const destination: BrowserDestinationDefinition<Settings, BrazeDestinatio
{
value: '4.8',
label: '4.8'
},
{
value: '4.10',
label: '4.10'
}
],
default: defaultVersion,
Expand Down Expand Up @@ -113,7 +117,8 @@ export const destination: BrowserDestinationDefinition<Settings, BrazeDestinatio
{ label: 'US-08 (https://dashboard-08.braze.com)', value: 'sdk.iad-08.braze.com' },
{ label: 'US-09 (https://dashboard-09.braze.com)', value: 'sdk.iad-09.braze.com' },
{ label: 'EU-01 (https://dashboard-01.braze.eu)', value: 'sdk.fra-01.braze.eu' },
{ label: 'EU-02 (https://dashboard-02.braze.eu)', value: 'sdk.fra-02.braze.eu' }
{ label: 'EU-02 (https://dashboard-02.braze.eu)', value: 'sdk.fra-02.braze.eu' },
{ label: 'ID-01 (https://dashboard-01.braze.id)', value: 'sdk.apse-01.braze.id' }
],
default: 'sdk.iad-01.braze.com',
required: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/analytics-browser-actions-bucket",
"version": "1.34.0",
"version": "1.37.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand All @@ -16,8 +16,8 @@
"typings": "./dist/esm",
"dependencies": {
"@bucketco/tracking-sdk": "^2.0.0",
"@segment/actions-core": "^3.124.0",
"@segment/browser-destination-runtime": "^1.53.0"
"@segment/actions-core": "^3.127.0",
"@segment/browser-destination-runtime": "^1.56.0"
},
"peerDependencies": {
"@segment/analytics-next": ">=1.55.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/analytics-browser-actions-cdpresolution",
"version": "1.41.0",
"version": "1.44.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand All @@ -15,7 +15,7 @@
},
"typings": "./dist/esm",
"dependencies": {
"@segment/browser-destination-runtime": "^1.53.0"
"@segment/browser-destination-runtime": "^1.56.0"
},
"peerDependencies": {
"@segment/analytics-next": ">=1.55.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@segment/analytics-browser-actions-commandbar",
"version": "1.54.0",
"version": "1.57.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand All @@ -15,8 +15,8 @@
},
"typings": "./dist/esm",
"dependencies": {
"@segment/actions-core": "^3.124.0",
"@segment/browser-destination-runtime": "^1.53.0"
"@segment/actions-core": "^3.127.0",
"@segment/browser-destination-runtime": "^1.56.0"
},
"peerDependencies": {
"@segment/analytics-next": ">=1.55.0"
Expand Down
Loading

0 comments on commit c50f40f

Please sign in to comment.