Ensure @rancher/shell version using tags (#11758)

* Ensure @rancher/shell version using tags

Enable corepack for extension builds

Migrate creators outside of shell dir

Update creators path - switch to npm publish

* Add NPM_REGISTRY to publish args

* Fix creators_dir path - Bump ext package

* Add update package version function in test script

* Fix gitignore file name

* Add .yarnrc.yml for skeleton - revert node versions

Author: jordojordo

.github/workflows/build-extension-catalog.yml

@@ -28,7 +28,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Enable Corepack
+        run: corepack enable
 
       - name: Configure Git
         run: |
@@ -47,20 +50,14 @@ jobs:
         with:
           version: v3.8.0
 
-      - name: Setup Nodejs and npm
+      - name: Setup Nodejs with yarn caching
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          cache: yarn
 
       - name: Setup yarn
         run: npm install -g yarn
 
-      - name: Setup Nodejs with yarn caching
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-
       - name: Install dependencies
         run: yarn
 
@@ -75,9 +72,9 @@ jobs:
       - name: Build and push UI image
         run: |
           publish="yarn publish-pkgs -cp -r ${{ inputs.registry_target }} -o ${{ github.repository_owner }}"
-          
+
           if [[ -n "${{ inputs.tagged_release }}" ]]; then
             publish="$publish -t ${{ inputs.tagged_release }}"
           fi
-          
+
           $publish

.github/workflows/build-extension-charts.yml

@@ -28,10 +28,13 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Enable Corepack
+        run: corepack enable
+
       - name: Configure Git
         run: |
           git config user.name 'github-actions[bot]'
@@ -42,20 +45,14 @@ jobs:
         with:
           version: v3.8.0
 
-      - name: Setup Nodejs and npm
+      - name: Setup Nodejs with yarn caching
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          cache: yarn
 
       - name: Setup yarn
         run: npm install -g yarn
 
-      - name: Setup Nodejs with yarn caching
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-
       - name: Install dependencies
         run: yarn
 
@@ -76,7 +73,7 @@ jobs:
           if [[ -n "${{ inputs.tagged_release }}" ]]; then
             publish="$publish -t ${{ inputs.tagged_release }}"
           fi
-          
+
           $publish
 
       - name: Upload charts artifact
@@ -98,9 +95,9 @@ jobs:
       pages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          ref: "${{ inputs.target_branch }}"
+          ref: '${{ inputs.target_branch }}'
 
       - name: Configure Git
         run: |
@@ -125,4 +122,3 @@ jobs:
         env:
           CR_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
           CR_SKIP_EXISTING: true
-

.github/workflows/check-plugins.yaml

@@ -9,23 +9,29 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-    - name: Validate Plugin build system
-      run: ./shell/scripts/test-plugins-build.sh
-      shell: bash
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    - name: Upload files
-      uses: actions/upload-artifact@v3
-      if: failure()
-      with:
-        name: test
-        path: |
-          /tmp/tmp.**/test-app
-          !/tmp/tmp.**/test-app/node_modules/
-          !/tmp/tmp.**/test-app/pkg/test-pkg/node_modules/
-        retention-days: 2
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - name: Validate Plugin build system
+        run: ./shell/scripts/test-plugins-build.sh
+        shell: bash
+
+      - name: Upload files
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: test
+          path: |
+            /tmp/tmp.**/test-app
+            !/tmp/tmp.**/test-app/node_modules/
+            !/tmp/tmp.**/test-app/pkg/test-pkg/node_modules/
+          retention-days: 2

.github/workflows/release-shell-pkg.yaml

@@ -3,8 +3,8 @@ name: Publish Shell Package
 on:
   push:
     tags:
-        - 'shell-pkg-v*'
-        - 'creators-pkg-v*'
+      - 'shell-pkg-v*'
+      - 'creators-pkg-v*'
 
 jobs:
   build:
@@ -13,46 +13,46 @@ jobs:
       contents: read
       packages: write
     steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-
-    - name: Check Tags Version Matching
-      env:
-        TAG: ${{github.ref_name}}
-      run: ./.github/workflows/scripts/check-package-tag-version.sh
-      shell: bash
-
-    - name: Validate Plugin build system
-      run: ./shell/scripts/test-plugins-build.sh
-      shell: bash
-
-    # Reset the local (ci) repository state because
-    # The previous step (Validate Plugin build system) changes
-    # the version number on package.json for Shell in order
-    # to release it in verdaccio for it's tests
-    - name: Reset repository (file system)
-      run: | 
-        git reset --hard HEAD
-        echo $YARN_REGISTRY
-        cat ./shell/package.json
-
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        registry-url: 'https://registry.npmjs.org'
-        scope: '@rancher'
-    
-    - name: Install packages
-      run: yarn install --frozen-lockfile
-
-    - name: Publish Shell Package to npm
-      run: ./shell/scripts/publish-shell.sh --npm
-      env:
-        TAG: ${{github.ref_name}}
-        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Check Tags Version Matching
+        env:
+          TAG: ${{github.ref_name}}
+        run: ./.github/workflows/scripts/check-package-tag-version.sh
+        shell: bash
+
+      - name: Validate Plugin build system
+        run: ./shell/scripts/test-plugins-build.sh
+        shell: bash
+
+      # Reset the local (ci) repository state because
+      # The previous step (Validate Plugin build system) changes
+      # the version number on package.json for Shell in order
+      # to release it in verdaccio for it's tests
+      - name: Reset repository (file system)
+        run: |
+          git reset --hard HEAD
+          echo $NPM_REGISTRY
+          cat ./shell/package.json
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          registry-url: 'https://registry.npmjs.org'
+          scope: '@rancher'
+
+      - name: Install packages
+        run: yarn install --frozen-lockfile
+
+      - name: Publish Shell Package to npm
+        run: ./shell/scripts/publish-shell.sh --npm
+        env:
+          TAG: ${{github.ref_name}}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

shell/creators/extension/app/app.package.json creators/extension/app/app.package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": false,
   "engines": {
-    "node": ">=20"
+    "node": ">=16"
   },
   "dependencies": {
     "cache-loader": "^4.1.0",

shell/creators/extension/app/files/.eslintignore creators/extension/app/files/.eslintignore

@@ -0,0 +1,2 @@
+nodeLinker: node-modules
+pnpMode: false

shell/creators/extension/app/files/.eslintrc.js creators/extension/app/files/.eslintrc.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 /* eslint-disable no-console */
 
-const { execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs-extra');
 
@@ -14,9 +13,10 @@ const targets = {
 const files = [
   'tsconfig.json',
   'vue.config.js',
-  '.gitignore',
+  'gitignore',
   '.eslintignore',
   '.eslintrc.js',
+  '.yarnrc.yml',
   'babel.config.js',
   '.vscode/settings.json'
 ];
@@ -26,6 +26,7 @@ console.log('Creating Skeleton Application');
 
 const args = process.argv;
 let appFolder = path.resolve('.');
+let shellVersion = '';
 
 if ( args.length > 2 ) {
   const name = args[2];
@@ -40,7 +41,9 @@ let addGitlabWorkflow = false;
 let addWorkflowFolder = true;
 
 // Check for Gitlab integration option
-if ( args.length > 3 ) {
+if ( args.length >= 3 ) {
+  shellVersion = args[3];
+
   for (let i = 3; i < args.length; i++) {
     switch (args[i]) {
     case '-l':
@@ -95,10 +98,7 @@ Object.keys(targets).forEach((target) => {
 const creatorPkgData = fs.readFileSync(path.join(__dirname, 'package.json'));
 const creatorPkg = JSON.parse(creatorPkgData);
 
-// Fetch the latest version of @rancher/shell
-const shellVersion = execSync('npm view @rancher/shell version').toString().trim();
-
-// Set the latest version of @rancher/shell in the dependencies
+// Set the package version of @rancher/shell in the dependencies
 pkg.dependencies['@rancher/shell'] = `^${ shellVersion }`;
 
 // Rest of dependencies are in the _pkgs property of package.json - copy then across
@@ -138,8 +138,9 @@ if ( addWorkflowFolder ) {
 
 // Copy base files
 files.forEach((file) => {
+  const destinationFile = file === 'gitignore' ? '.gitignore' : file;
   const src = path.join(__dirname, 'files', file);
-  const dest = path.join(appFolder, file);
+  const dest = path.join(appFolder, destinationFile);
 
   if (!fs.existsSync(dest)) {
     console.log(`  Adding file: ${ file }`);

shell/creators/extension/app/files/.github/workflows/build-extension-catalog.yml creators/extension/app/files/.github/workflows/build-extension-catalog.yml

@@ -11,7 +11,7 @@
     "init"
   ],
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=16.0.0"
   },
   "_requires": [
     "core-js",