From f652a3d86ba2188861105402b6fd63b1469873b6 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 14 Apr 2023 11:26:42 +0200 Subject: [PATCH 1/7] Update wrapper --- src/designer/designer_packages/angular-workspace/angular.json | 3 +++ .../react-wrapper/lib/components/stencil-generated/index.ts | 2 +- src/designer/package-lock.json | 3 +++ src/designer/package.json | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/designer/designer_packages/angular-workspace/angular.json b/src/designer/designer_packages/angular-workspace/angular.json index 915453a4a..e41303ac1 100644 --- a/src/designer/designer_packages/angular-workspace/angular.json +++ b/src/designer/designer_packages/angular-workspace/angular.json @@ -133,5 +133,8 @@ } } } + }, + "cli": { + "analytics": false } } diff --git a/src/designer/designer_packages/react-workspace/react-wrapper/lib/components/stencil-generated/index.ts b/src/designer/designer_packages/react-workspace/react-wrapper/lib/components/stencil-generated/index.ts index 40fe4cc2e..8d04f81ca 100644 --- a/src/designer/designer_packages/react-workspace/react-wrapper/lib/components/stencil-generated/index.ts +++ b/src/designer/designer_packages/react-workspace/react-wrapper/lib/components/stencil-generated/index.ts @@ -11,7 +11,7 @@ export const ElsaActivityInputEditorDialogContent = /*@__PURE__*/createReactComp export const ElsaActivityOutputEditorDialogContent = /*@__PURE__*/createReactComponent('elsa-activity-output-editor-dialog-content'); export const ElsaActivityProperties = /*@__PURE__*/createReactComponent('elsa-activity-properties'); export const ElsaActivityPropertiesEditor = /*@__PURE__*/createReactComponent('elsa-activity-properties-editor'); -export const ElsaAwhileNotifications = /*@__PURE__*/createReactComponent('elsa-awhile-notifications'); +export const ElsaToastNotifications = /*@__PURE__*/createReactComponent('elsa-toast-notifications'); export const ElsaButtonGroup = /*@__PURE__*/createReactComponent('elsa-button-group'); export const ElsaCheckListInput = /*@__PURE__*/createReactComponent('elsa-check-list-input'); export const ElsaCheckboxInput = /*@__PURE__*/createReactComponent('elsa-checkbox-input'); diff --git a/src/designer/package-lock.json b/src/designer/package-lock.json index 9a556d741..ba4403738 100644 --- a/src/designer/package-lock.json +++ b/src/designer/package-lock.json @@ -9,6 +9,9 @@ "designer_packages/*", "designer_packages/react-workspace/*" ], + "dependencies": { + "@elsa-workflows/elsa-workflows-designer-react-wrapper": "^3.0.0" + }, "devDependencies": { "@types/node": "^18.15.3", "lerna": "^6.5.1", diff --git a/src/designer/package.json b/src/designer/package.json index 720ffeb5b..9196df2c7 100644 --- a/src/designer/package.json +++ b/src/designer/package.json @@ -9,5 +9,8 @@ "@types/node": "^18.15.3", "lerna": "^6.5.1", "typescript": "^4.9.5" + }, + "dependencies": { + "@elsa-workflows/elsa-workflows-designer-react-wrapper": "^3.0.0" } } From 402f6521c4e8b9266cbe9f4bf2c7f1f226e8c1f2 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 14 Apr 2023 11:36:44 +0200 Subject: [PATCH 2/7] Revert version changes --- src/designer/package-lock.json | 5 +---- src/designer/package.json | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/designer/package-lock.json b/src/designer/package-lock.json index ba4403738..d3454f76f 100644 --- a/src/designer/package-lock.json +++ b/src/designer/package-lock.json @@ -9,9 +9,6 @@ "designer_packages/*", "designer_packages/react-workspace/*" ], - "dependencies": { - "@elsa-workflows/elsa-workflows-designer-react-wrapper": "^3.0.0" - }, "devDependencies": { "@types/node": "^18.15.3", "lerna": "^6.5.1", @@ -146,7 +143,7 @@ }, "designer_packages/react-workspace/react-wrapper": { "name": "@elsa-workflows/elsa-workflows-designer-react-wrapper", - "version": "3.0.0", + "version": "0.0.1", "license": "ISC", "dependencies": { "@elsa-workflows/elsa-workflows-designer": "*" diff --git a/src/designer/package.json b/src/designer/package.json index 9196df2c7..720ffeb5b 100644 --- a/src/designer/package.json +++ b/src/designer/package.json @@ -9,8 +9,5 @@ "@types/node": "^18.15.3", "lerna": "^6.5.1", "typescript": "^4.9.5" - }, - "dependencies": { - "@elsa-workflows/elsa-workflows-designer-react-wrapper": "^3.0.0" } } From 7cac1c191ee101697dde470921e03cdbdc7e896c Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 14 Apr 2023 13:50:59 +0200 Subject: [PATCH 3/7] Experiment: lerna version --- .github/workflows/npm-packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/npm-packages.yml b/.github/workflows/npm-packages.yml index 8db59bb08..85ea64eaf 100644 --- a/.github/workflows/npm-packages.yml +++ b/.github/workflows/npm-packages.yml @@ -52,6 +52,7 @@ jobs: run: | npm install --force npm version $VERSION --allow-same-version + npx lerna version $VERSION npx lerna run build - name: Pack Designer working-directory: ./src/designer/designer_packages/elsa-workflows-designer From 1a357f92ed2082855bc4b529ee414eb662bb97e6 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 14 Apr 2023 13:54:31 +0200 Subject: [PATCH 4/7] Experiment 2 --- .github/workflows/npm-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-packages.yml b/.github/workflows/npm-packages.yml index 85ea64eaf..925ae438a 100644 --- a/.github/workflows/npm-packages.yml +++ b/.github/workflows/npm-packages.yml @@ -51,7 +51,7 @@ jobs: working-directory: ./src/designer/designer_packages/elsa-workflows-designer run: | npm install --force - npm version $VERSION --allow-same-version +# npm version $VERSION --allow-same-version npx lerna version $VERSION npx lerna run build - name: Pack Designer From 93d7de09124aa3e95f86740eea9df35f0616873e Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 14 Apr 2023 13:55:41 +0200 Subject: [PATCH 5/7] Experiment 2a --- .github/workflows/npm-packages.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/npm-packages.yml b/.github/workflows/npm-packages.yml index 925ae438a..7b53745b1 100644 --- a/.github/workflows/npm-packages.yml +++ b/.github/workflows/npm-packages.yml @@ -51,7 +51,6 @@ jobs: working-directory: ./src/designer/designer_packages/elsa-workflows-designer run: | npm install --force -# npm version $VERSION --allow-same-version npx lerna version $VERSION npx lerna run build - name: Pack Designer From 439d76d051ef577178f7497a387c4da02c95890b Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 14 Apr 2023 14:02:52 +0200 Subject: [PATCH 6/7] Experiment 3 --- .github/workflows/npm-packages.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/npm-packages.yml b/.github/workflows/npm-packages.yml index 7b53745b1..713401b85 100644 --- a/.github/workflows/npm-packages.yml +++ b/.github/workflows/npm-packages.yml @@ -51,7 +51,7 @@ jobs: working-directory: ./src/designer/designer_packages/elsa-workflows-designer run: | npm install --force - npx lerna version $VERSION + npm version $VERSION --allow-same-version npx lerna run build - name: Pack Designer working-directory: ./src/designer/designer_packages/elsa-workflows-designer @@ -60,12 +60,16 @@ jobs: - name: Pack Angular Wrapper working-directory: ./src/designer/designer_packages/angular-workspace/projects/component-library - run: npm pack + run: | + npm version $VERSION --allow-same-version + npm pack if: ${{ github.event_name == 'release' || github.event_name == 'push'}} - name: Pack React Wrapper working-directory: ./src/designer/designer_packages/react-workspace/react-wrapper - run: npm pack + run: | + npm version $VERSION --allow-same-version + npm pack if: ${{ github.event_name == 'release' || github.event_name == 'push'}} - name: Upload Designer Artifact From 8262cd28190a705cbfd27a8d7bf6337e831cefae Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 14 Apr 2023 12:07:15 +0000 Subject: [PATCH 7/7] Updated designer version to 3.0.3-preview.105 --- src/modules/Elsa.Workflows.Designer/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/Elsa.Workflows.Designer/package.json b/src/modules/Elsa.Workflows.Designer/package.json index f29287d0a..331c07989 100644 --- a/src/modules/Elsa.Workflows.Designer/package.json +++ b/src/modules/Elsa.Workflows.Designer/package.json @@ -6,7 +6,7 @@ "build:debug": "cross-env webpack --mode=development --env configuration=Debug" }, "devDependencies": { - "@elsa-workflows/elsa-workflows-designer": "3.0.3-preview.91", + "@elsa-workflows/elsa-workflows-designer": "3.0.3-preview.105", "copy-webpack-plugin": "^11.0.0", "cross-env": "^7.0.3", "monaco-editor": "^0.36.1",