From 226263338bcdafac7d20f89a3b091949457fb6df Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Thu, 9 Jun 2022 17:51:08 +0530 Subject: [PATCH 01/35] asdasd --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 4c642e6..c6bc447 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -62,7 +62,7 @@ jobs: - name: test-with-latest run: | npx lerna run test:ci - if: ${{matrix.node=='latest'}} + if: ${{matrix.node=='latestsss'}} - name: diff-coverage if: github.event_name == 'pull_request' run: | From fc1c6640d25ab43c03b00026a52bb0e81c68fd16 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Thu, 9 Jun 2022 17:56:33 +0530 Subject: [PATCH 02/35] dasdasdasd --- .github/workflows/workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index c6bc447..32bebbb 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -55,6 +55,7 @@ jobs: if: ${{matrix.node==14}} - name: build-package-with-latest-node run: | + npm config set unsafe-perm true npm ci npx lerna bootstrap --ci --strict npx lerna run build From 9d780c1e9a3086e3d71a80f4e752971764c31381 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Thu, 9 Jun 2022 18:01:41 +0530 Subject: [PATCH 03/35] added changes --- .github/workflows/workflow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 32bebbb..c6bc447 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -55,7 +55,6 @@ jobs: if: ${{matrix.node==14}} - name: build-package-with-latest-node run: | - npm config set unsafe-perm true npm ci npx lerna bootstrap --ci --strict npx lerna run build From 2f91a8315bdc0399544799d60ae2624100783ff0 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 10:30:16 +0530 Subject: [PATCH 04/35] asdasdasd --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index c6bc447..a8181fc 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -62,7 +62,7 @@ jobs: - name: test-with-latest run: | npx lerna run test:ci - if: ${{matrix.node=='latestsss'}} + if: ${{matrix.node=='latestss'}} - name: diff-coverage if: github.event_name == 'pull_request' run: | From 7b8da15b11c77b6ad94440683c1470ab7ebe4c1f Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 11:07:37 +0530 Subject: [PATCH 05/35] asdasdasd --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a8181fc..9396918 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -52,7 +52,7 @@ jobs: # npx lerna run test # npx lerna run clean # rm -rf node_modules packages/*/node_modules - if: ${{matrix.node==14}} + if: ${{matrix.node==145}} - name: build-package-with-latest-node run: | npm ci From 300e352ef2eaa3c6796d0f17184e50e96d31d72c Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 11:41:58 +0530 Subject: [PATCH 06/35] dasdasdasd --- packages/aem-forms-af-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aem-forms-af-core/package.json b/packages/aem-forms-af-core/package.json index 1a96052..d019fa8 100644 --- a/packages/aem-forms-af-core/package.json +++ b/packages/aem-forms-af-core/package.json @@ -27,7 +27,7 @@ "test": "jest --silent", "eslint": "npx eslint src/**", "eslint:fix": "npx eslint --fix src/**", - "test-ci": "jest --silent --coverage", + "test:ci": "jest --silent --coverage", "build": "npm run eslint && npx tsc", "build-libs": "npx tsc", "clean": "rm -rf lib coverage", From 2e52964411fed7f7cec57d1ee0f2b17fb2e6b6d8 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 11:43:34 +0530 Subject: [PATCH 07/35] asdasdasdasd --- packages/aem-forms-af-react-components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aem-forms-af-react-components/package.json b/packages/aem-forms-af-react-components/package.json index 390e8d5..e8ecc90 100644 --- a/packages/aem-forms-af-react-components/package.json +++ b/packages/aem-forms-af-react-components/package.json @@ -25,7 +25,7 @@ "eslint": "npx eslint src/**/*.ts*", "build": "npm run eslint && npx tsc && cp src/styles.css lib", "build-libs": "npx tsc && cp src/styles.css lib", - "test-ci": "jest --silent --coverage", + "test:ci": "jest --silent --coverage", "prepublishOnly": "npm run build && npm run test", "test": "jest --silent", "storybook": "start-storybook -p 6006", From 6fb3fdb481abd42b9ff37e5cd2edffea0b826517 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 11:46:59 +0530 Subject: [PATCH 08/35] test coverage,..... --- .github/workflows/workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 9396918..855bd95 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -62,12 +62,12 @@ jobs: - name: test-with-latest run: | npx lerna run test:ci - if: ${{matrix.node=='latestss'}} + if: ${{matrix.node=='latest'}} - name: diff-coverage - if: github.event_name == 'pull_request' + #if: github.event_name == 'pull_request' run: | - ls - diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 + diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 +# diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 From 34a3a6831a3cccb29a02f8e1f6f6c024a8f80d39 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 11:48:36 +0530 Subject: [PATCH 09/35] asdasdasdasd --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 855bd95..ca171d7 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -68,6 +68,6 @@ jobs: run: | diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 - + if: ${{matrix.node=='latest'}} From 086c277650bdade85b977eab9806119927ab32a6 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 12:20:31 +0530 Subject: [PATCH 10/35] diff-cover installation added --- .github/workflows/workflow.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ca171d7..2742519 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -26,6 +26,8 @@ jobs: uses: actions/setup-node@v3.3.0 with: node-version: ${{ matrix.node }} + - name: setup python + uses: actions/setup-python@v4 - uses: actions/setup-java@v3 with: distribution: 'zulu' # See 'Supported distributions' for available options @@ -66,6 +68,7 @@ jobs: - name: diff-coverage #if: github.event_name == 'pull_request' run: | + pip install diff_cover diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 if: ${{matrix.node=='latest'}} From 9eaebe3601d5e4a3d6060b12ca807b9331f207a2 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 12:22:02 +0530 Subject: [PATCH 11/35] asd --- .github/workflows/workflow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 2742519..8c9b92e 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -27,7 +27,9 @@ jobs: with: node-version: ${{ matrix.node }} - name: setup python - uses: actions/setup-python@v4 + uses: actions/setup-python@v4 + with: + python-version: '3.x' - uses: actions/setup-java@v3 with: distribution: 'zulu' # See 'Supported distributions' for available options From aea41ff23f4c9437827fac8d35b8463ca59b8a18 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 13:01:33 +0530 Subject: [PATCH 12/35] added --- .github/workflows/workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 8c9b92e..7d2477f 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -71,7 +71,8 @@ jobs: #if: github.event_name == 'pull_request' run: | pip install diff_cover - diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 + git pull + diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch origin/main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 if: ${{matrix.node=='latest'}} From 1554fe24c924c1e94ecdb0918323c82f417d5bb6 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 13:16:12 +0530 Subject: [PATCH 13/35] asdds --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 7d2477f..6f50dd5 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -71,7 +71,7 @@ jobs: #if: github.event_name == 'pull_request' run: | pip install diff_cover - git pull + git git fetch --no-tags --depth=500 origin main diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch origin/main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 if: ${{matrix.node=='latest'}} From 2d85a626cb5af01ac8771eff0b2b7fb363eda82e Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 13:21:00 +0530 Subject: [PATCH 14/35] added changes --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 6f50dd5..5ebe135 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -71,7 +71,7 @@ jobs: #if: github.event_name == 'pull_request' run: | pip install diff_cover - git git fetch --no-tags --depth=500 origin main + git fetch --no-tags --depth=500 origin main diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch origin/main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 if: ${{matrix.node=='latest'}} From b1229b4677efc7a106e9ab9147af7eb37fe0615e Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 15:06:48 +0530 Subject: [PATCH 15/35] added --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 5ebe135..6722b95 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -70,7 +70,7 @@ jobs: - name: diff-coverage #if: github.event_name == 'pull_request' run: | - pip install diff_cover + pip install diff-cover git fetch --no-tags --depth=500 origin main diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch origin/main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 From 29663a3e40f5d743ad2e034d04efb92e21860e49 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 15:13:27 +0530 Subject: [PATCH 16/35] changes --- .github/workflows/workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 6722b95..592d773 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -72,6 +72,7 @@ jobs: run: | pip install diff-cover git fetch --no-tags --depth=500 origin main + git fetch --no-tags --depth=500 origin open diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch origin/main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 if: ${{matrix.node=='latest'}} From f16f4880ad7031049dc3b56d0752413823e6b63a Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 15:20:39 +0530 Subject: [PATCH 17/35] updated checkbox.ts updated checkbox.ts --- packages/aem-forms-af-core/src/Checkbox.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/aem-forms-af-core/src/Checkbox.ts b/packages/aem-forms-af-core/src/Checkbox.ts index e0f008e..b96c042 100644 --- a/packages/aem-forms-af-core/src/Checkbox.ts +++ b/packages/aem-forms-af-core/src/Checkbox.ts @@ -31,6 +31,8 @@ class Checkbox extends Field { private offValue() { const opts = this.enum; + let abc=1; + abc=abc+1; return opts.length > 1 ? opts[1] : null; } @@ -58,4 +60,4 @@ class Checkbox extends Field { } } -export default Checkbox; \ No newline at end of file +export default Checkbox; From f56a1018c26978bec81ec5556fe942c03a4fce17 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 15:24:54 +0530 Subject: [PATCH 18/35] updated................ --- packages/aem-forms-af-core/src/Checkbox.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/aem-forms-af-core/src/Checkbox.ts b/packages/aem-forms-af-core/src/Checkbox.ts index b96c042..22bc657 100644 --- a/packages/aem-forms-af-core/src/Checkbox.ts +++ b/packages/aem-forms-af-core/src/Checkbox.ts @@ -31,8 +31,6 @@ class Checkbox extends Field { private offValue() { const opts = this.enum; - let abc=1; - abc=abc+1; return opts.length > 1 ? opts[1] : null; } From fc1e8b683289c99d6eea0feb60265ea3e091048b Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 15:26:27 +0530 Subject: [PATCH 19/35] addedddd --- packages/aem-forms-af-core/src/Checkboxs.tsx | 61 ++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 packages/aem-forms-af-core/src/Checkboxs.tsx diff --git a/packages/aem-forms-af-core/src/Checkboxs.tsx b/packages/aem-forms-af-core/src/Checkboxs.tsx new file mode 100644 index 0000000..c065e76 --- /dev/null +++ b/packages/aem-forms-af-core/src/Checkboxs.tsx @@ -0,0 +1,61 @@ +/* + * + * Copyright 2022 Adobe. All rights reserved. + * This file is licensed to you under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under + * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS + * OF ANY KIND, either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + * + */ + +import Field from './Field'; +import {Constraints} from './utils/ValidationUtils'; + +/** + * @param offValue + * @private + */ +const requiredConstraint = (offValue: any) => (constraint: boolean, value: any) => { + const valid = Constraints.required(constraint, value) && (!constraint || value != offValue); + return {valid, value}; +}; + +/** + * Implementation of check box runtime model which extends from {@link Field | field} model + */ +class Checkboxs extends Field { + + private offValue() { + const opts = this.enum; + return opts.length > 1 ? opts[1] : null; + } + + /** + * @private + */ + _getConstraintObject() { + const baseConstraints = {...super._getConstraintObject()}; + baseConstraints.required = requiredConstraint(this.offValue()); + return baseConstraints; + } + + protected _getDefaults() { + return { + ...super._getDefaults(), + enforceEnum: true + }; + } + + /** + * Returns the `enum` constraints from the json + */ + get enum() { + return this._jsonModel.enum || []; + } +} + +export default Checkbox; From b2db05cdce5d40599f6f4d6851e8a5f7f97a72ba Mon Sep 17 00:00:00 2001 From: ddewanji Date: Fri, 10 Jun 2022 16:04:38 +0530 Subject: [PATCH 20/35] removed Checkboxs file....... --- packages/aem-forms-af-core/src/Checkboxs.tsx | 61 -------------------- 1 file changed, 61 deletions(-) delete mode 100644 packages/aem-forms-af-core/src/Checkboxs.tsx diff --git a/packages/aem-forms-af-core/src/Checkboxs.tsx b/packages/aem-forms-af-core/src/Checkboxs.tsx deleted file mode 100644 index c065e76..0000000 --- a/packages/aem-forms-af-core/src/Checkboxs.tsx +++ /dev/null @@ -1,61 +0,0 @@ -/* - * - * Copyright 2022 Adobe. All rights reserved. - * This file is licensed to you under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under - * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS - * OF ANY KIND, either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - * - */ - -import Field from './Field'; -import {Constraints} from './utils/ValidationUtils'; - -/** - * @param offValue - * @private - */ -const requiredConstraint = (offValue: any) => (constraint: boolean, value: any) => { - const valid = Constraints.required(constraint, value) && (!constraint || value != offValue); - return {valid, value}; -}; - -/** - * Implementation of check box runtime model which extends from {@link Field | field} model - */ -class Checkboxs extends Field { - - private offValue() { - const opts = this.enum; - return opts.length > 1 ? opts[1] : null; - } - - /** - * @private - */ - _getConstraintObject() { - const baseConstraints = {...super._getConstraintObject()}; - baseConstraints.required = requiredConstraint(this.offValue()); - return baseConstraints; - } - - protected _getDefaults() { - return { - ...super._getDefaults(), - enforceEnum: true - }; - } - - /** - * Returns the `enum` constraints from the json - */ - get enum() { - return this._jsonModel.enum || []; - } -} - -export default Checkbox; From 0c05702df964ec25a9d279f15034e20ee1b8711c Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 16:21:57 +0530 Subject: [PATCH 21/35] added changes...... --- .github/workflows/workflow.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 592d773..0c11df7 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -6,11 +6,6 @@ on: pull_request: branches: [ "open","main" ] -env: - BUILDER_DOCKER_NAME: "af2-web-runtime-builder" - BUILDER_DOCKER_NAME_14: "af2-web-runtime-builder_14" - DOCKERCOMMAND: "docker run -u `id -u` --rm -v `pwd`:/app $BUILDER_DOCKER_NAME sh -c " - DOCKER14COMMAND: "docker run --rm -v `pwd`:/app $BUILDER_DOCKER_NAME_14 sh -c " jobs: buildProject: runs-on: ubuntu-latest @@ -68,13 +63,15 @@ jobs: npx lerna run test:ci if: ${{matrix.node=='latest'}} - name: diff-coverage - #if: github.event_name == 'pull_request' + if: ${{github.event_name == 'pull_request' && matrix.node=='latest'}} run: | pip install diff-cover git fetch --no-tags --depth=500 origin main git fetch --no-tags --depth=500 origin open - diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch origin/main packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 + diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 + diff-cover --html-report packages/aem-forms-af-react-components/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/aem-forms-af-react-components/target/coverage/cobertura-coverage.xml --fail-under=90 + # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 - if: ${{matrix.node=='latest'}} + From a559d60b42539025983b5ef4f6dce0d5104ea814 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 16:34:32 +0530 Subject: [PATCH 22/35] dddddd --- .github/workflows/workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 0c11df7..d32593d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -68,8 +68,8 @@ jobs: pip install diff-cover git fetch --no-tags --depth=500 origin main git fetch --no-tags --depth=500 origin open - diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 - diff-cover --html-report packages/aem-forms-af-react-components/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/aem-forms-af-react-components/target/coverage/cobertura-coverage.xml --fail-under=90 + diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch origin/${{github.event.pull_request.base.ref}} packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 + diff-cover --html-report packages/aem-forms-af-react-components/target/coverage/diff-cover.html --compare-branch origin/${{github.event.pull_request.base.ref}} packages/aem-forms-af-react-components/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 From 1618480ec9f85595986860d9dbcf4d571b57de59 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 16:44:22 +0530 Subject: [PATCH 23/35] added --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index d32593d..baa3650 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -69,7 +69,7 @@ jobs: git fetch --no-tags --depth=500 origin main git fetch --no-tags --depth=500 origin open diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch origin/${{github.event.pull_request.base.ref}} packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 - diff-cover --html-report packages/aem-forms-af-react-components/target/coverage/diff-cover.html --compare-branch origin/${{github.event.pull_request.base.ref}} packages/aem-forms-af-react-components/target/coverage/cobertura-coverage.xml --fail-under=90 +# diff-cover --html-report packages/aem-forms-af-react-components/target/coverage/diff-cover.html --compare-branch origin/${{github.event.pull_request.base.ref}} packages/aem-forms-af-react-components/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 From c3b824137dc1b737878c000a4d091ee4d1e4662a Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 16:46:06 +0530 Subject: [PATCH 24/35] added check --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index baa3650..431a337 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -51,7 +51,7 @@ jobs: # npx lerna run test # npx lerna run clean # rm -rf node_modules packages/*/node_modules - if: ${{matrix.node==145}} + if: ${{matrix.node==14}} - name: build-package-with-latest-node run: | npm ci From 60a11067539eb055877e371877001e747e9f5fa7 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 17:05:44 +0530 Subject: [PATCH 25/35] ads --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 431a337..4a80d13 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -51,7 +51,7 @@ jobs: # npx lerna run test # npx lerna run clean # rm -rf node_modules packages/*/node_modules - if: ${{matrix.node==14}} + if: ${{matrix.node==141}} - name: build-package-with-latest-node run: | npm ci From bbaba4c4c19bb1a325189db3860efe2d456c7eaf Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Fri, 10 Jun 2022 17:51:18 +0530 Subject: [PATCH 26/35] Added changes.... --- .github/workflows/workflow.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 4a80d13..ebd5220 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -43,7 +43,8 @@ jobs: run: | echo ${{matrix.node}} npm config set unsafe-perm true - npm -v + apk search openssh + apk add openssh npm ci --ignore-scripts npx lerna bootstrap --ci --strict # npm ci --ignore-scripts @@ -51,7 +52,7 @@ jobs: # npx lerna run test # npx lerna run clean # rm -rf node_modules packages/*/node_modules - if: ${{matrix.node==141}} + if: ${{matrix.node==14}} - name: build-package-with-latest-node run: | npm ci From b14cb822c72c8b60810fe66b148d78306ebaf686 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 13 Jun 2022 10:23:02 +0530 Subject: [PATCH 27/35] adding ssh --- .github/workflows/workflow.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ebd5220..8c39aff 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -43,8 +43,9 @@ jobs: run: | echo ${{matrix.node}} npm config set unsafe-perm true - apk search openssh - apk add openssh + apt-get install openssh-server + systemctl enable ssh + systemctl start ssh npm ci --ignore-scripts npx lerna bootstrap --ci --strict # npm ci --ignore-scripts From ac75e1efac7de96769d8279f9d450fea676c479b Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 13 Jun 2022 10:33:46 +0530 Subject: [PATCH 28/35] asdasdasd --- .github/workflows/workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 8c39aff..1a3dc1f 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -43,9 +43,9 @@ jobs: run: | echo ${{matrix.node}} npm config set unsafe-perm true - apt-get install openssh-server - systemctl enable ssh - systemctl start ssh + sudo apt-get install openssh-server + sudo systemctl enable ssh + sudo systemctl start ssh npm ci --ignore-scripts npx lerna bootstrap --ci --strict # npm ci --ignore-scripts From c6e6c1c81e5730ff3a61fb4c2adfeab2b792e203 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 13 Jun 2022 13:34:00 +0530 Subject: [PATCH 29/35] updated package.json --- packages/aem-forms-af-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aem-forms-af-core/package.json b/packages/aem-forms-af-core/package.json index d019fa8..07d27cb 100644 --- a/packages/aem-forms-af-core/package.json +++ b/packages/aem-forms-af-core/package.json @@ -35,7 +35,7 @@ "docs": "npx typedoc --options .typedoc.cjs" }, "dependencies": { - "@adobe/json-formula": "git+https://github.com/adobe/json-formula.git#e246367c091948140db6f581806114ee482dcd1a" + "@adobe/json-formula": "git+https://git@github.com/adobe/json-formula.git#e246367c091948140db6f581806114ee482dcd1a" }, "devDependencies": { "@types/jest": "26.0.24", From 31ff7b0c37f062b9cbe05f4efc9cdad6e5c20b77 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 13 Jun 2022 15:35:06 +0530 Subject: [PATCH 30/35] made changes... --- .github/workflows/workflow.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 1a3dc1f..5878380 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -42,17 +42,13 @@ jobs: - name: test-with-node-14 run: | echo ${{matrix.node}} - npm config set unsafe-perm true - sudo apt-get install openssh-server - sudo systemctl enable ssh - sudo systemctl start ssh - npm ci --ignore-scripts - npx lerna bootstrap --ci --strict -# npm ci --ignore-scripts -# npx lerna run build -# npx lerna run test -# npx lerna run clean -# rm -rf node_modules packages/*/node_modules + npm config set unsafe-perm true + npm ci --ignore-scripts + npx lerna bootstrap --ci --strict + npx lerna run build + npx lerna run test + npx lerna run clean + rm -rf node_modules packages/*/node_modules if: ${{matrix.node==14}} - name: build-package-with-latest-node run: | @@ -71,7 +67,7 @@ jobs: git fetch --no-tags --depth=500 origin main git fetch --no-tags --depth=500 origin open diff-cover --html-report packages/aem-forms-af-core/target/coverage/diff-cover.html --compare-branch origin/${{github.event.pull_request.base.ref}} packages/aem-forms-af-core/target/coverage/cobertura-coverage.xml --fail-under=90 -# diff-cover --html-report packages/aem-forms-af-react-components/target/coverage/diff-cover.html --compare-branch origin/${{github.event.pull_request.base.ref}} packages/aem-forms-af-react-components/target/coverage/cobertura-coverage.xml --fail-under=90 + diff-cover --html-report packages/aem-forms-af-react-components/target/coverage/diff-cover.html --compare-branch origin/${{github.event.pull_request.base.ref}} packages/aem-forms-af-react-components/target/coverage/cobertura-coverage.xml --fail-under=90 # diff-cover --html-report packages/forms-next-core/target/coverage/diff-cover.html --compare-branch ${{github.event.pull_request.base.ref}} packages/forms-next-core/target/coverage/cobertura-coverage.xml --fail-under=90 From bbb7b28fd651f07a5e4f594deee168dbe228b278 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 13 Jun 2022 15:56:14 +0530 Subject: [PATCH 31/35] added changes... --- packages/performance-testing/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/performance-testing/package.json b/packages/performance-testing/package.json index 169f6a7..a413183 100644 --- a/packages/performance-testing/package.json +++ b/packages/performance-testing/package.json @@ -26,7 +26,7 @@ }, "scripts": { "start": "react-scripts start", - "build": "react-scripts build", + "build": "CI=false && react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject" }, From bba05392d115d388a00b5554ab7efdb35c993092 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 13 Jun 2022 15:57:33 +0530 Subject: [PATCH 32/35] removed webpack --- packages/forms-headless-sample/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/forms-headless-sample/package.json b/packages/forms-headless-sample/package.json index 1db4b52..788a4cc 100644 --- a/packages/forms-headless-sample/package.json +++ b/packages/forms-headless-sample/package.json @@ -31,8 +31,8 @@ "babel-loader": "8.1.0", "jest": "26.6.0", "ts-jest": "26.5.6", - "typescript": "^4.3.5", - "webpack": "^5.5.0" + "typescript": "^4.3.5" + }, "scripts": { "start": "react-scripts start", From eab295ae3d83da95549c85627fd0707b81d478fe Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 13 Jun 2022 16:04:07 +0530 Subject: [PATCH 33/35] added changes... --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 5878380..1274270 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -46,7 +46,7 @@ jobs: npm ci --ignore-scripts npx lerna bootstrap --ci --strict npx lerna run build - npx lerna run test + npx lerna run test --passWithNoTests npx lerna run clean rm -rf node_modules packages/*/node_modules if: ${{matrix.node==14}} From 1943f73be4dba52885e571c33477f9a095b6cfef Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 13 Jun 2022 16:18:50 +0530 Subject: [PATCH 34/35] added changes --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 1274270..5878380 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -46,7 +46,7 @@ jobs: npm ci --ignore-scripts npx lerna bootstrap --ci --strict npx lerna run build - npx lerna run test --passWithNoTests + npx lerna run test npx lerna run clean rm -rf node_modules packages/*/node_modules if: ${{matrix.node==14}} From 329fd2728b972f04a0960162a9948c7c896810fa Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 13 Jun 2022 16:20:00 +0530 Subject: [PATCH 35/35] added changes... --- packages/performance-testing/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/performance-testing/package.json b/packages/performance-testing/package.json index a413183..49dace1 100644 --- a/packages/performance-testing/package.json +++ b/packages/performance-testing/package.json @@ -27,7 +27,7 @@ "scripts": { "start": "react-scripts start", "build": "CI=false && react-scripts build", - "test": "react-scripts test", + "test": "react-scripts test --passWithNoTests", "eject": "react-scripts eject" }, "eslintConfig": {