From c082208b63220660598001b713aa72f81b771abe Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:22:54 +0000 Subject: [PATCH 01/28] Prepare monorepo for npm publish --- apps/designer/remix.config.js | 3 +++ package.json | 3 ++- .../.github/workflows/react-sdk-publish.yml | 17 +++++++++++++++++ packages/webstudio-react-sdk/package.json | 5 +++-- turbo.json | 3 +++ 5 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 packages/webstudio-react-sdk/.github/workflows/react-sdk-publish.yml diff --git a/apps/designer/remix.config.js b/apps/designer/remix.config.js index 7f626ae9c0..a4431ce1e2 100644 --- a/apps/designer/remix.config.js +++ b/apps/designer/remix.config.js @@ -17,4 +17,7 @@ module.exports = { // assetsBuildDirectory: "public/build", serverBuildPath: "api/index.js", // publicPath: "/build/", + watchPaths: () => { + return ["../../packages/webstudio-react-sdk/lib/**/*"]; + }, }; diff --git a/package.json b/package.json index 504f3f4a01..643cfdd494 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,8 @@ "dev": "turbo run dev --parallel", "format": "prettier --write \"**/*.{ts,tsx,md}\"", "prepare": "husky install", - "storybook": "turbo run storybook:run" + "storybook": "turbo run storybook:run", + "publish:react-sdk": "turbo run prepublishOnly --filter react-sdk" }, "devDependencies": { "eslint-config-custom": "*", diff --git a/packages/webstudio-react-sdk/.github/workflows/react-sdk-publish.yml b/packages/webstudio-react-sdk/.github/workflows/react-sdk-publish.yml new file mode 100644 index 0000000000..813d4e13ad --- /dev/null +++ b/packages/webstudio-react-sdk/.github/workflows/react-sdk-publish.yml @@ -0,0 +1,17 @@ +on: push + +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 + - run: yar publish:react-sdk + - uses: JS-DevTools/npm-publish@v1 + with: + token: ${{ secrets.NPM_TOKEN }} + dry-run: true + check-version: true + greater-version-only: true \ No newline at end of file diff --git a/packages/webstudio-react-sdk/package.json b/packages/webstudio-react-sdk/package.json index 82f8ef3b18..8cfe4c60a6 100644 --- a/packages/webstudio-react-sdk/package.json +++ b/packages/webstudio-react-sdk/package.json @@ -5,6 +5,7 @@ "author": "Webstudio ", "homepage": "https://webstudio.is", "scripts": { + "dev": "tsc -w", "build": "yarn build:mdn-data && yarn build:args", "build:mdn-data": "./bin/mdn-data.ts ./src/css", "build:args": "./bin/generate-arg-types.ts './src/components/*.tsx !./src/**/*.stories.tsx'", @@ -14,7 +15,7 @@ "postinstall": "prisma generate", "test": "jest", "checks": "yarn typecheck && yarn test", - "prepublishOnly": "yarn checks && yarn build:lib", + "prepublishOnly": "yarn install && yarn checks && yarn build:lib", "storybook:run": "start-storybook -p 6006", "storybook:build": "build-storybook" }, @@ -64,7 +65,7 @@ "react-nano-state": "^0.4.0", "zod": "^3.17.3" }, - "main": "src/index.ts", + "main": "lib/index.js", "types": "src/index.ts", "files": [ "README.md", diff --git a/turbo.json b/turbo.json index 7c9bd87ce1..885887f547 100644 --- a/turbo.json +++ b/turbo.json @@ -12,6 +12,9 @@ }, "storybook:run": { "cache": false + }, + "prepublishOnly": { + "cache": false } } } From f54a8511ab2b9d0ba60460afbc4d508979e0f791 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:30:23 +0000 Subject: [PATCH 02/28] fix: location of sdk workflow --- .github/workflows/react-sdk-publish.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/react-sdk-publish.yml diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml new file mode 100644 index 0000000000..813d4e13ad --- /dev/null +++ b/.github/workflows/react-sdk-publish.yml @@ -0,0 +1,17 @@ +on: push + +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 + - run: yar publish:react-sdk + - uses: JS-DevTools/npm-publish@v1 + with: + token: ${{ secrets.NPM_TOKEN }} + dry-run: true + check-version: true + greater-version-only: true \ No newline at end of file From 34276189472f51d70499f78c0ce83ac9e37e22e5 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:31:06 +0000 Subject: [PATCH 03/28] fix: typo --- .github/workflows/react-sdk-publish.yml | 2 +- .../.github/workflows/react-sdk-publish.yml | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 packages/webstudio-react-sdk/.github/workflows/react-sdk-publish.yml diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index 813d4e13ad..18eae0ce31 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 - - run: yar publish:react-sdk + - run: yarn publish:react-sdk - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} diff --git a/packages/webstudio-react-sdk/.github/workflows/react-sdk-publish.yml b/packages/webstudio-react-sdk/.github/workflows/react-sdk-publish.yml deleted file mode 100644 index 813d4e13ad..0000000000 --- a/packages/webstudio-react-sdk/.github/workflows/react-sdk-publish.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: push - -jobs: - publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 16 - - run: yar publish:react-sdk - - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.NPM_TOKEN }} - dry-run: true - check-version: true - greater-version-only: true \ No newline at end of file From d19a94a7c0379e06b090cdd61ba0af4b87c04da7 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:32:33 +0000 Subject: [PATCH 04/28] fix: sdk release --- .github/workflows/react-sdk-publish.yml | 2 ++ packages/react-sdk/package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index 18eae0ce31..aceb07016b 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -1,3 +1,4 @@ +name: SDK publish on: push jobs: @@ -8,6 +9,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 + - run: yarn install - run: yarn publish:react-sdk - uses: JS-DevTools/npm-publish@v1 with: diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index f7855a4feb..accf3043f0 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -15,7 +15,7 @@ "postinstall": "prisma generate", "test": "jest", "checks": "yarn typecheck && yarn test", - "prepublishOnly": "yarn install && yarn checks && yarn build:lib", + "prepublishOnly": "yarn checks && yarn build:lib", "storybook:run": "start-storybook -p 6006", "storybook:build": "build-storybook" }, From c20c3afa101ff5e9d3a6e95da6b74315a1079b46 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:36:33 +0000 Subject: [PATCH 05/28] Testing release --- .github/workflows/main.yml | 5 ++++- .github/workflows/react-sdk-publish.yml | 6 ++++-- packages/react-sdk/package.json | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28f1650665..8c4ce01d54 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,5 +1,8 @@ name: Main workflow -on: [push] +on: + push: + paths: + - '!packages/react-sdk/**' jobs: checks: env: diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index aceb07016b..2c8aae9897 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -1,6 +1,8 @@ name: SDK publish -on: push - +on: + push: + paths: + - 'packages/react-sdk/**' jobs: publish: runs-on: ubuntu-latest diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index accf3043f0..b07c9119df 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -1,5 +1,5 @@ { - "name": "@webstudio-is/react-sdk", + "name": "andras-testing-npm-release-flow-thankyou", "version": "0.5.0", "description": "Webstudio JavaScript / TypeScript API", "author": "Webstudio ", From d7053156dfe2f62eccacdebb0eab4328c93b9f53 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:38:25 +0000 Subject: [PATCH 06/28] Haha, this does not work --- packages/react-sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index b07c9119df..accf3043f0 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -1,5 +1,5 @@ { - "name": "andras-testing-npm-release-flow-thankyou", + "name": "@webstudio-is/react-sdk", "version": "0.5.0", "description": "Webstudio JavaScript / TypeScript API", "author": "Webstudio ", From 901b64be43b371e98d978561fb7620071e657b7b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:45:34 +0000 Subject: [PATCH 07/28] Testing release --- .github/workflows/react-sdk-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index 2c8aae9897..af0a047c2f 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -12,10 +12,10 @@ jobs: with: node-version: 16 - run: yarn install - - run: yarn publish:react-sdk + - run: yarn prepublishOnly - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} dry-run: true check-version: true - greater-version-only: true \ No newline at end of file + package: './packages/react-sdk/package.json' \ No newline at end of file From dd9e336961649a1a8bf9e262c720d470b321b22f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:46:22 +0000 Subject: [PATCH 08/28] test --- packages/react-sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index accf3043f0..43e1e61460 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/react-sdk", - "version": "0.5.0", + "version": "0.5.1", "description": "Webstudio JavaScript / TypeScript API", "author": "Webstudio ", "homepage": "https://webstudio.is", From efd4c18aeb17b4406cc53edc4cc5eb0693207be5 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:51:15 +0000 Subject: [PATCH 09/28] test --- .github/workflows/react-sdk-publish.yml | 2 +- packages/react-sdk/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index af0a047c2f..df1f917c95 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -12,7 +12,7 @@ jobs: with: node-version: 16 - run: yarn install - - run: yarn prepublishOnly + - run: yarn publish:react-sdk - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index 43e1e61460..accf3043f0 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/react-sdk", - "version": "0.5.1", + "version": "0.5.0", "description": "Webstudio JavaScript / TypeScript API", "author": "Webstudio ", "homepage": "https://webstudio.is", From 0f1ce956a34d08e69df33d0371ff196a88e68008 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 08:59:17 +0000 Subject: [PATCH 10/28] test --- .github/workflows/react-sdk-publish.yml | 1 - package.json | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index df1f917c95..8c38793a00 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -12,7 +12,6 @@ jobs: with: node-version: 16 - run: yarn install - - run: yarn publish:react-sdk - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} diff --git a/package.json b/package.json index 643cfdd494..504f3f4a01 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,7 @@ "dev": "turbo run dev --parallel", "format": "prettier --write \"**/*.{ts,tsx,md}\"", "prepare": "husky install", - "storybook": "turbo run storybook:run", - "publish:react-sdk": "turbo run prepublishOnly --filter react-sdk" + "storybook": "turbo run storybook:run" }, "devDependencies": { "eslint-config-custom": "*", From 074c447718d36b1bbd7894ccc3d318a559e9e9d9 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 09:00:25 +0000 Subject: [PATCH 11/28] update --- .github/workflows/react-sdk-publish.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index 8c38793a00..eef15b5212 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -2,7 +2,8 @@ name: SDK publish on: push: paths: - - 'packages/react-sdk/**' + - 'packages/react-sdk/**/*' + - '.github/workflows/react-sdk-publish.yml' jobs: publish: runs-on: ubuntu-latest From 50b86b62c023c2da6b20f424460ad40052cacd1a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 09:04:21 +0000 Subject: [PATCH 12/28] Update --- .github/workflows/react-sdk-publish.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index eef15b5212..e754ace9ef 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -7,6 +7,9 @@ on: jobs: publish: runs-on: ubuntu-latest + defaults: + run: + working-directory: 'packages/react-sdk/' steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -17,5 +20,4 @@ jobs: with: token: ${{ secrets.NPM_TOKEN }} dry-run: true - check-version: true - package: './packages/react-sdk/package.json' \ No newline at end of file + check-version: true \ No newline at end of file From 762ca92cb83b1e5e795e24c0de3e9643b138ad43 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 09:07:52 +0000 Subject: [PATCH 13/28] Update --- .github/workflows/react-sdk-publish.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index e754ace9ef..b943f545c7 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -4,12 +4,13 @@ on: paths: - 'packages/react-sdk/**/*' - '.github/workflows/react-sdk-publish.yml' + +defaults: + run: + working-directory: 'packages/react-sdk' jobs: publish: runs-on: ubuntu-latest - defaults: - run: - working-directory: 'packages/react-sdk/' steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 From b055b65126cfcaf9ff31b19958b2a9b57f6d99bb Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 09:10:14 +0000 Subject: [PATCH 14/28] Update --- .github/workflows/react-sdk-publish.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index b943f545c7..2a05a7fe0c 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -4,10 +4,6 @@ on: paths: - 'packages/react-sdk/**/*' - '.github/workflows/react-sdk-publish.yml' - -defaults: - run: - working-directory: 'packages/react-sdk' jobs: publish: runs-on: ubuntu-latest @@ -16,7 +12,9 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 - - run: yarn install + - name: Install Dependencies + run: yarn install + working-directory: ./packages/react-sdk - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} From 4e6a4d335d908cbea52cb9bcfa6418e7841c6182 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 09:19:39 +0000 Subject: [PATCH 15/28] Updates --- .github/workflows/react-sdk-publish.yml | 4 ++-- packages/react-sdk/package.json | 1 + turbo.json | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index 2a05a7fe0c..b84f567daa 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -14,9 +14,9 @@ jobs: node-version: 16 - name: Install Dependencies run: yarn install - working-directory: ./packages/react-sdk - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} dry-run: true - check-version: true \ No newline at end of file + check-version: true + package: './packages/react-sdk/package.json' \ No newline at end of file diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index accf3043f0..fb049632c4 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -66,6 +66,7 @@ "main": "lib/index.js", "types": "src/index.ts", "files": [ + "lib/*", "README.md", "!*.test.*", "prisma/*" diff --git a/turbo.json b/turbo.json index 885887f547..7c9bd87ce1 100644 --- a/turbo.json +++ b/turbo.json @@ -12,9 +12,6 @@ }, "storybook:run": { "cache": false - }, - "prepublishOnly": { - "cache": false } } } From 55375446c2aa61c0e2bf7c7c12b5fac9eb37c229 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 09:27:51 +0000 Subject: [PATCH 16/28] revert main workflow --- .github/workflows/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c4ce01d54..28f1650665 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,8 +1,5 @@ name: Main workflow -on: - push: - paths: - - '!packages/react-sdk/**' +on: [push] jobs: checks: env: From 0f905c1768231712053b72cf3779434122ef1e16 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 09:28:55 +0000 Subject: [PATCH 17/28] remote dry run --- .github/workflows/react-sdk-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index b84f567daa..ff7d173cff 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -17,6 +17,6 @@ jobs: - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} - dry-run: true + dry-run: false check-version: true package: './packages/react-sdk/package.json' \ No newline at end of file From 657858fe08f12f93869451dc733af6de331f3b54 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 09:38:21 +0000 Subject: [PATCH 18/28] fix: typo --- apps/designer/remix.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/designer/remix.config.js b/apps/designer/remix.config.js index a4431ce1e2..8624dba823 100644 --- a/apps/designer/remix.config.js +++ b/apps/designer/remix.config.js @@ -18,6 +18,6 @@ module.exports = { serverBuildPath: "api/index.js", // publicPath: "/build/", watchPaths: () => { - return ["../../packages/webstudio-react-sdk/lib/**/*"]; + return ["../../packages/react-sdk/lib/**/*"]; }, }; From 436216ef8edb4c7b5cb49f0c0dae41d5f96438cd Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Jul 2022 11:19:08 +0000 Subject: [PATCH 19/28] fix issues --- apps/designer/remix.config.js | 2 +- packages/react-sdk/package.json | 5 +- yarn.lock | 165 +++++++++++++++++++++++++++++++- 3 files changed, 165 insertions(+), 7 deletions(-) diff --git a/apps/designer/remix.config.js b/apps/designer/remix.config.js index 8624dba823..88fd6efdce 100644 --- a/apps/designer/remix.config.js +++ b/apps/designer/remix.config.js @@ -18,6 +18,6 @@ module.exports = { serverBuildPath: "api/index.js", // publicPath: "/build/", watchPaths: () => { - return ["../../packages/react-sdk/lib/**/*"]; + return ["../../packages/**/*"]; }, }; diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index fb049632c4..2b1b4e6447 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -5,7 +5,7 @@ "author": "Webstudio ", "homepage": "https://webstudio.is", "scripts": { - "dev": "tsc -w", + "dev": "tsup src/index.ts --format esm,cjs --watch --out-dir=lib", "build": "yarn build:mdn-data && yarn build:args", "build:mdn-data": "./bin/mdn-data.ts ./src/css", "build:args": "./bin/generate-arg-types.ts './src/components/*.tsx !./src/**/*.stories.tsx'", @@ -40,11 +40,12 @@ "esbuild": "^0.14.25", "esbuild-node-externals": "^1.4.1", "esbuild-node-loader": "^0.8.0", + "jest-config": "*", "mdn-data": "2.0.23", "react": "^17.0.2", "react-docgen-typescript": "^2.2.2", "react-dom": "^17.0.2", - "jest-config": "*", + "tsup": "^6.1.3", "typescript": "^4.6.2" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 62cd43092e..2a58f31ea9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5746,6 +5746,11 @@ ansi-to-html@^0.6.11: dependencies: entities "^2.0.0" +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -6552,6 +6557,13 @@ builtin-status-codes@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ== +bundle-require@^3.0.2: + version "3.0.4" + resolved "https://registry.yarnpkg.com/bundle-require/-/bundle-require-3.0.4.tgz#2b52ba77d99c0a586b5854cd21d36954e63cc110" + integrity sha512-VXG6epB1yrLAvWVQpl92qF347/UXmncQj7J3U8kZEbdVZ1ZkQyr4hYeL/9RvcE8vVVdp53dY78Fd/3pqfRqI1A== + dependencies: + load-tsconfig "^0.2.0" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -6580,6 +6592,11 @@ c8@^7.6.0: yargs "^16.2.0" yargs-parser "^20.2.9" +cac@^6.7.12: + version "6.7.12" + resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.12.tgz#6fb5ea2ff50bd01490dbda497f4ae75a99415193" + integrity sha512-rM7E2ygtMkJqD9c7WnFU6fruFcN3xe4FM5yUmgxhZzIKJk4uHl9U/fhwdajGFQbQuv43FAUo1Fe8gX/oIKDeSA== + cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -7117,7 +7134,7 @@ commander@^2.19.0, commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^4.1.1: +commander@^4.0.0, commander@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== @@ -7564,7 +7581,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -9785,6 +9802,18 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== +glob@7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -9838,7 +9867,7 @@ globby@10.0.0: merge2 "^1.2.3" slash "^3.0.0" -globby@^11.0.2, globby@^11.1.0: +globby@^11.0.2, globby@^11.0.3, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -11532,6 +11561,11 @@ jest@^27.5.1: import-local "^3.0.2" jest-cli "^27.5.1" +joycon@^3.0.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03" + integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw== + js-cookie@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" @@ -11803,6 +11837,11 @@ lilconfig@2.0.5: resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25" integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg== +lilconfig@^2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4" + integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg== + lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" @@ -11852,6 +11891,11 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" +load-tsconfig@^0.2.0: + version "0.2.3" + resolved "https://registry.yarnpkg.com/load-tsconfig/-/load-tsconfig-0.2.3.tgz#08af3e7744943caab0c75f8af7f1703639c3ef1f" + integrity sha512-iyT2MXws+dc2Wi6o3grCFtGXpeMvHmJqS27sMPGtV2eUu4PeFnG+33I8BlFK1t1NWMjOpcx9bridn5yxLDX2gQ== + loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" @@ -11944,6 +11988,11 @@ lodash.snakecase@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw== +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== + lodash.uniq@4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -12922,6 +12971,15 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +mz@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + nan@^2.12.1: version "2.16.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" @@ -13844,6 +13902,14 @@ postcss-flexbugs-fixes@^4.2.1: dependencies: postcss "^7.0.26" +postcss-load-config@^3.0.1: + version "3.1.4" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" + integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== + dependencies: + lilconfig "^2.0.5" + yaml "^1.10.2" + postcss-loader@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc" @@ -15109,6 +15175,13 @@ rollup-pluginutils@^2.8.1: dependencies: estree-walker "^0.6.1" +rollup@^2.74.1: + version "2.77.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.0.tgz#749eaa5ac09b6baa52acc076bc46613eddfd53f4" + integrity sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g== + optionalDependencies: + fsevents "~2.3.2" + rsvp@^4.8.4: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" @@ -15633,6 +15706,13 @@ source-map@0.5.6: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA== +source-map@0.8.0-beta.0: + version "0.8.0-beta.0" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11" + integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA== + dependencies: + whatwg-url "^7.0.0" + source-map@^0.5.0, source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -16046,6 +16126,18 @@ stylis@^4.0.6: resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.1.tgz#e46c6a9bbf7c58db1e65bb730be157311ae1fe12" integrity sha512-lVrM/bNdhVX2OgBFNa2YJ9Lxj7kPzylieHd3TNjuGE0Re9JB7joL5VUKOVH1kdNNJTgGPpT8hmwIAPLaSyEVFQ== +sucrase@^3.20.3: + version "3.24.0" + resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.24.0.tgz#66a8f2cc845bc441706ce5f3056de283289067b6" + integrity sha512-SevqflhW356TKEyWjFHg2e5f3eH+5rzmsMJxrVMDvZIEHh/goYrpzDGA6APEj4ME9MdGm8oNgIzi1eF3c3dDQA== + dependencies: + commander "^4.0.0" + glob "7.1.6" + lines-and-columns "^1.1.6" + mz "^2.7.0" + pirates "^4.0.1" + ts-interface-checker "^0.1.9" + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -16246,6 +16338,20 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== + dependencies: + any-promise "^1.0.0" + throat@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" @@ -16366,6 +16472,13 @@ tough-cookie@^4.0.0: punycode "^2.1.1" universalify "^0.1.2" +tr46@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" + integrity sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA== + dependencies: + punycode "^2.1.0" + tr46@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" @@ -16378,6 +16491,11 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== +tree-kill@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== + trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" @@ -16413,6 +16531,11 @@ ts-easing@^0.2.0: resolved "https://registry.yarnpkg.com/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec" integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ== +ts-interface-checker@^0.1.9: + version "0.1.13" + resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" + integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== + ts-morph@12.0.0: version "12.0.0" resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-12.0.0.tgz#a601c3538703755cbfa2d42b62c52df73e9dbbd7" @@ -16466,6 +16589,26 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== +tsup@^6.1.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/tsup/-/tsup-6.1.3.tgz#830e61bd823300f4690b2b2f79fc58131744551c" + integrity sha512-eRpBnbfpDFng+EJNTQ90N7QAf4HAGGC7O3buHIjroKWK7D1ibk9/YnR/3cS8HsMU5T+6Oi+cnF+yU5WmCnB//Q== + dependencies: + bundle-require "^3.0.2" + cac "^6.7.12" + chokidar "^3.5.1" + debug "^4.3.1" + esbuild "^0.14.25" + execa "^5.0.0" + globby "^11.0.3" + joycon "^3.0.1" + postcss-load-config "^3.0.1" + resolve-from "^5.0.0" + rollup "^2.74.1" + source-map "0.8.0-beta.0" + sucrase "^3.20.3" + tree-kill "^1.2.2" + tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" @@ -17209,6 +17352,11 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== +webidl-conversions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" + integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== + webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" @@ -17369,6 +17517,15 @@ whatwg-url@^5.0.0: tr46 "~0.0.3" webidl-conversions "^3.0.0" +whatwg-url@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" + integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^1.0.1" + webidl-conversions "^4.0.2" + whatwg-url@^8.0.0, whatwg-url@^8.5.0: version "8.7.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" @@ -17586,7 +17743,7 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^1.10.0, yaml@^1.7.2: +yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== From 45b6237ad639db7dd1a0c0e1ded3ec5e6121dbe9 Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Wed, 20 Jul 2022 14:28:03 +0200 Subject: [PATCH 20/28] add dev to asset uploader --- packages/asset-uploader/package.json | 15 +++++++++++---- packages/react-sdk/package.json | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json index bfde7a0fe2..3b92a15e9e 100644 --- a/packages/asset-uploader/package.json +++ b/packages/asset-uploader/package.json @@ -7,19 +7,26 @@ "scripts": { "typecheck": "tsc --noEmit", "test": "jest", - "checks": "yarn typecheck && yarn test" + "checks": "yarn typecheck && yarn test", + "dev": "tsup src/index.ts --format esm,cjs --watch --out-dir=lib" }, - "devDependencies": { + "dependencies": { "@aws-sdk/client-s3": "^3.131.0", "@aws-sdk/lib-storage": "^3.131.0", + "sharp": "^0.30.7" + }, + "devDependencies": { "@types/node": "^17.0.21", + "@types/sharp": "^0.30.4", "jest-config": "*", + "tsup": "^6.1.3", "typescript": "^4.6.2", "zod": "^3.17.3" }, - "main": "src/index.ts", - "types": "src/index.ts", + "main": "lib/index.js", + "types": "lib/index.d.ts", "files": [ + "lib/*", "README.md", "!*.test.*" ], diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index 2b1b4e6447..91ba68a141 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -62,10 +62,11 @@ "mitt": "^3.0.0", "prisma": "^3.10.0", "react-nano-state": "^0.4.0", + "jest-config": "*", "zod": "^3.17.3" }, "main": "lib/index.js", - "types": "src/index.ts", + "types": "lib/index.d.ts", "files": [ "lib/*", "README.md", From c0db99b2eb1d2ea770113d6a739de4b15aa62eb2 Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Wed, 20 Jul 2022 14:33:11 +0200 Subject: [PATCH 21/28] fix build --- packages/react-sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index 91ba68a141..f7040b9fa6 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -6,7 +6,7 @@ "homepage": "https://webstudio.is", "scripts": { "dev": "tsup src/index.ts --format esm,cjs --watch --out-dir=lib", - "build": "yarn build:mdn-data && yarn build:args", + "build": "yarn build:mdn-data && yarn build:args && yarn build:lib", "build:mdn-data": "./bin/mdn-data.ts ./src/css", "build:args": "./bin/generate-arg-types.ts './src/components/*.tsx !./src/**/*.stories.tsx'", "build:prisma": "prisma format && prisma generate", From 080c25ffe8411f520ad6684ef006297057556049 Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Wed, 20 Jul 2022 14:37:52 +0200 Subject: [PATCH 22/28] add build to asset-uploader --- packages/asset-uploader/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json index 3b92a15e9e..8f2767ca55 100644 --- a/packages/asset-uploader/package.json +++ b/packages/asset-uploader/package.json @@ -8,7 +8,8 @@ "typecheck": "tsc --noEmit", "test": "jest", "checks": "yarn typecheck && yarn test", - "dev": "tsup src/index.ts --format esm,cjs --watch --out-dir=lib" + "dev": "tsup src/index.ts --format esm,cjs --watch --out-dir=lib", + "build": "rm -fr lib && tsc" }, "dependencies": { "@aws-sdk/client-s3": "^3.131.0", From 25dc018ee7f881f3a8ad641a35ca437001c96ba1 Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Wed, 20 Jul 2022 14:40:41 +0200 Subject: [PATCH 23/28] order steps --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28f1650665..977e2968e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,5 +16,5 @@ jobs: uses: actions/checkout@v2 - run: yarn install - run: yarn prisma generate - - run: yarn checks - run: yarn build + - run: yarn checks From d25c5dd1270797ff80d90905163ddac3ea63710d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 21 Jul 2022 07:11:30 +0000 Subject: [PATCH 24/28] Testing different build script --- packages/react-sdk/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index f7040b9fa6..c3ebae90af 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -7,8 +7,8 @@ "scripts": { "dev": "tsup src/index.ts --format esm,cjs --watch --out-dir=lib", "build": "yarn build:mdn-data && yarn build:args && yarn build:lib", - "build:mdn-data": "./bin/mdn-data.ts ./src/css", - "build:args": "./bin/generate-arg-types.ts './src/components/*.tsx !./src/**/*.stories.tsx'", + "build:mdn-data": "node --experimental-loader esbuild-node-loader ./bin/mdn-data.ts ./src/css", + "build:args": "node --experimental-loader esbuild-node-loader ./bin/generate-arg-types.ts './src/components/*.tsx !./src/**/*.stories.tsx'", "build:prisma": "prisma format && prisma generate", "typecheck": "tsc --noEmit", "build:lib": "rm -fr lib && tsc", From b15ae33d833deeb18baf985d7130ff935566a7f5 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 21 Jul 2022 07:19:18 +0000 Subject: [PATCH 25/28] fix: GH action for npm --- .github/workflows/react-sdk-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index ff7d173cff..9d20567729 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -7,6 +7,7 @@ on: jobs: publish: runs-on: ubuntu-latest + environment: production steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 From 9b025db06fb2fb7f661459318a16b183cf726500 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 21 Jul 2022 07:23:01 +0000 Subject: [PATCH 26/28] revert last commit --- .github/workflows/react-sdk-publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index 9d20567729..ff7d173cff 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -7,7 +7,6 @@ on: jobs: publish: runs-on: ubuntu-latest - environment: production steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 From be0b7ed9caa3cb665b1b33824cf6e063e3188cc6 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 21 Jul 2022 09:23:57 +0000 Subject: [PATCH 27/28] Test sdk deployment --- .github/workflows/react-sdk-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index ff7d173cff..6b30cceb62 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -7,6 +7,7 @@ on: jobs: publish: runs-on: ubuntu-latest + environment: development steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 From 67558294ef8114de56240609798017f3a069ed96 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 21 Jul 2022 09:33:39 +0000 Subject: [PATCH 28/28] revert: still not working --- .github/workflows/react-sdk-publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index 6b30cceb62..ff7d173cff 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -7,7 +7,6 @@ on: jobs: publish: runs-on: ubuntu-latest - environment: development steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3