From ced3a73becde69efb7c77f3a7e40987cc397ffd7 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 12:28:17 +0000 Subject: [PATCH 01/29] renaming all packages to @webstudio-is/* --- apps/designer/package.json | 4 ++-- apps/designer/tsconfig.json | 16 +++++++++++++--- package.json | 2 +- packages/asset-uploader/package.json | 2 +- packages/asset-uploader/tsconfig.json | 2 +- packages/eslint-config-custom/package.json | 4 ++-- packages/jest-config/package.json | 4 ++-- packages/react-sdk/package.json | 4 ++-- packages/react-sdk/tsconfig.json | 2 +- packages/tsconfig/package.json | 4 ++-- 10 files changed, 27 insertions(+), 17 deletions(-) diff --git a/apps/designer/package.json b/apps/designer/package.json index beb1fdbabe..9455775165 100644 --- a/apps/designer/package.json +++ b/apps/designer/package.json @@ -127,13 +127,13 @@ "esbuild-jest": "^0.5.0", "esbuild-node-externals": "^1.4.1", "esbuild-node-loader": "^0.8.0", - "eslint-config-custom": "*", "jest": "^27.5.1", "prettier": "^2.6.2", "prisma": "^3.14.0", "react-test-renderer": "^17.0.2", "relative-deps": "^1.0.7", - "tsconfig": "*", + "@webstudio-is/eslint-config-custom": "*", + "@webstudio-is/tsconfig": "*", "typescript": "4.6.4" }, "sideEffects": false, diff --git a/apps/designer/tsconfig.json b/apps/designer/tsconfig.json index fbf716785d..f30c095e48 100644 --- a/apps/designer/tsconfig.json +++ b/apps/designer/tsconfig.json @@ -1,11 +1,21 @@ { - // Extends can't use node's resolution rn https://github.com/dividab/tsconfig-paths/issues/209#issuecomment-1177261091 - "extends": "../../node_modules/tsconfig/remix.json", + "extends": "../../node_modules/@webstudio-is/tsconfig/remix.json", "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"], "compilerOptions": { "paths": { "~/*": ["app/*"] }, - "baseUrl": "." + "baseUrl": ".", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "lib": ["DOM", "DOM.Iterable", "ES2019"], + "strict": true, + "target": "ES2019", + "esModuleInterop": true, + "isolatedModules": true, + "jsx": "react-jsx", + "moduleResolution": "node", + "noEmit": true, + "resolveJsonModule": true } } diff --git a/package.json b/package.json index 504f3f4a01..cbcd14529f 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "storybook": "turbo run storybook:run" }, "devDependencies": { - "eslint-config-custom": "*", + "@webstudio-is/eslint-config-custom": "*", "husky": ">=6", "lint-staged": "^13.0.2", "prettier": "latest", diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json index 8f2767ca55..48f9d6e376 100644 --- a/packages/asset-uploader/package.json +++ b/packages/asset-uploader/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@types/node": "^17.0.21", "@types/sharp": "^0.30.4", - "jest-config": "*", + "@webstudio-is/jest-config": "*", "tsup": "^6.1.3", "typescript": "^4.6.2", "zod": "^3.17.3" diff --git a/packages/asset-uploader/tsconfig.json b/packages/asset-uploader/tsconfig.json index fe21c2ae7b..654f479a30 100644 --- a/packages/asset-uploader/tsconfig.json +++ b/packages/asset-uploader/tsconfig.json @@ -1,6 +1,6 @@ // Extends can't use node's resolution rn https://github.com/dividab/tsconfig-paths/issues/209#issuecomment-1177261091 { - "extends": "../../node_modules/tsconfig/base.json", + "extends": "../../node_modules/@webstudio-is/tsconfig/base.json", "include": ["./src/**/*.ts"], "compilerOptions": { "module": "commonjs", diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json index 158b766152..0cf8f85421 100644 --- a/packages/eslint-config-custom/package.json +++ b/packages/eslint-config-custom/package.json @@ -1,6 +1,6 @@ { - "name": "eslint-config-custom", - "version": "0.0.0", + "name": "@webstudio-is/eslint-config-custom", + "version": "0.1.0", "main": "index.js", "license": "MIT", "dependencies": { diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json index ef615bcf82..4cb8210ce8 100644 --- a/packages/jest-config/package.json +++ b/packages/jest-config/package.json @@ -1,6 +1,6 @@ { - "name": "jest-config", - "version": "0.0.0", + "name": "@webstudio-is/jest-config", + "version": "0.1.0", "license": "MIT", "dependencies": { "@types/jest": "^27.4.1", diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index c3ebae90af..32cd0000b4 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -40,7 +40,7 @@ "esbuild": "^0.14.25", "esbuild-node-externals": "^1.4.1", "esbuild-node-loader": "^0.8.0", - "jest-config": "*", + "@webstudio-is/jest-config": "*", "mdn-data": "2.0.23", "react": "^17.0.2", "react-docgen-typescript": "^2.2.2", @@ -62,7 +62,7 @@ "mitt": "^3.0.0", "prisma": "^3.10.0", "react-nano-state": "^0.4.0", - "jest-config": "*", + "@webstudio-is/jest-config": "*", "zod": "^3.17.3" }, "main": "lib/index.js", diff --git a/packages/react-sdk/tsconfig.json b/packages/react-sdk/tsconfig.json index 329cf3ea13..e599e806b6 100644 --- a/packages/react-sdk/tsconfig.json +++ b/packages/react-sdk/tsconfig.json @@ -1,6 +1,6 @@ // Extends can't use node's resolution rn https://github.com/dividab/tsconfig-paths/issues/209#issuecomment-1177261091 { - "extends": "../../node_modules/tsconfig/base.json", + "extends": "../../node_modules/@webstudio-is/tsconfig/base.json", "include": ["./src/**/*.ts", "./src/**/*.tsx"], "compilerOptions": { "lib": ["DOM", "DOM.Iterable", "ES2019"], diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json index a32fc41922..020b259d05 100644 --- a/packages/tsconfig/package.json +++ b/packages/tsconfig/package.json @@ -1,6 +1,6 @@ { - "name": "tsconfig", - "version": "0.0.0", + "name": "@webstudio-is/tsconfig", + "version": "0.1.0", "private": true, "main": "index.js", "files": [ From 78c9d59290468ad10fa100ce28c6cc0c034bb69f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 12:33:47 +0000 Subject: [PATCH 02/29] fix --- packages/react-sdk/jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-sdk/jest.config.js b/packages/react-sdk/jest.config.js index 03c0db11ea..8d742b1b6c 100644 --- a/packages/react-sdk/jest.config.js +++ b/packages/react-sdk/jest.config.js @@ -1,5 +1,5 @@ // eslint-disable-next-line -const base = require("jest-config/jest.config.js"); +const base = require("@webstudio-is/jest-config/jest.config.js"); module.exports = { ...base, From c4915922df509f67f53695cfa8a259131f771529 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 12:34:00 +0000 Subject: [PATCH 03/29] GH Action for eslint-config-custom --- .../eslint-config-custom-publish.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/eslint-config-custom-publish.yml diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/eslint-config-custom-publish.yml new file mode 100644 index 0000000000..6d98459a35 --- /dev/null +++ b/.github/workflows/eslint-config-custom-publish.yml @@ -0,0 +1,22 @@ +name: Eslint Config Publish +on: + push: + paths: + - 'packages/eslint-config-custom/**/*' + - '.github/workflows/eslint-config-custom-publish.yml' +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Install Dependencies + run: yarn install + - uses: JS-DevTools/npm-publish@v1 + with: + token: ${{ secrets.NPM_TOKEN }} + dry-run: false + check-version: true + package: './packages/eslint-config-custom/package.json' \ No newline at end of file From 3b3fc964af70da929b57c8aaa3856135df1899ce Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 12:40:38 +0000 Subject: [PATCH 04/29] GH Action for jest-config --- .github/workflows/jest-config-publish.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/jest-config-publish.yml diff --git a/.github/workflows/jest-config-publish.yml b/.github/workflows/jest-config-publish.yml new file mode 100644 index 0000000000..b70d4a51f6 --- /dev/null +++ b/.github/workflows/jest-config-publish.yml @@ -0,0 +1,22 @@ +name: Jest Config Publish +on: + push: + paths: + - 'packages/jest-config/**/*' + - '.github/workflows/jest-config-publish.yml' +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Install Dependencies + run: yarn install + - uses: JS-DevTools/npm-publish@v1 + with: + token: ${{ secrets.NPM_TOKEN }} + dry-run: false + check-version: true + package: './packages/jest-config/package.json' \ No newline at end of file From 633669d69aaa23b543bf6f0e45cd1bb638abc827 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 12:49:54 +0000 Subject: [PATCH 05/29] GH Action for tsconfig --- .github/workflows/tsconfig-publish.yml | 22 ++++++++++++++++++++++ packages/tsconfig/package.json | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/tsconfig-publish.yml diff --git a/.github/workflows/tsconfig-publish.yml b/.github/workflows/tsconfig-publish.yml new file mode 100644 index 0000000000..1f325079e3 --- /dev/null +++ b/.github/workflows/tsconfig-publish.yml @@ -0,0 +1,22 @@ +name: Tsconfig Publish +on: + push: + paths: + - 'packages/tsconfig/**/*' + - '.github/workflows/tsconfig-publish.yml' +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Install Dependencies + run: yarn install + - uses: JS-DevTools/npm-publish@v1 + with: + token: ${{ secrets.NPM_TOKEN }} + dry-run: false + check-version: true + package: './packages/tsconfig/package.json' \ No newline at end of file diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json index 020b259d05..f68ef3fdd2 100644 --- a/packages/tsconfig/package.json +++ b/packages/tsconfig/package.json @@ -1,7 +1,7 @@ { "name": "@webstudio-is/tsconfig", "version": "0.1.0", - "private": true, + "private": false, "main": "index.js", "files": [ "base.json", From 6495901956c61ab2173921d7fbb58854ef4c119a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 13:32:16 +0000 Subject: [PATCH 06/29] fix --- .github/workflows/tsconfig-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tsconfig-publish.yml b/.github/workflows/tsconfig-publish.yml index 1f325079e3..a50c55fc71 100644 --- a/.github/workflows/tsconfig-publish.yml +++ b/.github/workflows/tsconfig-publish.yml @@ -19,4 +19,5 @@ jobs: token: ${{ secrets.NPM_TOKEN }} dry-run: false check-version: true + access: 'public' package: './packages/tsconfig/package.json' \ No newline at end of file From 85a674cc02f7ed46a8446960c90e74eb0e881986 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 13:50:23 +0000 Subject: [PATCH 07/29] packages should be public --- .github/workflows/eslint-config-custom-publish.yml | 1 + .github/workflows/jest-config-publish.yml | 1 + .github/workflows/react-sdk-publish.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/eslint-config-custom-publish.yml index 6d98459a35..1c35ddc517 100644 --- a/.github/workflows/eslint-config-custom-publish.yml +++ b/.github/workflows/eslint-config-custom-publish.yml @@ -19,4 +19,5 @@ jobs: token: ${{ secrets.NPM_TOKEN }} dry-run: false check-version: true + access: 'public' package: './packages/eslint-config-custom/package.json' \ No newline at end of file diff --git a/.github/workflows/jest-config-publish.yml b/.github/workflows/jest-config-publish.yml index b70d4a51f6..ddc06c6b19 100644 --- a/.github/workflows/jest-config-publish.yml +++ b/.github/workflows/jest-config-publish.yml @@ -19,4 +19,5 @@ jobs: token: ${{ secrets.NPM_TOKEN }} dry-run: false check-version: true + access: 'public' package: './packages/jest-config/package.json' \ No newline at end of file diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index ff7d173cff..4f4e55cfad 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -19,4 +19,5 @@ jobs: token: ${{ secrets.NPM_TOKEN }} dry-run: false check-version: true + access: 'public' package: './packages/react-sdk/package.json' \ No newline at end of file From aba8046a95535815d59f603386d48faadd51b0d2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 14:38:38 +0000 Subject: [PATCH 08/29] bumping version of eslint-config-custom --- packages/eslint-config-custom/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json index 0cf8f85421..30efd8e4c4 100644 --- a/packages/eslint-config-custom/package.json +++ b/packages/eslint-config-custom/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/eslint-config-custom", - "version": "0.1.0", + "version": "1.0.0", "main": "index.js", "license": "MIT", "dependencies": { From 3760aa18abf0de743812d9329656e3a75d4098f6 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 14:54:18 +0000 Subject: [PATCH 09/29] bump packages version --- packages/jest-config/package.json | 2 +- packages/tsconfig/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json index 4cb8210ce8..2e710e9dfc 100644 --- a/packages/jest-config/package.json +++ b/packages/jest-config/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/jest-config", - "version": "0.1.0", + "version": "1.0.0", "license": "MIT", "dependencies": { "@types/jest": "^27.4.1", diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json index f68ef3fdd2..56f2bd444d 100644 --- a/packages/tsconfig/package.json +++ b/packages/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/tsconfig", - "version": "0.1.0", + "version": "1.0.0", "private": false, "main": "index.js", "files": [ From 90030e3b35ce8cd5e54d42221237b063f2b91b2a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 19:18:21 +0000 Subject: [PATCH 10/29] fix: eslint --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 46722ae2da..92f30898c7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,5 @@ module.exports = { root: true, // This tells ESLint to load the config from the package `eslint-config-custom` - extends: ["custom"], + extends: ["@webstudio-is/eslint-config-custom"], }; From e90fb68ca745993483b8e061cbbece869869fe86 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 19:21:43 +0000 Subject: [PATCH 11/29] fix: jest for asset-uploader --- packages/asset-uploader/jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/asset-uploader/jest.config.js b/packages/asset-uploader/jest.config.js index 03c0db11ea..8d742b1b6c 100644 --- a/packages/asset-uploader/jest.config.js +++ b/packages/asset-uploader/jest.config.js @@ -1,5 +1,5 @@ // eslint-disable-next-line -const base = require("jest-config/jest.config.js"); +const base = require("@webstudio-is/jest-config/jest.config.js"); module.exports = { ...base, From 5df30b348962a193a7a031bec55fa0e0e699d1db Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 19:32:23 +0000 Subject: [PATCH 12/29] fix: tsconfig for prisma-client --- packages/prisma-client/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/prisma-client/tsconfig.json b/packages/prisma-client/tsconfig.json index e895781976..ff828da22f 100644 --- a/packages/prisma-client/tsconfig.json +++ b/packages/prisma-client/tsconfig.json @@ -1,6 +1,6 @@ // Extends can't use node's resolution rn https://github.com/dividab/tsconfig-paths/issues/209#issuecomment-1177261091 { - "extends": "../../node_modules/tsconfig/base.json", + "extends": "../../node_modules/@webstudio-is/tsconfig/base.json", "include": ["./src/**/*.ts"], "compilerOptions": { "module": "commonjs", From 2e959ed1d845423857c7e732a3c11683424900f6 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 21:05:36 +0000 Subject: [PATCH 13/29] fix mistake --- apps/designer/tsconfig.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/apps/designer/tsconfig.json b/apps/designer/tsconfig.json index f30c095e48..4ce92c95f5 100644 --- a/apps/designer/tsconfig.json +++ b/apps/designer/tsconfig.json @@ -5,17 +5,6 @@ "paths": { "~/*": ["app/*"] }, - "baseUrl": ".", - "allowJs": true, - "forceConsistentCasingInFileNames": true, - "lib": ["DOM", "DOM.Iterable", "ES2019"], - "strict": true, - "target": "ES2019", - "esModuleInterop": true, - "isolatedModules": true, - "jsx": "react-jsx", - "moduleResolution": "node", - "noEmit": true, - "resolveJsonModule": true + "baseUrl": "." } } From 4466e747a84949b1b0bfb41965ea7f04e885567a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 22 Jul 2022 21:07:32 +0000 Subject: [PATCH 14/29] rename jest.config.js to index.js in packages --- packages/asset-uploader/jest.config.js | 2 +- packages/jest-config/{jest.config.js => index.js} | 0 packages/jest-config/package.json | 2 +- packages/react-sdk/jest.config.js | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename packages/jest-config/{jest.config.js => index.js} (100%) diff --git a/packages/asset-uploader/jest.config.js b/packages/asset-uploader/jest.config.js index 8d742b1b6c..9eae0843c6 100644 --- a/packages/asset-uploader/jest.config.js +++ b/packages/asset-uploader/jest.config.js @@ -1,5 +1,5 @@ // eslint-disable-next-line -const base = require("@webstudio-is/jest-config/jest.config.js"); +const base = require("@webstudio-is/jest-config"); module.exports = { ...base, diff --git a/packages/jest-config/jest.config.js b/packages/jest-config/index.js similarity index 100% rename from packages/jest-config/jest.config.js rename to packages/jest-config/index.js diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json index 2e710e9dfc..001d6d9a39 100644 --- a/packages/jest-config/package.json +++ b/packages/jest-config/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/jest-config", - "version": "1.0.0", + "version": "1.0.1", "license": "MIT", "dependencies": { "@types/jest": "^27.4.1", diff --git a/packages/react-sdk/jest.config.js b/packages/react-sdk/jest.config.js index 8d742b1b6c..9eae0843c6 100644 --- a/packages/react-sdk/jest.config.js +++ b/packages/react-sdk/jest.config.js @@ -1,5 +1,5 @@ // eslint-disable-next-line -const base = require("@webstudio-is/jest-config/jest.config.js"); +const base = require("@webstudio-is/jest-config"); module.exports = { ...base, From fe717d037a94c4d1bac1c0326eb15fba34fa1b9a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 18:29:05 +0000 Subject: [PATCH 15/29] Checking shared github actions --- .github/actions/publish/base.yaml | 20 +++++++++++++++++++ .../eslint-config-custom-publish.yml | 16 +++------------ 2 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 .github/actions/publish/base.yaml diff --git a/.github/actions/publish/base.yaml b/.github/actions/publish/base.yaml new file mode 100644 index 0000000000..2a03c0edf4 --- /dev/null +++ b/.github/actions/publish/base.yaml @@ -0,0 +1,20 @@ +inputs: + package: + description: 'Package.json location (relative)' + default: null +runs: + using: "composite" + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Install Dependencies + run: yarn install + - uses: JS-DevTools/npm-publish@v1 + with: + token: ${{ secrets.NPM_TOKEN }} + dry-run: false + check-version: true + access: 'public' + package: $ {{ inputs.package }} \ No newline at end of file diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/eslint-config-custom-publish.yml index 1c35ddc517..5ef6940ba5 100644 --- a/.github/workflows/eslint-config-custom-publish.yml +++ b/.github/workflows/eslint-config-custom-publish.yml @@ -8,16 +8,6 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 16 - - name: Install Dependencies - run: yarn install - - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.NPM_TOKEN }} - dry-run: false - check-version: true - access: 'public' - package: './packages/eslint-config-custom/package.json' \ No newline at end of file + - uses: ./.github/actions/publish/base + with: + package: './packages/eslint-config-custom/package.json' \ No newline at end of file From 11fae1cbbb0dd79da9a38b7e4714a18572b6734d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 18:30:47 +0000 Subject: [PATCH 16/29] fix --- .github/actions/publish/{base.yaml => action.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/actions/publish/{base.yaml => action.yaml} (96%) diff --git a/.github/actions/publish/base.yaml b/.github/actions/publish/action.yaml similarity index 96% rename from .github/actions/publish/base.yaml rename to .github/actions/publish/action.yaml index 2a03c0edf4..0b0da43bfa 100644 --- a/.github/actions/publish/base.yaml +++ b/.github/actions/publish/action.yaml @@ -1,7 +1,7 @@ inputs: package: description: 'Package.json location (relative)' - default: null + default: '' runs: using: "composite" steps: From bb3a23a3b499c7d9db21056dc4d336efd1db3ea0 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 18:33:36 +0000 Subject: [PATCH 17/29] fix --- .github/workflows/eslint-config-custom-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/eslint-config-custom-publish.yml index 5ef6940ba5..56bcee848a 100644 --- a/.github/workflows/eslint-config-custom-publish.yml +++ b/.github/workflows/eslint-config-custom-publish.yml @@ -8,6 +8,6 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: ./.github/actions/publish/base + - uses: ./.github/actions/publish with: package: './packages/eslint-config-custom/package.json' \ No newline at end of file From 5815649d1cc491b4266ec379dc7e387f693a2190 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 18:35:45 +0000 Subject: [PATCH 18/29] fix --- .github/workflows/eslint-config-custom-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/eslint-config-custom-publish.yml index 56bcee848a..0cb4edea42 100644 --- a/.github/workflows/eslint-config-custom-publish.yml +++ b/.github/workflows/eslint-config-custom-publish.yml @@ -8,6 +8,7 @@ jobs: publish: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v3 - uses: ./.github/actions/publish with: package: './packages/eslint-config-custom/package.json' \ No newline at end of file From 437f59c9e3073812de12e03b87e01872a83f9335 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 18:45:34 +0000 Subject: [PATCH 19/29] fix --- .github/actions/publish/action.yaml | 12 ++++++++++-- .github/workflows/eslint-config-custom-publish.yml | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/actions/publish/action.yaml b/.github/actions/publish/action.yaml index 0b0da43bfa..ec6ecc7e70 100644 --- a/.github/actions/publish/action.yaml +++ b/.github/actions/publish/action.yaml @@ -1,7 +1,14 @@ +name: 'Release NPM package' +description: 'Release NPM package' inputs: package: description: 'Package.json location (relative)' - default: '' + default: 'package.json' + required: true + token: + description: 'NPM Token' + default: 'null' + required: true runs: using: "composite" steps: @@ -11,9 +18,10 @@ runs: node-version: 16 - name: Install Dependencies run: yarn install + shell: bash - uses: JS-DevTools/npm-publish@v1 with: - token: ${{ secrets.NPM_TOKEN }} + token: ${{ inputs.token }} dry-run: false check-version: true access: 'public' diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/eslint-config-custom-publish.yml index 0cb4edea42..92e2b95d72 100644 --- a/.github/workflows/eslint-config-custom-publish.yml +++ b/.github/workflows/eslint-config-custom-publish.yml @@ -11,4 +11,5 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/publish with: - package: './packages/eslint-config-custom/package.json' \ No newline at end of file + package: './packages/eslint-config-custom/package.json' + token: $ {{ secrets.NPM_TOKEN }} \ No newline at end of file From dd646190e44daf6feb4b06283f8b85d27e8e7135 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 18:48:58 +0000 Subject: [PATCH 20/29] fix --- .github/actions/publish/action.yaml | 2 +- .github/workflows/eslint-config-custom-publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/publish/action.yaml b/.github/actions/publish/action.yaml index ec6ecc7e70..24a129d324 100644 --- a/.github/actions/publish/action.yaml +++ b/.github/actions/publish/action.yaml @@ -25,4 +25,4 @@ runs: dry-run: false check-version: true access: 'public' - package: $ {{ inputs.package }} \ No newline at end of file + package: ${{ inputs.package }} \ No newline at end of file diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/eslint-config-custom-publish.yml index 92e2b95d72..ca8b6890d2 100644 --- a/.github/workflows/eslint-config-custom-publish.yml +++ b/.github/workflows/eslint-config-custom-publish.yml @@ -12,4 +12,4 @@ jobs: - uses: ./.github/actions/publish with: package: './packages/eslint-config-custom/package.json' - token: $ {{ secrets.NPM_TOKEN }} \ No newline at end of file + token: ${{ secrets.NPM_TOKEN }} \ No newline at end of file From 6691253e96ccbf28fcd7e9fbd38f87b03aa5b8f6 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 18:56:40 +0000 Subject: [PATCH 21/29] fix --- .../eslint-config-custom-publish.yml | 20 ++++++++--------- .github/workflows/jest-config-publish.yml | 22 ++++++------------- .github/workflows/react-sdk-publish.yml | 22 ++++++------------- .github/workflows/tsconfig-publish.yml | 22 ++++++------------- 4 files changed, 31 insertions(+), 55 deletions(-) diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/eslint-config-custom-publish.yml index ca8b6890d2..05077cd08b 100644 --- a/.github/workflows/eslint-config-custom-publish.yml +++ b/.github/workflows/eslint-config-custom-publish.yml @@ -1,15 +1,15 @@ name: Eslint Config Publish -on: - push: - paths: - - 'packages/eslint-config-custom/**/*' - - '.github/workflows/eslint-config-custom-publish.yml' +on: + push: + paths: + - "packages/eslint-config-custom/**/*" + - ".github/workflows/eslint-config-custom-publish.yml" jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/publish - with: - package: './packages/eslint-config-custom/package.json' - token: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + - uses: actions/checkout@v3 + - uses: ./.github/actions/publish + with: + package: "./packages/eslint-config-custom/package.json" + token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/jest-config-publish.yml b/.github/workflows/jest-config-publish.yml index ddc06c6b19..4725fcd647 100644 --- a/.github/workflows/jest-config-publish.yml +++ b/.github/workflows/jest-config-publish.yml @@ -1,23 +1,15 @@ name: Jest Config Publish -on: - push: - paths: - - 'packages/jest-config/**/*' - - '.github/workflows/jest-config-publish.yml' +on: + push: + paths: + - "packages/jest-config/**/*" + - ".github/workflows/jest-config-publish.yml" jobs: publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 16 - - name: Install Dependencies - run: yarn install - - uses: JS-DevTools/npm-publish@v1 + - uses: ./.github/actions/publish with: + package: "./packages/jest-config/package.json" token: ${{ secrets.NPM_TOKEN }} - dry-run: false - check-version: true - access: 'public' - package: './packages/jest-config/package.json' \ No newline at end of file diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index 4f4e55cfad..9fbddae4c3 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -1,23 +1,15 @@ name: SDK publish -on: - push: - paths: - - 'packages/react-sdk/**/*' - - '.github/workflows/react-sdk-publish.yml' +on: + push: + paths: + - "packages/react-sdk/**/*" + - ".github/workflows/react-sdk-publish.yml" jobs: publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 16 - - name: Install Dependencies - run: yarn install - - uses: JS-DevTools/npm-publish@v1 + - uses: ./.github/actions/publish with: + package: "./packages/react-sdk/package.json" token: ${{ secrets.NPM_TOKEN }} - dry-run: false - check-version: true - access: 'public' - package: './packages/react-sdk/package.json' \ No newline at end of file diff --git a/.github/workflows/tsconfig-publish.yml b/.github/workflows/tsconfig-publish.yml index a50c55fc71..498b61a5fa 100644 --- a/.github/workflows/tsconfig-publish.yml +++ b/.github/workflows/tsconfig-publish.yml @@ -1,23 +1,15 @@ name: Tsconfig Publish -on: - push: - paths: - - 'packages/tsconfig/**/*' - - '.github/workflows/tsconfig-publish.yml' +on: + push: + paths: + - "packages/tsconfig/**/*" + - ".github/workflows/tsconfig-publish.yml" jobs: publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 16 - - name: Install Dependencies - run: yarn install - - uses: JS-DevTools/npm-publish@v1 + - uses: ./.github/actions/publish with: + package: "./packages/tsconfig/package.json" token: ${{ secrets.NPM_TOKEN }} - dry-run: false - check-version: true - access: 'public' - package: './packages/tsconfig/package.json' \ No newline at end of file From 51712a969c7afce5c8766267b09b817da4c7fe49 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 19:09:55 +0000 Subject: [PATCH 22/29] add icons + paths to watch --- .github/workflows/eslint-config-custom-publish.yml | 1 + .github/workflows/jest-config-publish.yml | 1 + .github/workflows/react-sdk-publish.yml | 1 + .github/workflows/tsconfig-publish.yml | 1 + packages/icons/package.json | 4 ++-- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/eslint-config-custom-publish.yml index 05077cd08b..9e9539d719 100644 --- a/.github/workflows/eslint-config-custom-publish.yml +++ b/.github/workflows/eslint-config-custom-publish.yml @@ -4,6 +4,7 @@ on: paths: - "packages/eslint-config-custom/**/*" - ".github/workflows/eslint-config-custom-publish.yml" + - ".github/workflows/publish/action.yaml" jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/jest-config-publish.yml b/.github/workflows/jest-config-publish.yml index 4725fcd647..5862fca017 100644 --- a/.github/workflows/jest-config-publish.yml +++ b/.github/workflows/jest-config-publish.yml @@ -4,6 +4,7 @@ on: paths: - "packages/jest-config/**/*" - ".github/workflows/jest-config-publish.yml" + - ".github/workflows/publish/action.yaml" jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/react-sdk-publish.yml index 9fbddae4c3..263dad4a1b 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/react-sdk-publish.yml @@ -4,6 +4,7 @@ on: paths: - "packages/react-sdk/**/*" - ".github/workflows/react-sdk-publish.yml" + - ".github/workflows/publish/action.yaml" jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/tsconfig-publish.yml b/.github/workflows/tsconfig-publish.yml index 498b61a5fa..789d001966 100644 --- a/.github/workflows/tsconfig-publish.yml +++ b/.github/workflows/tsconfig-publish.yml @@ -4,6 +4,7 @@ on: paths: - "packages/tsconfig/**/*" - ".github/workflows/tsconfig-publish.yml" + - ".github/workflows/publish/action.yaml" jobs: publish: runs-on: ubuntu-latest diff --git a/packages/icons/package.json b/packages/icons/package.json index 5584e18c9d..841e772a60 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,7 +1,7 @@ { "name": "@webstudio-is/icons", - "version": "0.5.0", - "description": "Webstudio JavaScript / TypeScript API", + "version": "0.1.0", + "description": "Webstudio Icons", "author": "Webstudio ", "homepage": "https://webstudio.is", "scripts": { From 9a50ec5d66755c7f0584b0edb3d7b182936c2257 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 19:12:45 +0000 Subject: [PATCH 23/29] add icons --- .github/workflows/icons.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/icons.yml diff --git a/.github/workflows/icons.yml b/.github/workflows/icons.yml new file mode 100644 index 0000000000..1809e3f16b --- /dev/null +++ b/.github/workflows/icons.yml @@ -0,0 +1,16 @@ +name: Icons Publish +on: + push: + paths: + - "packages/icons/**/*" + - ".github/workflows/icons.yml" + - ".github/workflows/publish/action.yaml" +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/publish + with: + package: "./packages/icons/package.json" + token: ${{ secrets.NPM_TOKEN }} From b004a4b0fa6be54699e72e244a6f5f4414cc3445 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 19:17:43 +0000 Subject: [PATCH 24/29] Reorder/rename/etc --- .../eslint-config-custom.yml} | 4 ++-- .github/workflows/{ => publish}/icons.yml | 4 ++-- .../{jest-config-publish.yml => publish/jest-config.yml} | 4 ++-- .../{react-sdk-publish.yml => publish/react-sdk.yml} | 4 ++-- .../workflows/{tsconfig-publish.yml => publish/tsconfig.yml} | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename .github/workflows/{eslint-config-custom-publish.yml => publish/eslint-config-custom.yml} (76%) rename .github/workflows/{ => publish}/icons.yml (75%) rename .github/workflows/{jest-config-publish.yml => publish/jest-config.yml} (76%) rename .github/workflows/{react-sdk-publish.yml => publish/react-sdk.yml} (76%) rename .github/workflows/{tsconfig-publish.yml => publish/tsconfig.yml} (76%) diff --git a/.github/workflows/eslint-config-custom-publish.yml b/.github/workflows/publish/eslint-config-custom.yml similarity index 76% rename from .github/workflows/eslint-config-custom-publish.yml rename to .github/workflows/publish/eslint-config-custom.yml index 9e9539d719..69fa606bbc 100644 --- a/.github/workflows/eslint-config-custom-publish.yml +++ b/.github/workflows/publish/eslint-config-custom.yml @@ -3,8 +3,8 @@ on: push: paths: - "packages/eslint-config-custom/**/*" - - ".github/workflows/eslint-config-custom-publish.yml" - - ".github/workflows/publish/action.yaml" + - ".github/workflows/publish/eslint-config-custom.yml" + - ".github/actions/publish/action.yaml" jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/icons.yml b/.github/workflows/publish/icons.yml similarity index 75% rename from .github/workflows/icons.yml rename to .github/workflows/publish/icons.yml index 1809e3f16b..1409096cd8 100644 --- a/.github/workflows/icons.yml +++ b/.github/workflows/publish/icons.yml @@ -3,8 +3,8 @@ on: push: paths: - "packages/icons/**/*" - - ".github/workflows/icons.yml" - - ".github/workflows/publish/action.yaml" + - ".github/workflows/publish/icons-publish.yml" + - ".github/actions/publish/action.yaml" jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/jest-config-publish.yml b/.github/workflows/publish/jest-config.yml similarity index 76% rename from .github/workflows/jest-config-publish.yml rename to .github/workflows/publish/jest-config.yml index 5862fca017..5f3f0b93b5 100644 --- a/.github/workflows/jest-config-publish.yml +++ b/.github/workflows/publish/jest-config.yml @@ -3,8 +3,8 @@ on: push: paths: - "packages/jest-config/**/*" - - ".github/workflows/jest-config-publish.yml" - - ".github/workflows/publish/action.yaml" + - ".github/workflows/publish/jest-config.yml" + - ".github/actions/publish/action.yaml" jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/react-sdk-publish.yml b/.github/workflows/publish/react-sdk.yml similarity index 76% rename from .github/workflows/react-sdk-publish.yml rename to .github/workflows/publish/react-sdk.yml index 263dad4a1b..00ba8d85fc 100644 --- a/.github/workflows/react-sdk-publish.yml +++ b/.github/workflows/publish/react-sdk.yml @@ -3,8 +3,8 @@ on: push: paths: - "packages/react-sdk/**/*" - - ".github/workflows/react-sdk-publish.yml" - - ".github/workflows/publish/action.yaml" + - ".github/workflows/publish/react-sdk.yml" + - ".github/actions/publish/action.yaml" jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/tsconfig-publish.yml b/.github/workflows/publish/tsconfig.yml similarity index 76% rename from .github/workflows/tsconfig-publish.yml rename to .github/workflows/publish/tsconfig.yml index 789d001966..08d7b2ea80 100644 --- a/.github/workflows/tsconfig-publish.yml +++ b/.github/workflows/publish/tsconfig.yml @@ -3,8 +3,8 @@ on: push: paths: - "packages/tsconfig/**/*" - - ".github/workflows/tsconfig-publish.yml" - - ".github/workflows/publish/action.yaml" + - ".github/workflows/publish/tsconfig.yml" + - ".github/actions/publish/action.yaml" jobs: publish: runs-on: ubuntu-latest From 7e495df2b3c13bdc8d8c7b9284a1328396a29279 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 19:20:28 +0000 Subject: [PATCH 25/29] grr cannot structure like this.. --- .github/workflows/{publish => }/eslint-config-custom.yml | 2 +- .github/workflows/{publish => }/icons.yml | 2 +- .github/workflows/{publish => }/jest-config.yml | 2 +- .github/workflows/{publish => }/react-sdk.yml | 2 +- .github/workflows/{publish => }/tsconfig.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{publish => }/eslint-config-custom.yml (86%) rename .github/workflows/{publish => }/icons.yml (86%) rename .github/workflows/{publish => }/jest-config.yml (87%) rename .github/workflows/{publish => }/react-sdk.yml (87%) rename .github/workflows/{publish => }/tsconfig.yml (88%) diff --git a/.github/workflows/publish/eslint-config-custom.yml b/.github/workflows/eslint-config-custom.yml similarity index 86% rename from .github/workflows/publish/eslint-config-custom.yml rename to .github/workflows/eslint-config-custom.yml index 69fa606bbc..3effb53420 100644 --- a/.github/workflows/publish/eslint-config-custom.yml +++ b/.github/workflows/eslint-config-custom.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/eslint-config-custom/**/*" - - ".github/workflows/publish/eslint-config-custom.yml" + - ".github/workflows/eslint-config-custom.yml" - ".github/actions/publish/action.yaml" jobs: publish: diff --git a/.github/workflows/publish/icons.yml b/.github/workflows/icons.yml similarity index 86% rename from .github/workflows/publish/icons.yml rename to .github/workflows/icons.yml index 1409096cd8..3deb808f0b 100644 --- a/.github/workflows/publish/icons.yml +++ b/.github/workflows/icons.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/icons/**/*" - - ".github/workflows/publish/icons-publish.yml" + - ".github/workflows/icons-publish.yml" - ".github/actions/publish/action.yaml" jobs: publish: diff --git a/.github/workflows/publish/jest-config.yml b/.github/workflows/jest-config.yml similarity index 87% rename from .github/workflows/publish/jest-config.yml rename to .github/workflows/jest-config.yml index 5f3f0b93b5..2d5a1079cb 100644 --- a/.github/workflows/publish/jest-config.yml +++ b/.github/workflows/jest-config.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/jest-config/**/*" - - ".github/workflows/publish/jest-config.yml" + - ".github/workflows/jest-config.yml" - ".github/actions/publish/action.yaml" jobs: publish: diff --git a/.github/workflows/publish/react-sdk.yml b/.github/workflows/react-sdk.yml similarity index 87% rename from .github/workflows/publish/react-sdk.yml rename to .github/workflows/react-sdk.yml index 00ba8d85fc..9a122a632b 100644 --- a/.github/workflows/publish/react-sdk.yml +++ b/.github/workflows/react-sdk.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/react-sdk/**/*" - - ".github/workflows/publish/react-sdk.yml" + - ".github/workflows/react-sdk.yml" - ".github/actions/publish/action.yaml" jobs: publish: diff --git a/.github/workflows/publish/tsconfig.yml b/.github/workflows/tsconfig.yml similarity index 88% rename from .github/workflows/publish/tsconfig.yml rename to .github/workflows/tsconfig.yml index 08d7b2ea80..f9b6ed774e 100644 --- a/.github/workflows/publish/tsconfig.yml +++ b/.github/workflows/tsconfig.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/tsconfig/**/*" - - ".github/workflows/publish/tsconfig.yml" + - ".github/workflows/tsconfig.yml" - ".github/actions/publish/action.yaml" jobs: publish: From f341ae554bf9372dca8fc92b3cb51bc26dea4605 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Jul 2022 19:22:00 +0000 Subject: [PATCH 26/29] fix pr template --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index cef4574ccc..9436f72f4e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -14,7 +14,7 @@ ## Before merging -- [ ] tested locally and on preview environment (preview dev login: 5de6e) +- [ ] tested locally and on preview environment (preview dev login: 5de6) - [ ] updated [test cases](https://github.com/webstudio-is/webstudio-designer/blob/main/apps/designer/docs/test-cases.md) document - [ ] added tests - [ ] if any new env variables are added, added them to `.env.example` and the `designer/env-check.js` if mandatory From e23f19fd9e307333f61113d305755c21c6e1454b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 28 Jul 2022 09:55:46 +0000 Subject: [PATCH 27/29] add design-system package --- .github/workflows/design-system.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/design-system.yml diff --git a/.github/workflows/design-system.yml b/.github/workflows/design-system.yml new file mode 100644 index 0000000000..109456bc75 --- /dev/null +++ b/.github/workflows/design-system.yml @@ -0,0 +1,16 @@ +name: Design System Publish +on: + push: + paths: + - "packages/design-system/**/*" + - ".github/workflows/design-system.yml" + - ".github/actions/publish/action.yaml" +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/publish + with: + package: "./packages/design-system/package.json" + token: ${{ secrets.NPM_TOKEN }} From e54c96110f142b311bbeb7b4858a315c8ee88d42 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 28 Jul 2022 16:15:12 +0000 Subject: [PATCH 28/29] fix: package.json --- packages/react-sdk/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index 57126b695b..5bf5020e21 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -59,7 +59,6 @@ "@stitches/core": "^1.2.7", "@webstudio-is/icons": "*", "immer": "^9.0.12", - "jest-config": "*", "mitt": "^3.0.0", "react-nano-state": "^0.4.0", "@webstudio-is/jest-config": "*", From dd0014fd2947b58d8b4dc55bda7d3ef45b29f9e3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 28 Jul 2022 16:29:33 +0000 Subject: [PATCH 29/29] fix: build errors --- packages/design-system/tsconfig.json | 2 +- packages/icons/tsconfig.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/design-system/tsconfig.json b/packages/design-system/tsconfig.json index 329cf3ea13..e599e806b6 100644 --- a/packages/design-system/tsconfig.json +++ b/packages/design-system/tsconfig.json @@ -1,6 +1,6 @@ // Extends can't use node's resolution rn https://github.com/dividab/tsconfig-paths/issues/209#issuecomment-1177261091 { - "extends": "../../node_modules/tsconfig/base.json", + "extends": "../../node_modules/@webstudio-is/tsconfig/base.json", "include": ["./src/**/*.ts", "./src/**/*.tsx"], "compilerOptions": { "lib": ["DOM", "DOM.Iterable", "ES2019"], diff --git a/packages/icons/tsconfig.json b/packages/icons/tsconfig.json index 329cf3ea13..e599e806b6 100644 --- a/packages/icons/tsconfig.json +++ b/packages/icons/tsconfig.json @@ -1,6 +1,6 @@ // Extends can't use node's resolution rn https://github.com/dividab/tsconfig-paths/issues/209#issuecomment-1177261091 { - "extends": "../../node_modules/tsconfig/base.json", + "extends": "../../node_modules/@webstudio-is/tsconfig/base.json", "include": ["./src/**/*.ts", "./src/**/*.tsx"], "compilerOptions": { "lib": ["DOM", "DOM.Iterable", "ES2019"],