From dd94c934790a7129f8cfe8875221192ec8ca55f1 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Mon, 27 Nov 2023 10:11:21 -0500 Subject: [PATCH 01/22] - Added SPFx package release workflow --- .github/workflows/publish.yml | 89 +++++++++++++++++++++++++++++++ packages/spfx/gulpfile.js | 98 +++++++++++++++++++++++++++++++++-- packages/spfx/package.json | 3 +- pnpm-lock.yaml | 3 ++ 4 files changed, 188 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d3640b5..7aa93e9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -79,6 +79,95 @@ jobs: - name: Tests run: pnpm run test + + build_spfx: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./packages/spfx + env: + SEMVER: ${{ needs.version.outputs.semver }} + MAJORMINORPATCH: ${{ needs.version.outputs.majorMinorPatch }} + needs: [version, tests] + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - uses: actions/setup-node@v3 + with: + node-version: '16' + + - uses: pnpm/action-setup@v2 + with: + version: 8 + run_install: false + + - name: Get pnpm store directory + shell: bash + run: | + echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV + + - uses: actions/cache@v3 + name: Setup pnpm cache + with: + path: ${{ env.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- + + - name: Install dependencies + run: pnpm install + + - name: Build + bundle SPFx + run: | + gulp update-version --value $MAJORMINORPATCH + gulp update-package-name --name pnp-modern-search-core-spfx-$SEMVER + gulp bundle --ship + gulp package-solution --ship + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: pnp-modern-search-core-spfx-$SEMVER + path: ${{ github.workspace }}/**/*.sppkg + + release_spfx: + runs-on: ubuntu-latest + environment: production + if: ${{ github.ref_name == 'main' || startsWith(github.ref_name, 'release') || github.event.inputs.create_release }} + needs: [version,build_spfx] + defaults: + run: + working-directory: ./packages/spfx + env: + SEMVER: ${{ needs.version.outputs.semver }} + MAJORMINORPATCH: ${{ needs.version.outputs.majorMinorPatch }} + steps: + + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - uses: actions/download-artifact@v3 + with: + name: pnp-modern-search-core-spfx-$SEMVER + + - name: Create GitHub release + uses: ncipollo/release-action@v1 + with: + name: PnP Modern Search Core WebParts - $SEMVER + artifacts: ${{ github.workspace }}/**/*.sppkg + bodyFile: ".github/workflows/release-template.md" + draft: true + generateReleaseNotes: true + allowUpdates: true + replacesArtifacts: true + prerelease: ${{ startsWith(github.ref_name, 'release') }} + tag: $MAJORMINORPATCH + commit: ${{ github.ref_name }} + publish: runs-on: ubuntu-latest diff --git a/packages/spfx/gulpfile.js b/packages/spfx/gulpfile.js index b4b7324..e14187f 100644 --- a/packages/spfx/gulpfile.js +++ b/packages/spfx/gulpfile.js @@ -1,5 +1,11 @@ +/* eslint-disable @typescript-eslint/no-empty-function */ 'use strict'; -const { registry } = require('gulp'); + +const gulp = require('gulp'); +const path = require('path'); +const log = require('fancy-log'); +const fs = require('fs'); + const build = require('@microsoft/sp-build-web'); build.addSuppression(`Warning - [sass] The local CSS class 'ms-Grid' is not camelCase and will not be type-safe.`); @@ -78,9 +84,93 @@ const { addFastServe } = require("spfx-fast-serve-helpers"); addFastServe(build); /* end of fast-serve */ -// SPFx common gulp tasks -//const PnPModernSearchCommonRegistry = require('../toolchain/gulp.js'); -//registry(new PnPModernSearchCommonRegistry()); +const readJson = (path, cb) => { + fs.readFile(require.resolve(path), (err, data) => { + if (err) + log.error(err) + else + cb(null, JSON.parse(data)) + }); +} + +const findFilesByExt = (base, ext, files, result) => { + files = files || fs.readdirSync(base) + result = result || [] + + files.forEach( + function (file) { + var newbase = path.join(base, file) + if (fs.statSync(newbase).isDirectory()) { + result = findFilesByExt(newbase, ext, fs.readdirSync(newbase), result) + } else { + if (file.substr(-1 * (ext.length + 1)) == '.' + ext) { + result.push(newbase) + } + } + } + ); + return result +} + +gulp.task('update-version', async () => { + + // List all manifest files + const manifestFiles = findFilesByExt('./src','manifest.json'); + + const semver = require('semver'); + const versionArgIdx = process.argv.indexOf('--value'); + const newVersionNumber = semver.valid(process.argv[versionArgIdx+1]); + + if (versionArgIdx !== -1 && newVersionNumber) { + + // Update version in the package-solution + const pkgSolutionFilePath = path.resolve('./config/package-solution.json'); + + readJson(pkgSolutionFilePath, (err, pkgSolution) => { + log.info('Old package-solution.json version:\t' + pkgSolution.solution.version); + const pkgVersion = `${semver.major(newVersionNumber)}.${semver.minor(newVersionNumber)}.${semver.patch(newVersionNumber)}.0`; + pkgSolution.solution.version = pkgVersion; + log.info('New package-solution.json version:\t' + pkgVersion); + fs.writeFile(pkgSolutionFilePath, JSON.stringify(pkgSolution, null, 4), (error) => {}); + }); + + // Updated version in Web Part manifests + manifestFiles.forEach((manifestFile) => { + readJson(path.resolve(`./${manifestFile}`), (err, manifest) => { + + log.info(`Updating manifest file: "./${manifestFile}"`); + + log.info('Old manifestFile version:\t' + manifest.version); + const wpVersion = `${semver.major(newVersionNumber)}.${semver.minor(newVersionNumber)}.${semver.patch(newVersionNumber)}`; + manifest.version = wpVersion; + log.info('New manifestFile version:\t' + wpVersion); + fs.writeFile(manifestFile, JSON.stringify(manifest, null, 4), (error) => { }); + }); + }); + } else { + log.error(`The provided version ${process.argv[versionArgIdx+1]} is not a valid SemVer version`); + } + +}); + +gulp.task('update-package-name', async () => { + + const pkgSolutionFilePath = './config/package-solution.json'; + + const fileNameArg = process.argv.indexOf('--name'); + const fileName = process.argv[fileNameArg + 1]; + + if (fileNameArg !== -1 && fileName) { + readJson(pkgSolutionFilePath, (err, pkgSolution) => { + const currentPackageName = path.basename(pkgSolution.paths.zippedPackage, '.sppkg'); + log.info(`Rename ${currentPackageName}.sppkg to ${fileName}.sppkg`); + pkgSolution.paths.zippedPackage = pkgSolution.paths.zippedPackage.replace(path.basename(pkgSolution.paths.zippedPackage, '.sppkg'), fileName); + fs.writeFile(pkgSolutionFilePath, JSON.stringify(pkgSolution, null, 4), (error) => { }); + }); + } else { + log.error(`Error: wrong parameters`); + } +}); build.initialize(require('gulp')); diff --git a/packages/spfx/package.json b/packages/spfx/package.json index 3afcb3a..e2a8ea0 100644 --- a/packages/spfx/package.json +++ b/packages/spfx/package.json @@ -70,6 +70,7 @@ "null-loader": "4.0.1", "spfx-fast-serve-helpers": "~1.17.0", "typescript": "4.9.5", - "webpack": "~4.44.2" + "webpack": "~4.44.2", + "semver": "7.5.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53adbdd..9d80b93 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -454,6 +454,9 @@ importers: null-loader: specifier: 4.0.1 version: 4.0.1(webpack@4.44.2) + semver: + specifier: 7.5.4 + version: 7.5.4 source-map-loader: specifier: 1.1.3 version: 1.1.3(webpack@4.44.2) From 993e6b173be3b706bed126d6cac553e6a2f68617 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Mon, 27 Nov 2023 10:16:30 -0500 Subject: [PATCH 02/22] - Updated workflow --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7aa93e9..0a11287 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -88,7 +88,7 @@ jobs: env: SEMVER: ${{ needs.version.outputs.semver }} MAJORMINORPATCH: ${{ needs.version.outputs.majorMinorPatch }} - needs: [version, tests] + needs: [version, build_components] steps: - name: Checkout uses: actions/checkout@v3 @@ -168,7 +168,7 @@ jobs: tag: $MAJORMINORPATCH commit: ${{ github.ref_name }} - publish: + build_components: runs-on: ubuntu-latest needs: [version, tests] From 450a37a33a6289c785b8d604188994d9af0220dc Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Mon, 27 Nov 2023 10:28:34 -0500 Subject: [PATCH 03/22] - Updated workflow --- .github/workflows/publish.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0a11287..22cf6f8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -99,6 +99,8 @@ jobs: with: node-version: '16' + - uses: actions/download-artifact@v3 + - uses: pnpm/action-setup@v2 with: version: 8 @@ -218,7 +220,33 @@ jobs: - name: Build run: pnpm run build + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + path: ${{ github.workspace }}/**/dist/* + + publish_components: + runs-on: ubuntu-latest + needs: build_components + defaults: + run: + working-directory: ./packages/components + env: + VERSION: ${{ needs.version.outputs.semver }} + steps: + - uses: actions/setup-node@v3 + with: + node-version: '16' + registry-url: 'https://registry.npmjs.org' + + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - uses: actions/download-artifact@v3 + - name: Publish run: npm publish env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} From 095ff040ee059c18efed5346e5d43553a9b6834c Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Mon, 27 Nov 2023 10:37:53 -0500 Subject: [PATCH 04/22] - Updated workflow --- .github/workflows/publish.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 22cf6f8..66cecce 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -100,6 +100,8 @@ jobs: node-version: '16' - uses: actions/download-artifact@v3 + with: + name: build_dist - uses: pnpm/action-setup@v2 with: @@ -223,7 +225,8 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - path: ${{ github.workspace }}/**/dist/* + name: build_dist + path: ${{ github.workspace }}/**/dist publish_components: runs-on: ubuntu-latest @@ -245,6 +248,8 @@ jobs: fetch-depth: 0 - uses: actions/download-artifact@v3 + with: + name: build_dist - name: Publish run: npm publish From 535fdae4bdd5c960b268bc6d4f1c081a5e140bb0 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Mon, 27 Nov 2023 10:44:51 -0500 Subject: [PATCH 05/22] - Updated workflow --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 66cecce..db7f13d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -226,7 +226,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: build_dist - path: ${{ github.workspace }}/**/dist + path: ${{ github.workspace }}/packages/components/dist publish_components: runs-on: ubuntu-latest From 78c15c8fd051c34f5e300949f77f9241a89dd5e6 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Mon, 27 Nov 2023 10:51:23 -0500 Subject: [PATCH 06/22] - Updated workflow --- .github/workflows/publish.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index db7f13d..0d24906 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -82,9 +82,6 @@ jobs: build_spfx: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./packages/spfx env: SEMVER: ${{ needs.version.outputs.semver }} MAJORMINORPATCH: ${{ needs.version.outputs.majorMinorPatch }} @@ -99,10 +96,6 @@ jobs: with: node-version: '16' - - uses: actions/download-artifact@v3 - with: - name: build_dist - - uses: pnpm/action-setup@v2 with: version: 8 From a1038ccf87dbc5c5c00afa843e3e8c3bd02535f6 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Mon, 27 Nov 2023 11:07:27 -0500 Subject: [PATCH 07/22] - Updated workflow --- .github/workflows/publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d24906..71aa30b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -117,8 +117,13 @@ jobs: - name: Install dependencies run: pnpm install + - name: Build + run: | + npx lerna run build --scope pnp-modern-search-core + - name: Build + bundle SPFx run: | + cd ./packages/spfx gulp update-version --value $MAJORMINORPATCH gulp update-package-name --name pnp-modern-search-core-spfx-$SEMVER gulp bundle --ship From 9e86bda37ccf493e5c55b0f46bea50b77fc43479 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Mon, 27 Nov 2023 11:19:05 -0500 Subject: [PATCH 08/22] - Update version --- packages/spfx/config/package-solution.json | 2 +- .../src/webparts/searchBox/SearchBoxWebPart.manifest.json | 5 ++--- .../searchFilters/SearchFiltersWebPart.manifest.json | 5 ++--- .../searchResults/SearchResultsWebPart.manifest.json | 5 ++--- .../searchVerticals/SearchVerticalsWebPart.manifest.json | 5 ++--- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/packages/spfx/config/package-solution.json b/packages/spfx/config/package-solution.json index 8ac0f60..9047377 100644 --- a/packages/spfx/config/package-solution.json +++ b/packages/spfx/config/package-solution.json @@ -3,7 +3,7 @@ "solution": { "name": "PnP Modern Search Core - Search Web Parts", "id": "9aad2c6c-dd90-4fae-9e62-8aeae8969c9a", - "version": "0.0.1.0", + "version": "1.0.0.0", "includeClientSideAssets": true, "skipFeatureDeployment": true, "isDomainIsolated": false, diff --git a/packages/spfx/src/webparts/searchBox/SearchBoxWebPart.manifest.json b/packages/spfx/src/webparts/searchBox/SearchBoxWebPart.manifest.json index 5bbe7eb..b495481 100644 --- a/packages/spfx/src/webparts/searchBox/SearchBoxWebPart.manifest.json +++ b/packages/spfx/src/webparts/searchBox/SearchBoxWebPart.manifest.json @@ -3,7 +3,7 @@ "id": "2ad6c8e4-0912-460b-a65c-7e0bbdb864cf", "alias": "PnPModernSearchCoreSearchBoxWebPart", "componentType": "WebPart", - "version": "0.0.1", + "version": "1.0.0", "manifestVersion": 2, "requiresCustomScript": false, "supportedHosts": [ @@ -28,8 +28,7 @@ "fr-fr": "Permet aux utilisateurs de rechercher sur la base d'une requête textuelle" }, "iconImageUrl": "data:image/png;base64,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", - "properties": { - } + "properties": {} } ] } \ No newline at end of file diff --git a/packages/spfx/src/webparts/searchFilters/SearchFiltersWebPart.manifest.json b/packages/spfx/src/webparts/searchFilters/SearchFiltersWebPart.manifest.json index eed3970..5890552 100644 --- a/packages/spfx/src/webparts/searchFilters/SearchFiltersWebPart.manifest.json +++ b/packages/spfx/src/webparts/searchFilters/SearchFiltersWebPart.manifest.json @@ -3,7 +3,7 @@ "id": "4f2451b5-c1ea-4a68-8097-90edc9da61ce", "alias": "PnPModernSearchCoreFiltersPart", "componentType": "WebPart", - "version": "0.0.1", + "version": "1.0.0", "manifestVersion": 2, "requiresCustomScript": false, "supportedHosts": [ @@ -28,8 +28,7 @@ "fr-fr": "Filtre les résultats provenant du Web Part de résultats de recherche" }, "iconImageUrl": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACYAAAAdCAYAAADGgB7AAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAgbSURBVFhHzVdZbFTXGf5mt2c8M97GHq9jC9cbXsHGjR0QxoCgLTGbIlrRipQK5aEpIQ/tQ9V9U58auany0NA+VKGKmoIxkNQq4CAgMUocG/ASLwnYrct4PMaz7zO3/39mbtRaE4Sp1PaTzvz3nnuW/3z/dgb/r1Ck5H8MSZKyqdUoFIoMatdS3f87kDIvUhugtkpNikQiLCQpkfhlash/H7R9CzVHKBgSujDu3rktZDAYYDEaiYTVqeHrwhObkjZtITFEMntmdhbFRUU4f/ZNRGMxNLe0ori4GB6PB9U1tR+QaduTsx4fT6QYK0NiyO12tXwyN4elpSU8sD9AXV09XC4XpibGEQoG8c0XX4JGo0FGRkY/jT9GCrrFAo8BZUoKBAKBCpZer8eWlO5sn89jST2nvrn52w+otZjN2fD6fDTPj+bWzWhobEJl1efw3DdOQKFSEWNuVoqn7afD2P1+/zmv261PHeyRWDdjtOh2EkPhcBhLdjsmJydQUlqOOWLuD6//kfqWsH37Nhw//hyGb17Hvt4DCIXC0Om0MJlMW4m1G8mV1gFio5Sl3+cVLPm8nnJiLJ9PGAwEmrmPngepCbz37k1pauoj6bXTv5MamjZJ7R1dQnJ75sAhaXR0VDpz5kxqtMAxXoMtEQ6HhAU+C+tiLJFIdNKJb/Lz7MyMcHSfP4CvHz+B1tYWHHn2EKpra9HX9wquDr2DXTt70L21E70HDor5BBfNz0k9PxLCxwJ+Xw1LPoksiS1NKBiwkb+VJ+KJbO6jUxzh7zFSaGFhHkajCa/85lWSRvRs68TwpTfQ971TqLYVo76uFn+9fAWLdgdOv/ZbniaCJhGPf4vXkvfy+3xl4uMaCMX0hqxplkaj2SXLLKMpmpGpn6fNF5QqpSsry0T8Kr7M32+PjcJiKcDwrVsYHR3DF/fswpV+8q/FedyfHsfUyHvYtb2Lh+Kj6RlUV9dgfn6epiugUCr28vryXoasrL+JgWsgFCN2hNbsTyyJpQo+ESdH+WRkxv0k8j/5eI6+e5GTk4O33x5EEeWvrvZmZBsNSMSjKLeV4aFzCf5VJz7fsQVXrg4hSM4foWBxUyqh0+2Jx2KltK4c5WkjVChG7AitiRUnS2LpPp9Iq9XFBFMEOu0mCndYCgpFbkpQ38iHo9jZ043Fe3M4+vwLCLqduD87jbbuL2B+bhpNTQ1irt3hwPKyg9kR70qVao9Om5HaK8ncWiR9LOCXtReSmMuLxaIKei+hCI2HQyEVKfYlg8GA8Tu3sbj4d9y4foNZFE6/+ekdqG5qx/M/+jW+8tKPUVXXiNINtbAWWnk5OJ0ruHRhQMxLYS/5qShVVLrSRqdQDBJkrYVUKlRxytwGrUZnlyCptDqdkbrFAsQuma8YzpWH/Iqz5/oxfM+FNy5/CEtJBXKLynFr5A7eufsA0xS5zK5jeQkvnDyF0ZEPxBzCjoQUF3sTAWkZE+ki4Pdn6w0GF/maiTb2UI5R63QZMbY/U03MtBFj77NvUZEmBpwYfn8EFy68BY/BhlVjDZRKBY5trYDKvYD+a3cx7wxB57ejLF/Csa99FS0NG8m0zbBarWxK3jaH1nRFIxGdRqsNc8e/QmjNSrFkpVgqFUoxkyDxDy2wkaVer6c6OIFWKtLRaIy7cOjwYf6OeELC6Wv3cGVRC7uqEEpjLjKLqqDUmWEi3+KyNTU1gVURAALCAUPhYCbLtUGQNOUayINZRf6ly1UVSxWd9K2LA6IGHtzfC4MmAfvgr6BJDkOvahGt6jHYbB6hbK7kxJayTJjNZlGqJsbHkZeXJ8YSCslCBWwR2TKpfoG0islQQBI7JhKScFQH3SK6tm7D2Tf/xCkFv/j5z6BTKzlx8mdIeVa0FhMVVhFwCMXiMBm0KMjPh5p8rXd/sgLwzYNgJP+NkHtkU4QGKJnXc6fMXFrFZO3JtKssialbLKPRCHbv2YvtO3qg1WrR0tYBKdOStDdhyFiHdzMaYA1FxLsjZkJjW6dIFZ1dT4v7GSMjUxjEQ37so6pBZQoxSuaT3Cnvnd6UqRD2+70FLEmheZZ5+RYYTSbq9+Hi+XOYmpxEZcc+Yoy/0mk/nsGl6wGcvl0r3qMJFbwaK90ugohGwny7EP0MYnmRItLKZUqhUJplpig9ib2TzvEYoAXuUYKtiMdjwl8W5u+Dq4CqcBN+ODABn2cFMY+DByLudyMR9oFyDurzYzj7+z5egapFLnJyc3m5h/F43KpWq6P8kg5pGZNLk8/j2cAyEPDxdegUJ1iTiaKMTt7dsxP1DY3wIAeqgkqYq9qwuX0Ljj5Vime2lMFSVgVj6QbEc6pQXFKCzEy98LMU+lgpYkmww2zRRaKQn+Xr0GMzxiDWXiZxcnl5GS63W2z0k347hv7hx85KDQ5X+sVVyEoJeGzuAb796kVEXA7sbrPhxJF9aG3ciFxiTK1S9SqVyoHkqunxyKgk5gTvfKJYNJpN0fRTMuWzFotlyVZejvN/uYrB178P99DLaDM6RR3NopylJG/uqLfhO4dacXR3I5pqKqEnh/cHAtCo1ZxKPo1AbuSDn1IpY12MySDm/hwKhQ4ODF7GnalZlBVbsWvbU6J2yiBGhBLMKm/CpSmLXEGn03HUdZNyY2Lgk4DsXceSfY7YyqaIMfu8XgspdoKaRFlcWllZkdwej0TOzF1CkoLieQ34D/EQlzdiSdxiaWwhM5buv+cTMcagDb5Lpz5Jj3pqC9T4L5pc81j6qI1TW6Vb6wrVRx+N/7fs/tkA/gnZljSiSOojiwAAAABJRU5ErkJggg==", - "properties": { - } + "properties": {} } ] } \ No newline at end of file diff --git a/packages/spfx/src/webparts/searchResults/SearchResultsWebPart.manifest.json b/packages/spfx/src/webparts/searchResults/SearchResultsWebPart.manifest.json index e1a0bff..ee781be 100644 --- a/packages/spfx/src/webparts/searchResults/SearchResultsWebPart.manifest.json +++ b/packages/spfx/src/webparts/searchResults/SearchResultsWebPart.manifest.json @@ -3,7 +3,7 @@ "id": "6aa5f17d-c6f5-4853-8017-86ad27f396f1", "alias": "PnPModernSearchCoreResultsWebPart", "componentType": "WebPart", - "version": "0.0.1", + "version": "1.0.0", "manifestVersion": 2, "requiresCustomScript": false, "supportedHosts": [ @@ -28,8 +28,7 @@ "fr-fr": "Affiche des données de multiples source de données au format JSON selon des modèles d'affichage personnalisables." }, "iconImageUrl": "data:image/png;base64,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", - "properties": { - } + "properties": {} } ] } \ No newline at end of file diff --git a/packages/spfx/src/webparts/searchVerticals/SearchVerticalsWebPart.manifest.json b/packages/spfx/src/webparts/searchVerticals/SearchVerticalsWebPart.manifest.json index f71c692..ad10976 100644 --- a/packages/spfx/src/webparts/searchVerticals/SearchVerticalsWebPart.manifest.json +++ b/packages/spfx/src/webparts/searchVerticals/SearchVerticalsWebPart.manifest.json @@ -3,7 +3,7 @@ "id": "aac5f315-4ce8-4386-88fa-897566e2a710", "alias": "PnPModernSearchCoreVerticalsWebPart", "componentType": "WebPart", - "version": "0.0.1", + "version": "1.0.0", "manifestVersion": 2, "requiresCustomScript": false, "supportedHosts": [ @@ -28,8 +28,7 @@ "fr-fr": "Permet de parcourir les données de manière verticale (en silos)" }, "iconImageUrl": "data:image/png;base64,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", - "properties": { - } + "properties": {} } ] } \ No newline at end of file From 974be0b74172f3d420b4316669250f8735b7604e Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Tue, 28 Nov 2023 05:47:34 -0500 Subject: [PATCH 09/22] - Updated gulp file --- packages/spfx/gulpfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/spfx/gulpfile.js b/packages/spfx/gulpfile.js index e14187f..ec76d62 100644 --- a/packages/spfx/gulpfile.js +++ b/packages/spfx/gulpfile.js @@ -131,7 +131,7 @@ gulp.task('update-version', async () => { const pkgVersion = `${semver.major(newVersionNumber)}.${semver.minor(newVersionNumber)}.${semver.patch(newVersionNumber)}.0`; pkgSolution.solution.version = pkgVersion; log.info('New package-solution.json version:\t' + pkgVersion); - fs.writeFile(pkgSolutionFilePath, JSON.stringify(pkgSolution, null, 4), (error) => {}); + fs.writeFileSync(pkgSolutionFilePath, JSON.stringify(pkgSolution, null, 4), (error) => {}); }); // Updated version in Web Part manifests @@ -144,7 +144,7 @@ gulp.task('update-version', async () => { const wpVersion = `${semver.major(newVersionNumber)}.${semver.minor(newVersionNumber)}.${semver.patch(newVersionNumber)}`; manifest.version = wpVersion; log.info('New manifestFile version:\t' + wpVersion); - fs.writeFile(manifestFile, JSON.stringify(manifest, null, 4), (error) => { }); + fs.writeFileSync(manifestFile, JSON.stringify(manifest, null, 4), (error) => { }); }); }); } else { From 31401d5e105a76222dbc154c60dba8dad8752bd7 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Tue, 28 Nov 2023 05:57:38 -0500 Subject: [PATCH 10/22] - Updated directory --- .github/workflows/deploy-docs.yml | 2 +- .github/workflows/publish.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index e8f9c2d..7f37921 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -1,4 +1,4 @@ -name: Deploy Modern Search Core Components - Storybook +name: Deploy documentation env: ENV_AzDeployAppId: ${{ secrets.ENV_AzDeployAppId }} ENV_AzDeployAppCertificateValue: ${{ secrets.ENV_AzDeployAppCertificateValue }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 71aa30b..ff3eec1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: Deploy Modern Search Core Components - NPM Publish +name: Publish components on: push: @@ -122,8 +122,8 @@ jobs: npx lerna run build --scope pnp-modern-search-core - name: Build + bundle SPFx + working-directory: ./packages/spfx run: | - cd ./packages/spfx gulp update-version --value $MAJORMINORPATCH gulp update-package-name --name pnp-modern-search-core-spfx-$SEMVER gulp bundle --ship From ae375cecddfd83e397e6d3e43cf415fbde36bd84 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Tue, 28 Nov 2023 06:11:16 -0500 Subject: [PATCH 11/22] - Updated workflow --- .github/workflows/publish.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ff3eec1..2421788 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -124,8 +124,7 @@ jobs: - name: Build + bundle SPFx working-directory: ./packages/spfx run: | - gulp update-version --value $MAJORMINORPATCH - gulp update-package-name --name pnp-modern-search-core-spfx-$SEMVER + gulp bundle --ship gulp package-solution --ship From 749c8c8d883eb1cb62ad1d052d4aabf70cf39f92 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Tue, 28 Nov 2023 06:23:02 -0500 Subject: [PATCH 12/22] - Fixed issue on path --- .github/workflows/publish.yml | 3 ++- .github/workflows/release-template.md | 4 ++++ packages/spfx/config/config.json | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/release-template.md diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2421788..ff3eec1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -124,7 +124,8 @@ jobs: - name: Build + bundle SPFx working-directory: ./packages/spfx run: | - + gulp update-version --value $MAJORMINORPATCH + gulp update-package-name --name pnp-modern-search-core-spfx-$SEMVER gulp bundle --ship gulp package-solution --ship diff --git a/.github/workflows/release-template.md b/.github/workflows/release-template.md new file mode 100644 index 0000000..eafc5ff --- /dev/null +++ b/.github/workflows/release-template.md @@ -0,0 +1,4 @@ +**This solution includes only one `.sppkg` file:** +- `pnp-modern-search-core-spfx-.sppkg`. + +____ diff --git a/packages/spfx/config/config.json b/packages/spfx/config/config.json index b9a90a7..7e06804 100644 --- a/packages/spfx/config/config.json +++ b/packages/spfx/config/config.json @@ -29,8 +29,8 @@ "pnp-core-search-verticals-web-part": { "components": [ { - "entrypoint": "./lib/webparts/SearchVerticals/SearchVerticalsWebPart.js", - "manifest": "./src/webparts/SearchVerticals/SearchVerticalsWebPart.manifest.json" + "entrypoint": "./lib/webparts/searchVerticals/SearchVerticalsWebPart.js", + "manifest": "./src/webparts/searchVerticals/SearchVerticalsWebPart.manifest.json" } ] } From 82fb4573380b4236075c7f2946a7da156032572d Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Tue, 28 Nov 2023 06:32:53 -0500 Subject: [PATCH 13/22] - Fixed config.json path casing --- packages/spfx/config/config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/spfx/config/config.json b/packages/spfx/config/config.json index 7e06804..f8b99d2 100644 --- a/packages/spfx/config/config.json +++ b/packages/spfx/config/config.json @@ -37,13 +37,13 @@ }, "externals": {}, "localizedResources": { - "SearchResultsWebPartStrings": "lib/webparts/SearchResults/loc/{locale}.js", - "SearchBoxWebPartStrings": "lib/webparts/SearchBox/loc/{locale}.js", + "SearchResultsWebPartStrings": "lib/webparts/searchResults/loc/{locale}.js", + "SearchBoxWebPartStrings": "lib/webparts/searchBox/loc/{locale}.js", "PropertyControlStrings": "node_modules/@pnp/spfx-property-controls/lib/loc/{locale}.js", "ControlStrings": "node_modules/@pnp/spfx-controls-react/lib/loc/{locale}.js", "CommonStrings": "lib/loc/{locale}.js", - "SearchFiltersWebPartStrings": "lib/webparts/SearchFilters/loc/{locale}.js", + "SearchFiltersWebPartStrings": "lib/webparts/searchFilters/loc/{locale}.js", "MicrosoftSearchDataSourceStrings": "lib/datasources/loc/{locale}.js", - "SearchVerticalsWebPartStrings": "lib/webparts/SearchVerticals/loc/{locale}.js" + "SearchVerticalsWebPartStrings": "lib/webparts/searchVerticals/loc/{locale}.js" } } From 6252a34cdc5131207031804312ad7ee401175cce Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Tue, 28 Nov 2023 07:52:44 -0500 Subject: [PATCH 14/22] - Updated workflow --- .github/workflows/publish.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ff3eec1..24c1c91 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -143,9 +143,6 @@ jobs: defaults: run: working-directory: ./packages/spfx - env: - SEMVER: ${{ needs.version.outputs.semver }} - MAJORMINORPATCH: ${{ needs.version.outputs.majorMinorPatch }} steps: - uses: actions/checkout@v3 @@ -159,7 +156,7 @@ jobs: - name: Create GitHub release uses: ncipollo/release-action@v1 with: - name: PnP Modern Search Core WebParts - $SEMVER + name: PnP Modern Search Core WebParts - ${{ needs.version.outputs.semver }} artifacts: ${{ github.workspace }}/**/*.sppkg bodyFile: ".github/workflows/release-template.md" draft: true @@ -167,7 +164,7 @@ jobs: allowUpdates: true replacesArtifacts: true prerelease: ${{ startsWith(github.ref_name, 'release') }} - tag: $MAJORMINORPATCH + tag: ${{ needs.version.outputs.majorMinorPatch }} commit: ${{ github.ref_name }} build_components: @@ -228,7 +225,7 @@ jobs: publish_components: runs-on: ubuntu-latest - needs: build_components + needs: [version,build_components] defaults: run: working-directory: ./packages/components @@ -245,11 +242,18 @@ jobs: with: fetch-depth: 0 + - name: get-npm-version + id: package-version + uses: martinbeentjes/npm-get-version-action@v1.3.1 + with: + path: pnp-modern-search-core + - uses: actions/download-artifact@v3 with: name: build_dist - name: Publish + if: ${{ steps.package-version.outputs.current-version != needs.version.outputs.semver }} run: npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} From 8b232fb3895f43cc7fdcbe40daae1fe3da2610dd Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Tue, 28 Nov 2023 10:19:56 -0500 Subject: [PATCH 15/22] - Updated package name --- .github/workflows/publish.yml | 1 - packages/spfx/config/package-solution.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 24c1c91..79a4231 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -125,7 +125,6 @@ jobs: working-directory: ./packages/spfx run: | gulp update-version --value $MAJORMINORPATCH - gulp update-package-name --name pnp-modern-search-core-spfx-$SEMVER gulp bundle --ship gulp package-solution --ship diff --git a/packages/spfx/config/package-solution.json b/packages/spfx/config/package-solution.json index 9047377..7886afb 100644 --- a/packages/spfx/config/package-solution.json +++ b/packages/spfx/config/package-solution.json @@ -35,6 +35,6 @@ ] }, "paths": { - "zippedPackage": "solution/pnp.core.webparts.search.sppkg" + "zippedPackage": "solution/pnp.webparts.search.core.sppkg" } } \ No newline at end of file From 56faaa9df3c5ac10a63ec36378434ce3cd0803be Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Wed, 29 Nov 2023 05:16:35 -0500 Subject: [PATCH 16/22] - Fixed Webpack issue preventng the sppkg to be deployed --- .../src/components/language-provider/LanguageProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/components/language-provider/LanguageProvider.ts b/packages/components/src/components/language-provider/LanguageProvider.ts index d212375..3591cc6 100644 --- a/packages/components/src/components/language-provider/LanguageProvider.ts +++ b/packages/components/src/components/language-provider/LanguageProvider.ts @@ -18,7 +18,7 @@ export class LanguageProvider { // Load locale file dynamically const localizedResources = await import( - /* webpackChunkName: "pnp-modern-search-core-[request]" */ + /* webpackChunkName: "pnp-modern-search-core-languages" */ /* webpackExports: ["strings"] */ /* webpackMode: "lazy-once" */ `../../loc/strings.${locale}` From 915cb2c38ee2cdb3a9776913990468c12c528124 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Wed, 29 Nov 2023 05:37:04 -0500 Subject: [PATCH 17/22] - Updated workflow --- .github/workflows/publish.yml | 6 ++---- .github/workflows/release-template.md | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 79a4231..012c597 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -243,16 +243,14 @@ jobs: - name: get-npm-version id: package-version - uses: martinbeentjes/npm-get-version-action@v1.3.1 - with: - path: pnp-modern-search-core + run: echo "currentVersion=npm view pnp-modern-search-core dist-tags.latest" >> "$GITHUB_OUTPUT" - uses: actions/download-artifact@v3 with: name: build_dist - name: Publish - if: ${{ steps.package-version.outputs.current-version != needs.version.outputs.semver }} + if: ${{ steps.package-version.outputs.currentVersion != needs.version.outputs.semver }} run: npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} diff --git a/.github/workflows/release-template.md b/.github/workflows/release-template.md index eafc5ff..9c57a1e 100644 --- a/.github/workflows/release-template.md +++ b/.github/workflows/release-template.md @@ -1,4 +1,4 @@ **This solution includes only one `.sppkg` file:** -- `pnp-modern-search-core-spfx-.sppkg`. +- `pnp-modern-search-core-spfx.sppkg`. ____ From 992ade2a600413967a298d592021a92a7d1f0834 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Wed, 29 Nov 2023 05:56:01 -0500 Subject: [PATCH 18/22] - Updated workflow --- .github/workflows/publish.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 012c597..778b13a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -243,14 +243,18 @@ jobs: - name: get-npm-version id: package-version - run: echo "currentVersion=npm view pnp-modern-search-core dist-tags.latest" >> "$GITHUB_OUTPUT" + run: | + latest=npm view pnp-modern-search-core dist-tags.latest + echo "currentVersion=latest" >> "$GITHUB_OUTPUT" - uses: actions/download-artifact@v3 with: name: build_dist - name: Publish - if: ${{ steps.package-version.outputs.currentVersion != needs.version.outputs.semver }} - run: npm publish env: + CURRENT_VERSION: ${{ steps.package-version.outputs.currentVersion }} NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} + if: ${{ CURRENT_VERSION != needs.version.outputs.semver }} + run: npm publish + From 9506ac231d71e161a8399da15aa8813f1fc01a95 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Wed, 29 Nov 2023 05:57:41 -0500 Subject: [PATCH 19/22] - Updated workflow --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 778b13a..a6ca69c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -255,6 +255,6 @@ jobs: env: CURRENT_VERSION: ${{ steps.package-version.outputs.currentVersion }} NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} - if: ${{ CURRENT_VERSION != needs.version.outputs.semver }} + if: ${{ $CURRENT_VERSION != needs.version.outputs.semver }} run: npm publish From 54147c4e7a31763eef743b00d8b371f1d50ffcb5 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Wed, 29 Nov 2023 06:10:38 -0500 Subject: [PATCH 20/22] - Updated workflow --- .github/workflows/publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a6ca69c..558dcf0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -255,6 +255,7 @@ jobs: env: CURRENT_VERSION: ${{ steps.package-version.outputs.currentVersion }} NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} - if: ${{ $CURRENT_VERSION != needs.version.outputs.semver }} - run: npm publish + if: $CURRENT_VERSION != ${{ needs.version.outputs.semver }} + run: npm publish + From 1fc43391aeefbcfe0a4bfe1e4c94c8882748c5b1 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Wed, 29 Nov 2023 06:27:38 -0500 Subject: [PATCH 21/22] - Updated workflow --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 558dcf0..f6569a9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -245,7 +245,7 @@ jobs: id: package-version run: | latest=npm view pnp-modern-search-core dist-tags.latest - echo "currentVersion=latest" >> "$GITHUB_OUTPUT" + echo "currentVersion=$latest" >> "$GITHUB_OUTPUT" - uses: actions/download-artifact@v3 with: From 5a1b5afd46e6b00b827da05c11d9c613846f9e53 Mon Sep 17 00:00:00 2001 From: Franck Cornu Date: Wed, 29 Nov 2023 07:08:21 -0500 Subject: [PATCH 22/22] - Updated workflow --- .github/workflows/publish.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f6569a9..98aadbb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -243,9 +243,7 @@ jobs: - name: get-npm-version id: package-version - run: | - latest=npm view pnp-modern-search-core dist-tags.latest - echo "currentVersion=$latest" >> "$GITHUB_OUTPUT" + run: echo "currentVersion=$(npm view pnp-modern-search-core dist-tags.latest)" >> "$GITHUB_OUTPUT" - uses: actions/download-artifact@v3 with: