Release v2.1.0 (#120)

## 🎯 Aim

Align dev to main and prepare for v2.1.0 release

.github/workflows/release-beta.yml

@@ -5,18 +5,54 @@ on:
 
 jobs:
   build:
-    name: "Build and release"
+    name: "Build and pre-release"
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - name: Setup node
+        uses: actions/setup-node@v3.8.1
         with:
-          node-version: 16
+          node-version: 18
           registry-url: https://registry.npmjs.org/
-
+
+      - name: Checkout vscode-viva
+        uses: actions/checkout@v3
+        with:
+          path: vscode-viva
+
       - name: Install the dependencies
-        run: npm i
+        run: npm install
+        working-directory: vscode-viva
+
+      - name: Checkout cli-microsoft365
+        uses: actions/checkout@v3
+        with:
+          repository: Adam-it/cli-microsoft365
+          path: cli-microsoft365
+          ref: cli-cjs
+
+      - name: Print dir
+        run: |
+          dir
+
+      - name: Restore dependencies for cli-microsoft365
+        run: npm install
+        working-directory: cli-microsoft365
+
+      - name: Build cli-microsoft365
+        run: npm run build
+        working-directory: cli-microsoft365
+
+      - name: Run script copy local CLI for M365    
+        run: .\vscode-viva\scripts\cli-for-microsoft365-copy-local-version.ps1 -workspacePath "${{ github.workspace }}"
+        shell: pwsh
+        continue-on-error: false
+
+      - name: Run script clean local CLI for M365 dependency  
+        run: .\vscode-viva\scripts\cli-for-microsoft365-cleanup.ps1 -workspacePath "${{ github.workspace }}"
+        shell: pwsh
+        continue-on-error: false
 
       - name: Publish
-        run: npx vsce publish -p ${{ secrets.VSCE_PAT }} --pre-release --baseImagesUrl https://raw.githubusercontent.com/pnp/vscode-viva/dev
+        run: npx @vscode/vsce publish -p ${{ secrets.VSCE_PAT }} --pre-release --baseImagesUrl https://raw.githubusercontent.com/pnp/vscode-viva/dev
+        working-directory: vscode-viva

.github/workflows/release-local.yml

@@ -0,0 +1,66 @@
+name: Create .vsix package
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: "Build and package"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup node
+        uses: actions/[email protected]
+        with:
+          node-version: 18
+          registry-url: https://registry.npmjs.org/
+
+      - name: Checkout vscode-viva
+        uses: actions/checkout@v3
+        with:
+          path: vscode-viva
+
+      - name: Install the dependencies
+        run: npm install
+        working-directory: vscode-viva
+
+      - name: Checkout cli-microsoft365
+        uses: actions/checkout@v3
+        with:
+          repository: Adam-it/cli-microsoft365
+          path: cli-microsoft365
+          ref: cli-cjs
+
+      - name: Print dir
+        run: |
+          dir
+
+      - name: Restore dependencies for cli-microsoft365
+        run: npm install
+        working-directory: cli-microsoft365
+
+      - name: Build cli-microsoft365
+        run: npm run build
+        working-directory: cli-microsoft365
+
+      - name: Run script copy local CLI for M365    
+        run: .\vscode-viva\scripts\cli-for-microsoft365-copy-local-version.ps1 -workspacePath "${{ github.workspace }}"
+        shell: pwsh
+        continue-on-error: false
+
+      - name: Run script clean local CLI for M365 dependency  
+        run: .\vscode-viva\scripts\cli-for-microsoft365-cleanup.ps1 -workspacePath "${{ github.workspace }}"
+        shell: pwsh
+        continue-on-error: false
+
+      - name: Package
+        run: |
+          npx @vscode/vsce package
+        working-directory: vscode-viva
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: vsix_package
+          path: |
+            vscode-viva/*.vsix

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Main Release
+name: Release
 
 on:
   release:
@@ -12,14 +12,50 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - name: Setup node
+        uses: actions/setup-node@v3.8.1
         with:
-          node-version: 16
+          node-version: 18
           registry-url: https://registry.npmjs.org/
-
+
+      - name: Checkout vscode-viva
+        uses: actions/checkout@v3
+        with:
+          path: vscode-viva
+
       - name: Install the dependencies
-        run: npm i
+        run: npm install
+        working-directory: vscode-viva
+
+      - name: Checkout cli-microsoft365
+        uses: actions/checkout@v3
+        with:
+          repository: Adam-it/cli-microsoft365
+          path: cli-microsoft365
+          ref: cli-cjs
+
+      - name: Print dir
+        run: |
+          dir
+
+      - name: Restore dependencies for cli-microsoft365
+        run: npm install
+        working-directory: cli-microsoft365
+
+      - name: Build cli-microsoft365
+        run: npm run build
+        working-directory: cli-microsoft365
+
+      - name: Run script copy local CLI for M365    
+        run: .\vscode-viva\scripts\cli-for-microsoft365-copy-local-version.ps1 -workspacePath "${{ github.workspace }}"
+        shell: pwsh
+        continue-on-error: false
+
+      - name: Run script clean local CLI for M365 dependency  
+        run: .\vscode-viva\scripts\cli-for-microsoft365-cleanup.ps1 -workspacePath "${{ github.workspace }}"
+        shell: pwsh
+        continue-on-error: false
 
       - name: Publish
-        run: npx vsce publish -p ${{ secrets.VSCE_PAT }}
+        run: npx @vscode/vsce publish -p ${{ secrets.VSCE_PAT }}
+        working-directory: vscode-viva

.vscodeignore

@@ -16,4 +16,5 @@ postcss.config.js
 webpack
 .github
 scripts
-data
+data
+cli-microsoft365

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [2.1.0] - 2023-10-26
+
+- Updated npm packages
+- Updated product logo
+- Refactored pipelines to replace npm package with local cleaned-up
+version of CLI
+- Refactored pipelines to use node v18
+- Added new pipeline to create artifact with package
+- Bug fix of Login after logout
+- Bug fix to read sample data from main
+- Added support for SPFx 1.18.0 (upgrade)
+- Updated validate environment will validate node 16-18
+- Updated scaffolding process (different flow for node 16 and 18, new
+ACEs templates)
+
 ## [2.0.0] - 2023-09-15
 
 - Added new rename action

README.md

@@ -1,5 +1,5 @@
 <h1 align="center">
-  <img alt="Viva Connections Toolkit for Visual Studio Code" src="./assets/logo.png" width="150px" />
+  <img alt="Viva Connections Toolkit for Visual Studio Code" src="./assets/logo-large.png" width="150px" />
 </h1>
 
 <h1 align="center">
@@ -64,7 +64,7 @@ To ensure that you can develop SPFx solutions, in Viva Connections Toolkit you m
 
 This action will check if you have the required dependencies to create a new Viva Connections app.
 
-- Node version: 16
+- Node version: 16 or 18
 - NPM dependencies:
   - gulp
   - yo
@@ -116,7 +116,6 @@ Login-in is also required for some actions to work properly like the deploy acti
 
 Additionally, when an SPFx project is opened the extension will check serve.json file and suggest updating it to set the initialPage property based on the currently logged-in tenant.
 
-
 ### 7️⃣ Gulp tasks
 
 One of the sections of the extension shows all possible Gulp tasks one may run on an SPFx project. The tasks allow you to clean, bundle, package, serve the project with a single click.