Skip to content

Commit 7c0dcd0

Browse files
authored
Merge branch 'main' into config-timeout
2 parents ac7bce9 + d97b27f commit 7c0dcd0

File tree

14 files changed

+34
-32
lines changed

14 files changed

+34
-32
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Checkout
1010
uses: actions/[email protected]
1111

12-
- uses: pnpm/action-setup@v2.2.4
12+
- uses: pnpm/action-setup@v4.0.0
1313

1414
- name: Setup Node
1515
uses: actions/[email protected]
@@ -52,7 +52,7 @@ jobs:
5252
- name: Checkout
5353
uses: actions/[email protected]
5454

55-
- uses: pnpm/action-setup@v2.2.4
55+
- uses: pnpm/action-setup@v4.0.0
5656

5757
- name: Setup Node
5858
uses: actions/[email protected]
@@ -89,7 +89,7 @@ jobs:
8989
- name: Checkout
9090
uses: actions/[email protected]
9191

92-
- uses: pnpm/action-setup@v2.2.4
92+
- uses: pnpm/action-setup@v4.0.0
9393

9494
- name: Setup Node
9595
uses: actions/[email protected]

.github/workflows/linter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Checkout
2121
uses: actions/[email protected]
2222

23-
- uses: pnpm/action-setup@v2.2.4
23+
- uses: pnpm/action-setup@v4.0.0
2424

2525
- name: Setup Node
2626
uses: actions/[email protected]

docs/angular.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ To setup Partytown in an Angular project take the following steps.
99
Run the command below to install the dependencies
1010

1111
```bash
12-
npm install @builder.io/partytown # or yarn add @builder.io/partytown
12+
npm install @builder.io/partytown
13+
yarn add @builder.io/partytown
14+
pnpm install @builder.io/partytown
1315
```
1416

1517
Add the path to the Partytown JS files into the assets array in your `angular.json` file

docs/astro.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ There is a first-class [Astro integration for partytown](https://github.com/with
99
Astro includes a CLI tool for adding integrations. Using the `astro add` command will automatically install Partytown and configure your project.
1010

1111
```bash
12-
yarn astro add partytown # or npx astro add partytown
12+
npx astro add partytown
13+
yarn astro add partytown
14+
pnpx astro add partytown
1315
```
1416

1517
## Partytown Script

docs/gatsby.md

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ For additional information, please see [How to Add Google Analytics gtag to Gats
1010

1111
```bash
1212
npm install @builder.io/partytown
13+
yarn add @builder.io/partytown
14+
pnpm install @builder.io/partytown
1315
```
1416

1517
## Configure

docs/nextjs.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ The Next.js `<Script/>` component provides an experimental `worker` strategy, wh
1414
## Install
1515

1616
```bash
17-
npm install "@builder.io/partytown"
17+
npm install @builder.io/partytown
18+
yarn add @builder.io/partytown
19+
pnpm install @builder.io/partytown
1820
```
1921

2022
## Configure

docs/nuxt.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ There is a first-class [Nuxt integration for partytown](https://github.com/nuxt-
99
Add `@nuxtjs/partytown` dependency to your project.
1010

1111
```bash
12-
yarn add --dev @nuxtjs/partytown # or npm install --save-dev @nuxtjs/partytown
12+
npm install --save-dev @nuxtjs/partytown
13+
yarn add --dev @nuxtjs/partytown
14+
pnpm install --save-dev @nuxtjs/partytown
1315
```
1416

1517
## Configure

docs/react.md

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ The Partytown NPM package already comes with a React component, which is a thin
88

99
```bash
1010
npm install @builder.io/partytown
11+
yarn add @builder.io/partytown
12+
pnpm install @builder.io/partytown
1113
```
1214

1315
## Configure

docs/remix.md

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ The Remix setup is largely the same as the [React integration guide](/react), ex
88

99
```bash
1010
npm install @builder.io/partytown
11+
yarn add @builder.io/partytown
12+
pnpm install @builder.io/partytown
1113
```
1214

1315
## Configure

docs/shopify-hydrogen.md

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ The [Shopify Hydrogen](https://hydrogen.shopify.dev/) setup is largely the same
88

99
```bash
1010
npm install @builder.io/partytown
11+
yarn add @builder.io/partytown
12+
pnpm install @builder.io/partytown
1113
```
1214

1315
## Configure

docs/solid.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ title: Solid
44

55
To setup Partytown in an Solid project take the following steps.
66

7-
## Installation
7+
## Install
8+
9+
```bash
10+
npm install @builder.io/partytown
11+
yarn add @builder.io/partytown
12+
pnpm install @builder.io/partytown
13+
```
814

915
Use your favorite package manager to install `@builder.io/partytown` dependency and
1016
copy the Partytown files to the local filesystem using the Vite plugin.

src/lib/web-worker/worker-window.ts

+1
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ export const createWindow = (
354354
patchDocumentElementChild(win.HTMLBodyElement, env);
355355
patchHTMLHtmlElement(win.HTMLHtmlElement, env);
356356
createCSSStyleSheetConstructor(win, 'CSSStyleSheet');
357+
createCSSStyleSheetConstructor(win, 'CSSMediaRule');
357358

358359
definePrototypeNodeType(win.Comment, 8);
359360
definePrototypeNodeType(win.DocumentType, 10);

tests/integrations/clarity/index.html

-22
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,6 @@
2222
</script>
2323
<script src='/~partytown/debug/partytown.js'></script>
2424

25-
<script>
26-
const observer = new MutationObserver(mutations => {
27-
mutations.forEach(({ addedNodes }) => {
28-
addedNodes.forEach(node => {
29-
// For each added script tag
30-
if (node.nodeType === 1 && node.tagName === 'SCRIPT') {
31-
const src = node.src || '';
32-
if (node.src.includes('clarity.js')) {
33-
node.type = 'text/partytown';
34-
node.src = './clarity.bundle.js';
35-
}
36-
}
37-
});
38-
});
39-
});
40-
// Starts the monitoring
41-
observer.observe(document.documentElement, {
42-
childList: true,
43-
subtree: true,
44-
});
45-
</script>
46-
4725
<style>
4826
body {
4927
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif,

tests/integrations/gtm/gtm.spec.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ test('gtm multiple tabs', async ({ page, context }) => {
7171
await page2.bringToFront();
7272
await testPage(page2, []);
7373

74-
expect(pageConsoleErrors.length).toBe(0);
74+
// FIX ME: I'm flaky
75+
// expect(pageConsoleErrors.length).toBe(0);
7576
expect(pageErrors.length).toBe(0);
7677
expect(page2ConsoleErrors.length).toBe(0);
7778
expect(page2Errors.length).toBe(0);

0 commit comments

Comments
 (0)