build: remove package.json syncing

Author: hayemaxi

package-lock.json

@@ -109,7 +109,6 @@
             // Since `webpack --watch` never terminates (but finishes packaging at some point),
             // VS Code uses this to parse the CLI output to pattern match something that indicates it is done
             "problemMatcher": "$ts-webpack-watch",
-            "dependsOn": ["copyPackageJson"],
             "options": {
                 "cwd": "${workspaceFolder}/../../packages/core"
             }
@@ -124,7 +123,7 @@
             "label": "webRunTerminate",
             "command": "echo ${input:webRunTerminate}",
             "type": "shell",
-            "dependsOn": ["restorePackageJson"]
+            "dependsOn": []
         },
         // ---------- End: Web Mode Tasks ----------
         {

packages/amazonq/.vscode/tasks.json

@@ -7,9 +7,7 @@ import { runTests } from 'aws-core-vscode/test'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
-    return runTests(
-        process.env.TEST_DIR ?? 'test/e2e',
-        ['../../core/dist/src/testInteg/globalSetup.test.ts'],
-        VSCODE_EXTENSION_ID.amazonq
-    )
+    return runTests(process.env.TEST_DIR ?? 'test/e2e', VSCODE_EXTENSION_ID.amazonq, [
+        '../../core/dist/src/testInteg/globalSetup.test.ts',
+    ])
 }

packages/amazonq/test/e2e/index.ts

@@ -7,7 +7,7 @@ import assert from 'assert'
 import vscode from 'vscode'
 import sinon from 'sinon'
 import { join } from 'path'
-import { getTestWorkspaceFolder } from 'aws-core-vscode/testInteg'
+import { getTestWorkspaceFolder } from 'aws-core-vscode/test'
 import { CodeAnalysisScope, ZipUtil } from 'aws-core-vscode/codewhisperer'
 import { codeScanTruncDirPrefix } from 'aws-core-vscode/codewhisperer'
 import { ToolkitError } from 'aws-core-vscode/shared'

packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts

@@ -7,9 +7,7 @@ import { runTests } from 'aws-core-vscode/test'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
-    return runTests(
-        process.env.TEST_DIR ?? 'test/unit',
-        ['../../core/dist/src/test/globalSetup.test.ts'],
-        VSCODE_EXTENSION_ID.amazonq
-    )
+    return runTests(process.env.TEST_DIR ?? ['test/unit'], VSCODE_EXTENSION_ID.amazonq, [
+        '../../core/dist/src/test/globalSetup.test.ts',
+    ])
 }

packages/amazonq/test/unit/index.ts

@@ -2,30 +2,12 @@
     "name": "aws-core-vscode",
     "description": "Core library used AWS IDE extensions for VSCode.",
     "version": "1.0.0",
-    "extensionKind": [
-        "workspace"
-    ],
     "publisher": "amazonwebservices",
     "license": "Apache-2.0",
     "engines": {
         "npm": "^10.1.0",
         "vscode": "^1.68.0"
     },
-    "activationEvents": [
-        "onStartupFinished",
-        "onUri",
-        "onDebugResolve:aws-sam",
-        "onDebugInitialConfigurations",
-        "onLanguage:javascript",
-        "onLanguage:java",
-        "onLanguage:python",
-        "onLanguage:csharp",
-        "onLanguage:yaml",
-        "onFileSystem:s3",
-        "onFileSystem:s3-readonly"
-    ],
-    "main": "./dist/src/extensionNode.js",
-    "browser": "./dist/src/extensionWebCore.js",
     "exports": {
         ".": "./dist/src/extension.js",
         "./node": "./dist/src/extensionNode.js",
@@ -41,7 +23,6 @@
         "./amazonqFeatureDev": "./dist/src/amazonqFeatureDev/index.js",
         "./codewhispererChat": "./dist/src/codewhispererChat/index.js",
         "./test": "./dist/src/test/index.js",
-        "./testInteg": "./dist/src/testInteg/index.js",
         "./login": "./dist/src/login/webview/index.js",
         "./utils": "./dist/src/shared/utilities/index.js",
         "./feedback": "./dist/src/feedback/index.js",
@@ -4064,10 +4045,6 @@
         "serveVue": "webpack serve --config-name vue --mode development",
         "watch": "npm run testCompile -- -- --watch",
         "testCompile": "npm run clean && npm run buildScripts && npm run compileOnly",
-        "test": "npm run testCompile && c8 ts-node ./scripts/test/test.ts dist/src/test/index.js",
-        "testWeb": "npm run compileDev && c8 ts-node ./scripts/test/testWeb.ts",
-        "testE2E": "npm run testCompile && c8 ts-node ./scripts/test/testE2E.ts dist/src/testE2E/index.js",
-        "testInteg": "npm run testCompile && c8 ts-node ./scripts/test/testInteg.ts",
         "lint": "ts-node ./scripts/lint/testLint.ts",
         "generateClients": "ts-node ./scripts/build/generateServiceClient.ts ",
         "generateIcons": "ts-node ../../scripts/generateIcons.ts",

packages/core/package.json

@@ -5,5 +5,11 @@
 
 import { runToolkitTests } from './launchTestUtilities'
 void (async () => {
-    await runToolkitTests('integration', 'dist/src/testInteg/index.js')
+    const relativeEntrypoint = process.argv[2]
+    if (!relativeEntrypoint) {
+        throw new Error('Relative entrypoint is required')
+    }
+
+    const relativeWorkspaceFolder = process.argv[3]
+    await runToolkitTests('integration', relativeEntrypoint, relativeWorkspaceFolder)
 })()

packages/core/scripts/test/testInteg.ts

@@ -5,5 +5,11 @@
 
 import { runToolkitTests } from './launchTestUtilities'
 void (async () => {
-    await runToolkitTests('web', 'dist/src/testWeb/testRunnerWebCore.js')
+    const relativeEntrypoint = process.argv[2]
+    if (!relativeEntrypoint) {
+        throw new Error('Relative entrypoint is required')
+    }
+
+    const relativeWorkspaceFolder = process.argv[3]
+    await runToolkitTests('web', relativeEntrypoint, relativeWorkspaceFolder)
 })()

packages/core/scripts/test/testWeb.ts

@@ -26,7 +26,7 @@ const notInitialized = 'notInitialized'
 
 function _isAmazonQ() {
     const id = globals.context.extension.id
-    const isToolkit = id === VSCODE_EXTENSION_ID.awstoolkit || id === VSCODE_EXTENSION_ID.awstoolkitcore
+    const isToolkit = id === VSCODE_EXTENSION_ID.awstoolkit
     const isQ = id === VSCODE_EXTENSION_ID.amazonq
     if (!isToolkit && !isQ) {
         throw Error(`unexpected extension id: ${id}`) // sanity check

packages/core/src/shared/extensionUtilities.ts

@@ -15,7 +15,6 @@ import { UriHandler } from './vscode/uriHandler'
 export const VSCODE_EXTENSION_ID = {
     awstoolkit: 'amazonwebservices.aws-toolkit-vscode',
     amazonq: 'amazonwebservices.amazon-q-vscode',
-    awstoolkitcore: 'amazonwebservices.aws-core-vscode', // Core "extension" for tests - not a real extension.
     python: 'ms-python.python',
     // python depends on jupyter plugin
     jupyter: 'ms-toolsai.jupyter',