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 packages/snap-preact-demo/snap/src/modern.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
window.searchspring = window.searchspring || {};
window.searchspring.initiator = 'snap-managed';
window.searchspring.managed = true;

import('./index');
11 changes: 3 additions & 8 deletions packages/snap-preact-demo/snap/src/universal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,16 @@ import { polyfills } from '@searchspring/snap-preact';

const promises = [];
if (!('fetch' in window)) {
// @ts-ignore - types not important
promises.push(import('whatwg-fetch') as any);
promises.push(import('whatwg-fetch'));
}
if (!('Symbol' in window) || !('flatMap' in Array.prototype) || !('includes' in Array.prototype)) {
// @ts-ignore - types not important
promises.push(import('core-js/stable') as any);
promises.push(import('core-js/stable'));
}
promises.push(polyfills);
Promise.all(promises).then(() => {
// @ts-ignore - types not important
window.searchspring = window.searchspring || {};
// @ts-ignore - types not important
window.searchspring.managed = true;
window.searchspring.build = 'universal';
// @ts-ignore - types not important
window.searchspring.initiator = 'snap-managed';

import('./index');
});
2 changes: 1 addition & 1 deletion packages/snap-preact-demo/snap/webpack.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const branchName = childProcess.execSync('git rev-parse --abbrev-ref HEAD').toSt

module.exports = merge(common, {
mode: 'production',
entry: './snap/src/index.ts',
entry: './snap/src/modern.ts',
output: {
path: path.resolve(__dirname, 'dist'),
filename: 'bundle.js',
Expand Down
4 changes: 4 additions & 0 deletions packages/snap-preact-demo/templates/src/modern.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
window.searchspring = window.searchspring || {};
window.searchspring.managed = true;

import('./index');
10 changes: 6 additions & 4 deletions packages/snap-preact-demo/templates/src/universal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ import { polyfills } from '@searchspring/snap-preact';

const promises = [];
if (!('fetch' in window)) {
// @ts-ignore - types not important
promises.push(import('whatwg-fetch') as any);
promises.push(import('whatwg-fetch'));
}
if (!('Symbol' in window) || !('flatMap' in Array.prototype) || !('includes' in Array.prototype)) {
// @ts-ignore - types not important
promises.push(import('core-js/stable') as any);
promises.push(import('core-js/stable'));
}
promises.push(polyfills);
Promise.all(promises).then(() => {
window.searchspring = window.searchspring || {};
window.searchspring.managed = true;
window.searchspring.build = 'universal';

import('./index');
});
2 changes: 1 addition & 1 deletion packages/snap-preact-demo/templates/webpack.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const branchName = childProcess.execSync('git rev-parse --abbrev-ref HEAD').toSt

module.exports = merge(common, {
mode: 'production',
entry: './templates/src/index.ts',
entry: './templates/src/modern.ts',
output: {
path: path.resolve(__dirname, 'dist'),
filename: 'bundle.js',
Expand Down
4 changes: 2 additions & 2 deletions packages/snap-preact/src/Snap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@ export class Snap {
});
}

const initiator = window?.searchspring?.initiator || 'self-snap';
const trackerConfig = deepmerge(this.config.tracker?.config || {}, { framework: `${initiator}/preact`, mode: this.mode });
const initiatorPrefix = window?.searchspring?.managed ? `managed/` : '';
const trackerConfig = deepmerge(this.config.tracker?.config || {}, { framework: `${initiatorPrefix}snap/preact`, mode: this.mode });
this.tracker = services?.tracker || new Tracker(trackerGlobals, trackerConfig);

// log version
Expand Down
2 changes: 1 addition & 1 deletion packages/snap-tracker/src/Tracker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class Tracker extends Beacon {

constructor(globals: TrackerGlobals, config?: TrackerConfig & BeaconConfig) {
config = deepmerge(defaultConfig, config || {});
config.initiator = `searchspring/${config.framework}/${version}`;
config.initiator = `athos/${config.framework}/${version}`;

super(globals, config);
if (typeof globals != 'object' || typeof globals.siteId != 'string') {
Expand Down
Loading