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
4 changes: 0 additions & 4 deletions .gitattributes

This file was deleted.

19 changes: 10 additions & 9 deletions .github/workflows/release-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,30 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: pnpm/action-setup@v4
- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 'lts/*' # Use the latest LTS version of Node.js

- name: Set yarn version
run: yarn set version 4.1.1
node-version-file: .nvmrc
cache: pnpm

- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: Build
run: yarn build
run: pnpm build

- name: Create Release Pull Request or Publish to npm
id: changesets
uses: changesets/action@v1
with:
publish: yarn release --tag canary
# Also refreshes pnpm-lock.yaml so the next frozen install passes.
version: pnpm version-packages
publish: pnpm release --tag canary
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
21 changes: 12 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN }}
- uses: pnpm/action-setup@v4
- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: "lts/*"
- name: Set yarn version
run: yarn set version 4.1.1
node-version-file: .nvmrc
cache: pnpm
- name: Install dependencies
run: yarn install
run: pnpm install --frozen-lockfile
- name: Run pre-publish script
run: yarn prepublish
run: pnpm run prepublish
- name: Commit changes made by the prepublish script
run: |
git config --global user.name 'GitHub Action'
Expand All @@ -36,12 +36,15 @@ jobs:
git commit -m "chore: run prepublish script" || true
git push origin main
- name: Build
run: yarn build
run: pnpm build
- name: Create Release Pull Request or Publish to npm
id: changesets
uses: changesets/action@v1
with:
publish: yarn release
# Also refreshes pnpm-lock.yaml so the next frozen install passes.
version: pnpm version-packages
publish: pnpm release
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_CONFIG_PROVENANCE: true
21 changes: 10 additions & 11 deletions .github/workflows/storybook-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,29 @@ on:
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [22.x]
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
node-version-file: .nvmrc
cache: pnpm
- name: Install dependencies
run: yarn
run: pnpm install --frozen-lockfile
- name: Build SDK
run: yarn run turbo build
run: pnpm turbo build
- name: Install Playwright
working-directory: ./apps/smithy
run: npx playwright install --with-deps
run: pnpm exec playwright install --with-deps
- name: Build Storybook
working-directory: ./apps/smithy
run: yarn build-storybook --quiet
run: pnpm build-storybook --quiet
- uses: nick-fields/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
command: |
cd ./apps/smithy; \
npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
"npx http-server storybook-static --port 6006 --silent" \
"npx wait-on tcp:127.0.0.1:6006 && yarn test-storybook"
pnpm dlx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
"pnpm dlx http-server storybook-static --port 6006 --silent" \
"pnpm dlx wait-on tcp:127.0.0.1:6006 && pnpm test-storybook"
15 changes: 6 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@ jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [22.x]

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
- uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: yarn set version 4.1.1
- run: yarn install
- run: yarn run turbo test
node-version-file: .nvmrc
cache: pnpm
- run: pnpm install --frozen-lockfile
- run: pnpm turbo test
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,5 @@ dist
.watchmanconfig
ios/Pods

.yarn/*
!.yarn/releases
!.yarn/plugins

.turbo
2 changes: 0 additions & 2 deletions .husky/pre-commit

This file was deleted.

1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
24
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.1.1.cjs

This file was deleted.

7 changes: 0 additions & 7 deletions .yarnrc.yml

This file was deleted.

72 changes: 37 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
"private": true,
"license": "MIT",
"description": "Build better product onboarding, faster.",
"workspaces": [
"apps/*",
"packages/*"
],
"scripts": {
"build": "turbo build",
"test": "turbo test",
Expand All @@ -16,46 +12,52 @@
"clean": "turbo clean && rm -rf node_modules",
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
"changeset": "changeset",
"version-packages": "changeset version",
"version-packages": "changeset version && pnpm install --lockfile-only",
"release": "turbo build && changeset publish",
"copy-version-number": "turbo run copy-version-number",
"prepublish": "turbo prepublish"
},
"devDependencies": {
"@changesets/cli": "^2.22.0",
"eslint": "^7.32.0",
"eslint-plugin-react-hooks": "^5.1.0",
"husky": "^9.1.7",
"prettier": "^2.5.1",
"rimraf": "^5.0.0",
"turbo": "^2.9.14"
},
"resolutions": {
"tar": "^7.5.21",
"uuid": "^11.1.1",
"serialize-javascript": "^7.0.5",
"ip-address": "^10.1.1",
"express/path-to-regexp": "0.1.13",
"minimatch@npm:9.0.3": "npm:9.0.7",
"js-yaml@^3.6.1": "3.15.2",
"js-yaml@^3.13.0": "3.15.2",
"js-yaml@^3.13.1": "3.15.2",
"js-yaml@^4.1.0": "4.3.2",
"nanoid": "^3.3.18",
"tmp": "^0.2.6",
"qs": "^6.16.0",
"brace-expansion@^1.1.7": "1.1.18",
"brace-expansion@^5.0.2": "5.0.9",
"browserslist": "^4.28.8",
"baseline-browser-mapping": "^2.11.21",
"joi": "^17.13.7",
"body-parser": "^1.20.6",
"cookie": "^0.7.2",
"on-headers": "^1.1.0",
"@tootallnate/once": "^2.0.1",
"yaml@2.3.1": "2.8.3",
"csv-parse": "^7.0.2"
},
"author": "Frigade Inc.",
"packageManager": "yarn@4.1.1"
"packageManager": "pnpm@10.34.6",
"engines": {
"node": ">=24"
},
"pnpm": {
"overrides": {
"tar": "^7.5.21",
"uuid": "^11.1.1",
"serialize-javascript": "^7.0.5",
"ip-address": "^10.1.1",
"express>path-to-regexp": "0.1.13",
"minimatch@9.0.3": "9.0.7",
"js-yaml@^3.6.1": "3.15.2",
"js-yaml@^3.13.0": "3.15.2",
"js-yaml@^3.13.1": "3.15.2",
"js-yaml@^4.1.0": "4.3.2",
"nanoid": "^3.3.18",
"tmp": "^0.2.6",
"qs": "^6.16.0",
"browserslist": "^4.28.8",
"baseline-browser-mapping": "^2.11.21",
"joi": "^17.13.7",
"body-parser": "^1.20.6",
"cookie": "^0.7.2",
"on-headers": "^1.1.0",
"@tootallnate/once": "^2.0.1",
"yaml@2.3.1": "2.8.3",
"csv-parse": "^7.0.2",
"brace-expansion@^1.1.7": "1.1.21",
"brace-expansion@^5.0.2": "5.0.12"
},
"onlyBuiltDependencies": [
"@swc/core",
"esbuild"
]
}
}
16 changes: 0 additions & 16 deletions packages/js-api/.babelrc.json

This file was deleted.

26 changes: 6 additions & 20 deletions packages/js-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,13 @@
"Javascript"
],
"devDependencies": {
"@babel/core": "^7.15.8",
"@babel/plugin-transform-runtime": "^7.19.6",
"@babel/preset-env": "^7.21.5",
"@babel/preset-typescript": "^7.21.5",
"@types/jest": "^29.5.12",
"babel-jest": "^29.4.1",
"cross-fetch": "^4.0.0",
"husky": "^8.0.3",
"jest": "^29.7.0",
"jest-config": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^13.0.0",
"@types/jest": "^30.0.0",
"jest": "^30.5.2",
"jest-environment-jsdom": "^30.5.2",
"prettier": "^2.4.1",
"prop-types": "^15.8.1",
"rimraf": "^5.0.0",
"ts-jest": "^29.1.0",
"ts-jest": "^29.4.14",
"tsup": "^6.7.0",
"typedoc": "^0.25.8",
"typedoc-plugin-markdown": "^3.17.1",
"typescript": "^4.9.4"
"typescript": "^5.9.3"
},
"author": "Frigade Inc.",
"license": "ELv2",
Expand All @@ -67,6 +54,5 @@
"homepage": "https://github.com/FrigadeHQ/javascript/tree/main/packages/js-api#readme",
"dependencies": {
"uuid": "^11.1.1"
},
"packageManager": "yarn@3.6.2"
}
}
31 changes: 12 additions & 19 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@
"clean": "rimraf ./dist",
"test": "jest --passWithNoTests",
"lint": "eslint --fix --ext .ts,.tsx .",
"build": "yarn clean && tsup",
"build": "pnpm clean && tsup",
"local-release": "tsup",
"prepublish": "node prepublish.mjs",
"prepare": "cd ../../ && husky"
"prepublish": "node prepublish.mjs"
},
"dependencies": {
"@emotion/react": "^11.14.0",
Expand All @@ -73,35 +72,29 @@
"react-dom": "17 - 19"
},
"devDependencies": {
"@types/dompurify": "^3.0.5",
"@types/jest": "^23.3.1",
"@types/node": "^20.10.5",
"@types/jest": "^30.0.0",
"@types/node": "^24.19.1",
"@types/react": "^18.2.34",
"@types/react-dom": "^18.2.14",
"@types/use-sync-external-store": "^0.0.6",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"embla-carousel": "^8.6.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-react-refresh": "^0.4.5",
"jest": "^29.7.0",
"jest-config": "^29.6.2",
"jest-environment-jsdom": "^29.6.2",
"jest": "^30.5.2",
"jest-environment-jsdom": "^30.5.2",
"prettier": "^2.4.1",
"rimraf": "^4.1.2",
"ts-jest": "^29.1.0",
"rimraf": "^6.1.3",
"ts-jest": "^29.4.14",
"tsup": "^6.7.0",
"typedoc": "^0.25.12",
"typedoc-plugin-markdown": "^3.17.1",
"typescript": "^4.9.4"
},
"resolutions": {
"jsdom": "^22.1.0"
"typescript": "^5.9.3"
},
"release": {
"branches": [
"main"
]
},
"packageManager": "yarn@3.6.2"
}
}
8 changes: 0 additions & 8 deletions packages/react/release-local.sh

This file was deleted.

Loading
Loading