Revert "Umutuzgur/sc 23256/pwt native code package simple"

.github/workflows/release-canary.yml

@@ -19,16 +19,15 @@ jobs:
           node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
       # Extract the dynamic value from the canary label if present
-      - name: Extract CANARY_TAG
+      - name: Extract dynamic value from canary label
         id: extract-canary
         run: |
-          export LABELS_JSON='${{ toJson(github.event.pull_request.labels) }}'
-          CANARY_TAG=$(node -e "
-            const labels = JSON.parse(process.env.LABELS_JSON || '[]');
-            const canaryLabel = labels.find(label => label.name.startsWith('canary:'));
-            if (canaryLabel) console.log(canaryLabel.name.split(':')[1]);
-          ")
-          echo "CANARY_TAG=$CANARY_TAG" >> $GITHUB_ENV
+          if [[ "${GITHUB_EVENT_LABEL_NAME}" == canary:* ]]; then
+            CANARY_TAG="${GITHUB_EVENT_LABEL_NAME#canary:}"
+            echo "CANARY_TAG=${CANARY_TAG}" >> $GITHUB_ENV
+          fi
+        env:
+          GITHUB_EVENT_LABEL_NAME: ${{ github.event.label.name }}
       # Ensure that the README is published with the package
       - run: rm -f packages/cli/README.md && cp README.md packages/cli
       - run: echo "PR_VERSION=0.0.0-pr.${{github.event.pull_request.number}}.$(git rev-parse --short HEAD)" >> $GITHUB_ENV
@@ -37,13 +36,10 @@ jobs:
       # Publish to npm with the additional tag if CANARY_TAG is set
       - run: |
           npm publish --workspace packages/cli --tag experimental
-          if [[ -n "$CANARY_TAG" ]]; then
-            echo "Publishing with additional tag: $CANARY_TAG"
-            npm dist-tag add checkly@$PR_VERSION $CANARY_TAG
-          fi
+           if [[ -n "${{ env.CANARY_TAG }}" ]]; then
+             npm dist-tag add checkly@${{ env.PR_VERSION }} ${{ env.CANARY_TAG }}
+           fi
         env:
-          CANARY_TAG: ${{ env.CANARY_TAG }}
-          PR_VERSION: ${{ env.PR_VERSION }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - uses: marocchino/sticky-pull-request-comment@v2
         with:

packages/cli/package.json

@@ -73,11 +73,9 @@
     "@oclif/plugin-not-found": "^3.2.44",
     "@oclif/plugin-plugins": "^5.4.36",
     "@oclif/plugin-warn-if-update-available": "^3.1.35",
-    "@types/archiver": "6.0.3",
     "@typescript-eslint/typescript-estree": "^8.30.0",
     "acorn": "^8.14.1",
     "acorn-walk": "^8.3.4",
-    "archiver": "7.0.1",
     "axios": "^1.8.4",
     "chalk": "^4.1.2",
     "ci-info": "^4.2.0",
@@ -91,7 +89,6 @@
     "jwt-decode": "^3.1.2",
     "log-symbols": "^4.1.0",
     "luxon": "^3.6.1",
-    "minimatch": "9.0.5",
     "mqtt": "^5.11.0",
     "open": "^8.4.2",
     "p-queue": "^6.6.2",

packages/cli/src/commands/deploy.ts

@@ -11,7 +11,7 @@ import type { Runtime } from '../rest/runtimes'
 import {
   Check, AlertChannelSubscription, AlertChannel, CheckGroup, Dashboard,
   MaintenanceWindow, PrivateLocation, PrivateLocationCheckAssignment, PrivateLocationGroupAssignment,
-  Project, ProjectData, BrowserCheck, PlaywrightCheck,
+  Project, ProjectData, BrowserCheck,
 } from '../constructs'
 import chalk from 'chalk'
 import { splitConfigFilePath, getGitInformation } from '../services/util'
@@ -114,9 +114,6 @@ export default class Deploy extends AuthCommand {
       defaultRuntimeId: account.runtimeId,
       verifyRuntimeDependencies,
       checklyConfigConstructs,
-      playwrightConfigPath: checklyConfig.checks?.playwrightConfigPath,
-      include: checklyConfig.checks?.include,
-      playwrightChecks: checklyConfig.checks?.playwrightChecks,
     })
     const repoInfo = getGitInformation(project.repoUrl)
 
@@ -131,19 +128,6 @@ export default class Deploy extends AuthCommand {
         }
         check.snapshots = await uploadSnapshots(check.rawSnapshots)
       }
-
-      for (const check of Object.values(project.data.check)) {
-        // TODO: Improve bundling and uploading
-        if (!(check instanceof PlaywrightCheck) || check.codeBundlePath) {
-          continue
-        }
-        const {
-          relativePlaywrightConfigPath, browsers, key,
-        } = await PlaywrightCheck.bundleProject(check.playwrightConfigPath, check.include)
-        check.codeBundlePath = key
-        check.browsers = browsers
-        check.playwrightConfigPath = relativePlaywrightConfigPath
-      }
     }
 
     const projectPayload = project.synthesize(false)

packages/cli/src/commands/test.ts

@@ -16,7 +16,7 @@ import { loadChecklyConfig } from '../services/checkly-config-loader'
 import { filterByFileNamePattern, filterByCheckNamePattern, filterByTags } from '../services/test-filters'
 import type { Runtime } from '../rest/runtimes'
 import { AuthCommand } from './authCommand'
-import { BrowserCheck, Check, HeartbeatCheck, MultiStepCheck, PlaywrightCheck, Project, RetryStrategyBuilder, Session } from '../constructs'
+import { BrowserCheck, Check, HeartbeatCheck, MultiStepCheck, Project, RetryStrategyBuilder, Session } from '../constructs'
 import type { Region } from '..'
 import { splitConfigFilePath, getGitInformation, getCiInformation, getEnvs } from '../services/util'
 import { createReporters, ReporterType } from '../reporters/reporter'
@@ -146,7 +146,6 @@ export default class Test extends AuthCommand {
       'update-snapshots': updateSnapshots,
       retries,
       'verify-runtime-dependencies': verifyRuntimeDependencies,
-      playwrightConfig,
     } = flags
     const filePatterns = argv as string[]
 
@@ -183,9 +182,6 @@ export default class Test extends AuthCommand {
       defaultRuntimeId: account.runtimeId,
       verifyRuntimeDependencies,
       checklyConfigConstructs,
-      playwrightConfigPath: checklyConfig.checks?.playwrightConfigPath,
-      include: checklyConfig.checks?.include,
-      playwrightChecks: checklyConfig.checks?.playwrightChecks,
     })
     const checks = Object.entries(project.data.check)
       .filter(([, check]) => {
@@ -234,19 +230,6 @@ export default class Test extends AuthCommand {
       check.snapshots = await uploadSnapshots(check.rawSnapshots)
     }
 
-    for (const check of checks) {
-      // TODO: Improve bundling and uploading
-      if (!(check instanceof PlaywrightCheck) || check.codeBundlePath) {
-        continue
-      }
-      const {
-        relativePlaywrightConfigPath, browsers, key,
-      } = await PlaywrightCheck.bundleProject(check.playwrightConfigPath, check.include)
-      check.codeBundlePath = key
-      check.browsers = browsers
-      check.playwrightConfigPath = relativePlaywrightConfigPath
-    }
-
     if (this.fancy) {
       ux.action.stop()
     }

packages/cli/src/constructs/index.ts

@@ -32,4 +32,3 @@ export * from './telegram-alert-channel'
 export * from './status-page'
 export * from './status-page-service'
 export * from './incident'
-export * from './playwright-check'

packages/cli/src/reporters/list.ts

@@ -42,14 +42,14 @@ export default class ListReporter extends AbstractListReporter {
     printLn(formatCheckTitle(CheckStatus.RETRIED, checkResult, { printRetryDuration: true }))
     printLn(indentString(formatCheckResult(checkResult), 4), 2, 1)
     if (links) {
-      printLn(indentString('View result: ' + chalk.underline.cyan(links.testResultLink), 4))
+      printLn(indentString('View result: ' + chalk.underline.cyan(`${links.testResultLink}`), 4))
       if (links.testTraceLinks?.length) {
         // TODO: print all video files URLs
-        printLn(indentString('View trace : ' + links.testTraceLinks.map(link => chalk.underline.cyan(link)).join(', '), 4))
+        printLn(indentString('View trace : ' + chalk.underline.cyan(links.testTraceLinks.join(', ')), 4))
       }
       if (links.videoLinks?.length) {
         // TODO: print all trace files URLs
-        printLn(indentString('View video : ' + links.videoLinks.map(link => chalk.underline.cyan(link)).join(', '), 4))
+        printLn(indentString('View video : ' + chalk.underline.cyan(`${links.videoLinks.join(', ')}`), 4))
       }
       printLn('')
     }
@@ -76,14 +76,14 @@ export default class ListReporter extends AbstractListReporter {
     }
 
     if (links) {
-      printLn(indentString('View result: ' + chalk.underline.cyan(links.testResultLink), 4))
+      printLn(indentString('View result: ' + chalk.underline.cyan(`${links.testResultLink}`), 4))
       if (links.testTraceLinks?.length) {
         // TODO: print all video files URLs
-        printLn(indentString('View trace : ' + links.testTraceLinks.map(link => chalk.underline.cyan(link)).join(', '), 4))
+        printLn(indentString('View trace : ' + chalk.underline.cyan(links.testTraceLinks.join(', ')), 4))
       }
       if (links.videoLinks?.length) {
         // TODO: print all trace files URLs
-        printLn(indentString('View video : ' + links.videoLinks.map(link => chalk.underline.cyan(link)).join(', '), 4))
+        printLn(indentString('View video : ' + chalk.underline.cyan(`${links.videoLinks.join(', ')}`), 4))
       }
       printLn('')
     }

packages/cli/src/rest/checkly-storage.ts

@@ -15,14 +15,6 @@ class ChecklyStorage {
     )
   }
 
-  uploadCodeBundle (stream: Readable, size: number) {
-    return this.api.post<{ key: string }>(
-      '/next/checkly-storage/upload-code-bundle',
-      stream,
-      { headers: { 'Content-Type': 'application/octet-stream', 'content-length': size } },
-    )
-  }
-
   download (key: string) {
     return this.api.post('/next/checkly-storage/download', { key }, { responseType: 'stream' })
   }