Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/check_pr_title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Check PR Title

on:
pull_request:
branches: ['main', 'develop', 'hotfix/*']
branches: ['main', 'develop', 'hotfix/*', 'feature/*']
types: ['opened', 'reopened', 'edited', 'synchronize']

concurrency:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ jobs:
needs: get-deploy-inputs
if: ${{ inputs.deploy_to_npm }}
with:
is_called: true
environment: beta
bugsnag_release_stage: beta
version_suffix: ${{ needs.get-deploy-inputs.outputs.version_suffix }}
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/deploy-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
workflow_dispatch:
workflow_call:
inputs:
is_called:
type: string
required: true
base_version:
type: string
required: false
Expand Down Expand Up @@ -62,7 +59,7 @@ jobs:
name: Deploy to NPM
# As we publish the NPM package with provenance, we must use GitHub-hosted runners
runs-on: ubuntu-latest
if: ${{ inputs.is_called == 'true' || (github.event_name == 'workflow_dispatch' && startsWith(github.ref, 'refs/tags/v')) }}
if: ${{ github.workflow_ref != '' || (github.event_name == 'workflow_dispatch' && startsWith(github.ref, 'refs/tags/v')) }}

steps:
- name: Checkout
Expand Down Expand Up @@ -226,7 +223,7 @@ jobs:
PROJECT_NAME: ${{ format('JS SDK NPM Package{0}', (inputs.environment == 'staging' && ' - Staging') || (inputs.environment == 'development' && ' - Development') || (inputs.environment == 'beta' && ' - Beta') || '') }}
NPM_PACKAGE_URL: ${{ format('https://www.npmjs.com/package/@rudderstack/analytics-js/v/{0}', env.CURRENT_VERSION_VALUE) }}
RELEASES_URL: 'https://github.com/rudderlabs/rudder-sdk-js/releases/tag/@rudderstack/analytics-js@'
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}/jobs/{3}', github.server_url, github.repository, github.run_id, github.job) }}
ACTOR_URL: ${{ format('{0}/{1}', github.server_url, github.actor) }}
ACTOR: ${{ github.actor }}
with:
Expand Down Expand Up @@ -266,7 +263,7 @@ jobs:
"elements": [
{
"type": "mrkdwn",
"text": ":package: ${{ (github.event_name == 'workflow_dispatch' && format('Published by <{0}|{1}>', env.ACTOR_URL, env.ACTOR)) || (inputs.trigger_source && inputs.trigger_source) }}"
"text": ":package: ${{ inputs.trigger_source || format('Published by <{0}|{1}>', env.ACTOR_URL, env.ACTOR) }}"
},
{
"type": "mrkdwn",
Expand Down Expand Up @@ -297,7 +294,7 @@ jobs:
PROJECT_NAME: ${{ format('JS SDK Service Worker NPM Package{0}', (inputs.environment == 'staging' && ' - Staging') || (inputs.environment == 'development' && ' - Development') || (inputs.environment == 'beta' && ' - Beta') || '') }}
NPM_PACKAGE_URL: ${{ format('https://www.npmjs.com/package/@rudderstack/analytics-js-service-worker/v/{0}', env.CURRENT_VERSION_SW_VALUE) }}
RELEASES_URL: 'https://github.com/rudderlabs/rudder-sdk-js/releases/tag/@rudderstack/analytics-js-service-worker@'
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}/jobs/{3}', github.server_url, github.repository, github.run_id, github.job) }}
ACTOR_URL: ${{ format('{0}/{1}', github.server_url, github.actor) }}
ACTOR: ${{ github.actor }}
with:
Expand Down Expand Up @@ -337,7 +334,7 @@ jobs:
"elements": [
{
"type": "mrkdwn",
"text": ":package: ${{ (github.event_name == 'workflow_dispatch' && format('Published by <{0}|{1}>', env.ACTOR_URL, env.ACTOR)) || (inputs.trigger_source && inputs.trigger_source) }}"
"text": ":package: ${{ inputs.trigger_source || format('Published by <{0}|{1}>', env.ACTOR_URL, env.ACTOR) }}"
},
{
"type": "mrkdwn",
Expand All @@ -357,7 +354,7 @@ jobs:
PROJECT_NAME: ${{ format('JS SDK Cookies Utilities{0}', (inputs.environment == 'staging' && ' - Staging') || (inputs.environment == 'development' && ' - Development') || (inputs.environment == 'beta' && ' - Beta') || '') }}
NPM_PACKAGE_URL: ${{ format('https://www.npmjs.com/package/@rudderstack/analytics-js-cookies/v/{0}', env.CURRENT_VERSION_COOKIE_UTILS_VALUE) }}
RELEASES_URL: 'https://github.com/rudderlabs/rudder-sdk-js/releases/tag/@rudderstack/analytics-js-cookies@'
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}/jobs/{3}', github.server_url, github.repository, github.run_id, github.job) }}
ACTOR_URL: ${{ format('{0}/{1}', github.server_url, github.actor) }}
ACTOR: ${{ github.actor }}
with:
Expand Down Expand Up @@ -397,7 +394,7 @@ jobs:
"elements": [
{
"type": "mrkdwn",
"text": ":package: ${{ (github.event_name == 'workflow_dispatch' && format('Published by <{0}|{1}>', env.ACTOR_URL, env.ACTOR)) || (inputs.trigger_source && inputs.trigger_source) }}"
"text": ":package: ${{ inputs.trigger_source || format('Published by <{0}|{1}>', env.ACTOR_URL, env.ACTOR) }}"
},
{
"type": "mrkdwn",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-sanity-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:
PROJECT_NAME: ${{ format('Sanity Suite - {0}', (inputs.environment == 'production' && 'Production') || (inputs.environment == 'staging' && 'Staging') || (inputs.environment == 'development' && 'Development') || 'Beta') }}
CDN_URL: '${{ inputs.base_cdn_url }}/sanity-suite${{ env.SUITE_CDN_PATH }}/v3/cdn/index.html'
LINK_TEXT: ${{ ((inputs.environment == 'development' && format('v{0} - Development', env.CURRENT_VERSION_VALUE)) || (inputs.environment == 'staging' && format('v{0} - Staging', env.CURRENT_VERSION_VALUE)) || (inputs.environment == 'beta' && format('v{0} - Beta', env.CURRENT_VERSION_VALUE)) || format('v{0}', env.CURRENT_VERSION_VALUE)) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}/jobs/{3}', github.server_url, github.repository, github.run_id, github.job) }}
ACTOR_URL: ${{ format('{0}/{1}', github.server_url, github.actor) }}
ACTOR: ${{ github.actor }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ jobs:
CDN_URL: ${{ format('{0}/{1}/modern/rsa.min.js', inputs.base_cdn_url, inputs.s3_dir_path) }}
RELEASES_URL: 'https://github.com/rudderlabs/rudder-sdk-js/releases/tag/@rudderstack/analytics-js@'
LINK_TEXT: ${{ (inputs.environment == 'development' && 'Development') || (inputs.environment == 'staging' && format('v{0} - Staging', env.CURRENT_VERSION_VALUE)) || format('v{0}', env.CURRENT_VERSION_VALUE) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}/jobs/{3}', github.server_url, github.repository, github.run_id, github.job) }}
ACTOR: ${{ github.actor }}
ACTOR_URL: ${{ format('{0}/{1}', github.server_url, github.actor) }}
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ jobs:
PROJECT_NAME: 'JS SDK Monorepo'
TAG_COMPARE_URL: 'https://github.com/rudderlabs/rudder-sdk-js/compare/'
RELEASES_URL: 'https://github.com/rudderlabs/rudder-sdk-js/releases/tag/'
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}/jobs/{3}', github.server_url, github.repository, github.run_id, github.job) }}
ACTOR_URL: ${{ format('{0}/{1}', github.server_url, github.actor) }}
ACTOR: ${{ github.actor }}
with:
Expand Down Expand Up @@ -265,7 +265,6 @@ jobs:
name: Publish packages to NPM
uses: ./.github/workflows/deploy-npm.yml
with:
is_called: 'true'
trigger_source: ${{ needs.get-release-inputs.outputs.trigger_source }}
monorepo_release_version: ${{ needs.get-release-inputs.outputs.release_version }}
release_ticket_id: ${{ needs.get-release-inputs.outputs.release_ticket_id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rollback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ jobs:
CDN_URL: ${{ format('https://cdn.rudderlabs.com/{0}/modern/rsa.min.js', env.LATEST_VERSION_DIR_NAME) }}
RELEASES_URL: 'https://github.com/rudderlabs/rudder-sdk-js/releases/tag/@rudderstack/analytics-js@'
LINK_TEXT: ${{ format('v{0}', env.ROLLBACK_VERSION_VALUE) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id) }}
GITHUB_RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}/jobs/{3}', github.server_url, github.repository, github.run_id, github.job) }}
ACTOR_URL: ${{ format('{0}/{1}', github.server_url, github.actor) }}
ACTOR: ${{ github.actor }}
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Security, Code Quality and Bundle Size Checks

on:
pull_request:
branches: ['develop', 'main', 'hotfix/*']
branches: ['develop', 'main', 'hotfix/*', 'feature/*']
types: ['opened', 'reopened', 'synchronize']

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests-and-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: ['main', 'develop']
pull_request:
branches: ['main', 'develop', 'hotfix/*']
branches: ['main', 'develop', 'hotfix/*', 'feature/*']
types: ['opened', 'reopened', 'synchronize']

concurrency:
Expand Down
4 changes: 2 additions & 2 deletions examples/angular/sample-app/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<script>
(function() {
"use strict";
window.RudderSnippetVersion = "3.0.60";
window.RudderSnippetVersion = "3.2.0";
var identifier = "rudderanalytics";
if (!window[identifier]) {
window[identifier] = [];
Expand All @@ -25,7 +25,7 @@
var sdkVersion = "v3";
var sdkFileName = "rsa.min.js";
var scriptLoadingMode = "async";
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent" ];
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent", "addCustomIntegration" ];
for (var i = 0; i < methods.length; i++) {
var method = methods[i];
rudderanalytics[method] = function(methodName) {
Expand Down
53 changes: 33 additions & 20 deletions examples/gatsby/sample-gatsby-site/gatsby-browser.js
Original file line number Diff line number Diff line change
@@ -1,46 +1,59 @@
// Initialize rudderanalytics buffer
export const onClientEntry = () => {
if (typeof window !== 'undefined') {
(function() {
"use strict";
window.RudderSnippetVersion = "3.0.60";
var identifier = "rudderanalytics";
(function () {
'use strict';
window.RudderSnippetVersion = '3.1.0';
var identifier = 'rudderanalytics';
if (!window[identifier]) {
window[identifier] = [];
}
var rudderanalytics = window[identifier];
if (Array.isArray(rudderanalytics)) {
if (rudderanalytics.snippetExecuted === true && window.console && console.error) {
console.error("RudderStack JavaScript SDK snippet included more than once.");
console.error('RudderStack JavaScript SDK snippet included more than once.');
} else {
rudderanalytics.snippetExecuted = true;
window.rudderAnalyticsBuildType = "legacy";
var sdkBaseUrl = "https://cdn.rudderlabs.com";
var sdkVersion = "v3";
var sdkFileName = "rsa.min.js";
var scriptLoadingMode = "async";
var methods = [
"setDefaultInstanceKey", "load", "ready", "page", "track",
"identify", "alias", "group", "reset", "setAnonymousId",
"startSession", "endSession", "consent"
window.rudderAnalyticsBuildType = 'legacy';
var sdkBaseUrl = 'https://cdn.rudderlabs.com';
var sdkVersion = 'v3';
var sdkFileName = 'rsa.min.js';
var scriptLoadingMode = 'async';
var methods = [
'setDefaultInstanceKey',
'load',
'ready',
'page',
'track',
'identify',
'alias',
'group',
'reset',
'setAnonymousId',
'startSession',
'endSession',
'consent',
'addCustomIntegration',
];
for (var i = 0; i < methods.length; i++) {
var method = methods[i];
rudderanalytics[method] = function(methodName) {
return function() {
rudderanalytics[method] = (function (methodName) {
return function () {
if (Array.isArray(window[identifier])) {
rudderanalytics.push([ methodName ].concat(Array.prototype.slice.call(arguments)));
rudderanalytics.push([methodName].concat(Array.prototype.slice.call(arguments)));
} else {
var _methodName;
(_methodName = window[identifier][methodName]) === null || _methodName === undefined || _methodName.apply(window[identifier], arguments);
(_methodName = window[identifier][methodName]) === null ||
_methodName === undefined ||
_methodName.apply(window[identifier], arguments);
}
};
}(method);
})(method);
}
}
}

window.rudderanalytics.page('Sample Page Event');
})();
}
};
};
4 changes: 2 additions & 2 deletions examples/nextjs/hooks/sample-app/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
{`
(function() {
"use strict";
window.RudderSnippetVersion = "3.0.60";
window.RudderSnippetVersion = "3.2.0";
var identifier = "rudderanalytics";
if (!window[identifier]) {
window[identifier] = [];
Expand All @@ -37,7 +37,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
var sdkVersion = "v3";
var sdkFileName = "rsa.min.js";
var scriptLoadingMode = "async";
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent" ];
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent", "addCustomIntegration" ];
for (var i = 0; i < methods.length; i++) {
var method = methods[i];
rudderanalytics[method] = function(methodName) {
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/js/sample-app/src/app/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function RootLayout({ children }) {
{`
(function() {
"use strict";
window.RudderSnippetVersion = "3.0.60";
window.RudderSnippetVersion = "3.2.0";
var identifier = "rudderanalytics";
if (!window[identifier]) {
window[identifier] = [];
Expand All @@ -33,7 +33,7 @@ export default function RootLayout({ children }) {
var sdkVersion = "v3";
var sdkFileName = "rsa.min.js";
var scriptLoadingMode = "async";
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent" ];
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent", "addCustomIntegration" ];
for (var i = 0; i < methods.length; i++) {
var method = methods[i];
rudderanalytics[method] = function(methodName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default function Document() {
{`
(function() {
"use strict";
window.RudderSnippetVersion = "3.0.60";
window.RudderSnippetVersion = "3.2.0";
var identifier = "rudderanalytics";
if (!window[identifier]) {
window[identifier] = [];
Expand All @@ -25,7 +25,7 @@ export default function Document() {
var sdkVersion = "v3";
var sdkFileName = "rsa.min.js";
var scriptLoadingMode = "async";
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent" ];
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent", "addCustomIntegration" ];
for (var i = 0; i < methods.length; i++) {
var method = methods[i];
rudderanalytics[method] = function(methodName) {
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/ts/sample-app/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
{`
(function() {
"use strict";
window.RudderSnippetVersion = "3.0.60";
window.RudderSnippetVersion = "3.2.0";
var identifier = "rudderanalytics";
if (!window[identifier]) {
window[identifier] = [];
Expand All @@ -34,7 +34,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
var sdkVersion = "v3";
var sdkFileName = "rsa.min.js";
var scriptLoadingMode = "async";
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent" ];
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent", "addCustomIntegration" ];
for (var i = 0; i < methods.length; i++) {
var method = methods[i];
rudderanalytics[method] = function(methodName) {
Expand Down
4 changes: 2 additions & 2 deletions examples/reactjs/hooks/sample-app/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<script>
(function() {
"use strict";
window.RudderSnippetVersion = "3.0.60";
window.RudderSnippetVersion = "3.2.0";
var identifier = "rudderanalytics";
if (!window[identifier]) {
window[identifier] = [];
Expand All @@ -44,7 +44,7 @@
var sdkVersion = "v3";
var sdkFileName = "rsa.min.js";
var scriptLoadingMode = "async";
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent" ];
var methods = [ "setDefaultInstanceKey", "load", "ready", "page", "track", "identify", "alias", "group", "reset", "setAnonymousId", "startSession", "endSession", "consent", "addCustomIntegration" ];
for (var i = 0; i < methods.length; i++) {
var method = methods[i];
rudderanalytics[method] = function(methodName) {
Expand Down
Loading
Loading