Merge pull request #4430 from hayemaxi/q-cw-ext

hayemaxi · web-flow · commit eb0ddda17f20 · 2024-02-14T08:17:27.000-08:00
webpack, packaging generalizations for subprojects
diff --git a/.gitignore b/.gitignore
@@ -38,10 +38,10 @@ packages/toolkit/src/testFixtures/**/bin
 packages/toolkit/src/testFixtures/**/obj
 
 # Generated by copyFiles.ts
-packages/toolkit/README*
-packages/toolkit/CHANGELOG.md
-packages/toolkit/LICENSE
-packages/toolkit/NOTICE
+packages/*/README*
+packages/*/CHANGELOG.md
+packages/*/LICENSE
+packages/*/NOTICE
 
 # Icons
 packages/toolkit/resources/icons/cloud9/generated/**
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
         "test": "npm run test -w packages/",
         "testE2E": "npm run testE2E -w packages/",
         "testInteg": "npm run testInteg -w packages/",
-        "package": "npm run package -w packages/",
+        "package": "npm run package -w packages/toolkit",
         "newChange": "ts-node ./scripts/newChange.ts",
         "createRelease": "ts-node ./scripts/createRelease.ts",
         "format": "prettier --check plugins && npm run format -w packages/",
@@ -56,12 +56,16 @@
         "@vscode/test-electron": "^2.3.8",
         "@vscode/test-web": "^0.0.50",
         "@vscode/vsce": "^2.19.0",
+        "@types/webpack-env": "^1.18.1",
         "prettier": "^2.8.8",
         "prettier-plugin-sh": "^0.12.8",
         "pretty-quick": "^3.1.3",
         "husky": "^9.0.7",
         "typescript": "^5.0.4",
-        "ts-node": "^10.9.1"
+        "ts-node": "^10.9.1",
+        "webpack": "^5.83.0",
+        "webpack-cli": "^5.1.4",
+        "webpack-dev-server": "^4.15.1"
     },
     "dependencies": {
         "vscode-nls": "^5.2.0",
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -40,13 +40,16 @@
         "onStartupFinished",
         "onUri"
     ],
-    "main": "./dist/src/main.js",
+    "main": "./dist/src/extension",
+    "browser": "./dist/src/extensionWeb",
     "scripts": {
+        "vscode:prepublish": "npm run clean && npm run compile && webpack --mode production",
         "clean": "ts-node ../../scripts/clean.ts dist/",
-        "compile": "tsc -p ./",
-        "testCompile": "npm run compile",
+        "compile": "npm run clean && tsc -p ./ && webpack --mode development",
+        "testCompile": "tsc -p ./",
         "watch": "npm run clean && tsc -watch -p ./",
-        "serve": "echo 1"
+        "serve": "webpack serve --config-name vue-hmr --mode development",
+        "package": "ts-node ../../scripts/package.ts"
     },
     "dependencies": {},
     "devDependencies": {},
diff --git a/packages/amazonq/src/extension.ts b/packages/amazonq/src/extension.ts
@@ -4,14 +4,10 @@
  */
 
 import * as vscode from 'vscode'
+import { activateShared } from './extensionShared'
 
 export async function activate(context: vscode.ExtensionContext) {
-    void vscode.window.showInformationMessage(
-        'Amazon Q + CodeWhisperer: This extension is under development and offers no features at this time.'
-    )
+    await activateShared()
 }
 
 export async function deactivate() {}
-
-export const awsQActivate = activate
-export const awsQDeactivate = deactivate
diff --git a/packages/amazonq/src/extensionShared.ts b/packages/amazonq/src/extensionShared.ts
@@ -0,0 +1,12 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+export async function activateShared() {
+    void vscode.window.showInformationMessage(
+        'Amazon Q + CodeWhisperer: This extension is under development and offers no features at this time.'
+    )
+}
diff --git a/packages/amazonq/src/extensionWeb.ts b/packages/amazonq/src/extensionWeb.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { activateShared } from './extensionShared'
+
+export async function activate(context: vscode.ExtensionContext) {
+    await activateShared()
+}
+
+export async function deactivate() {}
diff --git a/packages/amazonq/src/main.ts b/packages/amazonq/src/main.ts
diff --git a/packages/amazonq/webpack.config.js b/packages/amazonq/webpack.config.js
@@ -0,0 +1,39 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This is the final webpack config that collects all webpack configs.
+ */
+
+const baseConfig = require('../webpack.base.config')
+const baseVueConfig = require('../webpack.vue.config')
+const baseBrowserConfig = require('../webpack.browser.config')
+
+const config = {
+    ...baseConfig,
+    entry: {
+        'src/extension': './src/extension.ts',
+    },
+}
+
+const vueConfigs = baseVueConfig.configs.map(c => {
+    // Inject entry point into all configs.
+    return {
+        ...c,
+        entry: {
+            ...baseVueConfig.utils.createVueEntries(),
+            //'src/amazonq/webview/ui/amazonq-ui': './src/amazonq/webview/ui/main.ts',
+        },
+    }
+})
+
+const browserConfig = {
+    ...baseBrowserConfig,
+    entry: {
+        'src/extensionWeb': './src/extensionWeb.ts',
+    },
+}
+
+module.exports = [config, ...vueConfigs, browserConfig]
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -4246,7 +4246,7 @@
         "clean": "ts-node ../../scripts/clean.ts dist/ LICENSE NOTICE quickStart* README* CHANGELOG.md",
         "copyFiles": "ts-node ./scripts/build/copyFiles.ts",
         "buildScripts": "npm run generateClients && npm run generatePackage && npm run generateNonCodeFiles && npm run copyFiles",
-        "browserWatch": "npm run clean && npm run buildScripts && webpack --config webpack.browser.config.js --watch",
+        "browserWatch": "npm run clean && npm run buildScripts && webpack --config-name web --watch",
         "browserRun": "npx @vscode/test-web --open-devtools --browserOption=--disable-web-security --waitForDebugger=9222 --extensionDevelopmentPath=. .",
         "compile": "npm run clean && npm run buildScripts && webpack --mode development && npm run copyFiles",
         "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
@@ -4257,7 +4257,7 @@
         "format": "prettier --ignore-path ../../.prettierignore --check src scripts",
         "formatfix": "prettier --ignore-path ../../.prettierignore --write src scripts",
         "lint": "ts-node ./scripts/lint/testLint.ts && npm run format",
-        "package": "ts-node ./scripts/build/package.ts",
+        "package": "ts-node ../../scripts/package.ts",
         "install-plugin": "vsce package -o aws-toolkit-vscode-test.vsix && code --install-extension aws-toolkit-vscode-test.vsix",
         "generateClients": "npm run build -w @amzn/codewhisperer-streaming && ts-node ./scripts/build/generateServiceClient.ts ",
         "generatePackage": "ts-node ./scripts/build/generateIcons.ts",
@@ -4297,7 +4297,6 @@
         "@types/sinonjs__fake-timers": "^8.1.2",
         "@types/tcp-port-used": "^1.0.1",
         "@types/uuid": "^9.0.1",
-        "@types/webpack-env": "^1.18.1",
         "@types/whatwg-url": "^11.0.4",
         "@types/xml2js": "^0.4.11",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
@@ -4324,9 +4323,6 @@
         "vue-loader": "^17.2.2",
         "vue-style-loader": "^4.1.3",
         "webfont": "^11.2.26",
-        "webpack": "^5.83.0",
-        "webpack-cli": "^5.1.4",
-        "webpack-dev-server": "^4.15.1",
         "typescript": "^5.0.4",
         "ts-node": "^10.9.1"
     },
diff --git a/packages/toolkit/webpack.config.js b/packages/toolkit/webpack.config.js
@@ -7,8 +7,35 @@
  * This is the final webpack config that collects all webpack configs.
  */
 
-const baseConfig = require('./webpack.base.config')
-const vueConfigs = require('./webpack.vue.config')
-const browserConfigs = require('./webpack.browser.config')
+const baseConfig = require('../webpack.base.config')
+const baseVueConfig = require('../webpack.vue.config')
+const baseBrowserConfig = require('../webpack.browser.config')
 
-module.exports = [baseConfig, ...vueConfigs, ...browserConfigs]
+const config = {
+    ...baseConfig,
+    entry: {
+        'src/main': './src/main.ts',
+        'src/stepFunctions/asl/aslServer': './src/stepFunctions/asl/aslServer.ts',
+    },
+}
+
+const vueConfigs = baseVueConfig.configs.map(c => {
+    // Inject entry point into all configs.
+    return {
+        ...c,
+        entry: {
+            ...baseVueConfig.utils.createVueEntries(),
+            'src/amazonq/webview/ui/amazonq-ui': './src/amazonq/webview/ui/main.ts',
+        },
+    }
+})
+
+const browserConfig = {
+    ...baseBrowserConfig,
+    entry: {
+        'src/extensionWeb': './src/extensionWeb.ts',
+        'src/testBrowser/testRunner': './src/testBrowser/testRunner.ts',
+    },
+}
+
+module.exports = [config, ...vueConfigs, browserConfig]
diff --git a/packages/webpack.base.config.js b/packages/webpack.base.config.js
@@ -13,7 +13,10 @@ const { ESBuildMinifyPlugin } = require('esbuild-loader')
 const fs = require('fs')
 const { NLSBundlePlugin } = require('vscode-nls-dev/lib/webpack-bundler')
 const CircularDependencyPlugin = require('circular-dependency-plugin')
-const packageJsonFile = path.join(__dirname, 'package.json')
+
+// Webpack must run from subproject/package dir.
+const currentDir = process.cwd()
+const packageJsonFile = path.join(currentDir, 'package.json')
 const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, 'utf8'))
 const packageId = `${packageJson.publisher}.${packageJson.name}`
 
@@ -24,12 +27,8 @@ const packageId = `${packageJson.publisher}.${packageJson.name}`
 const baseConfig = {
     name: 'main',
     target: 'node',
-    entry: {
-        'src/main': './src/main.ts',
-        'src/stepFunctions/asl/aslServer': './src/stepFunctions/asl/aslServer.ts',
-    },
     output: {
-        path: path.resolve(__dirname, 'dist'),
+        path: path.resolve(currentDir, 'dist'),
         filename: '[name].js',
         libraryTarget: 'commonjs2',
     },
diff --git a/packages/webpack.browser.config.js b/packages/webpack.browser.config.js
@@ -22,10 +22,6 @@ const webConfig = {
      * The keys in the following 'entry' object are the relative paths of the final output files in 'dist'.
      * They are suffixed with '.js' implicitly.
      */
-    entry: {
-        'src/extensionWeb': './src/extensionWeb.ts',
-        'src/testBrowser/testRunner': './src/testBrowser/testRunner.ts',
-    },
     plugins: (baseConfig.plugins ?? []).concat(
         new webpack.optimize.LimitChunkCountPlugin({
             maxChunks: 1, // disable chunks by default since web extensions must be a single bundle
@@ -72,4 +68,4 @@ const webConfig = {
     },
 }
 
-module.exports = [webConfig]
+module.exports = webConfig
diff --git a/packages/webpack.vue.config.js b/packages/webpack.vue.config.js
@@ -11,6 +11,7 @@ const path = require('path')
 const glob = require('glob')
 const { VueLoaderPlugin } = require('vue-loader')
 const baseConfig = require('./webpack.base.config')
+const currentDir = process.cwd()
 
 //@ts-check
 /** @typedef {import('webpack').Configuration} WebpackConfig **/
@@ -21,7 +22,7 @@ const baseConfig = require('./webpack.base.config')
  * @param {string} file
  */
 const createVueBundleName = file => {
-    return path.relative(__dirname, file).split('.').slice(0, -1).join(path.sep)
+    return path.relative(currentDir, file).split('.').slice(0, -1).join(path.sep)
 }
 
 /**
@@ -30,7 +31,7 @@ const createVueBundleName = file => {
  */
 const createVueEntries = (targetPattern = 'index.ts') => {
     return glob
-        .sync(path.resolve(__dirname, 'src', '**', 'vue', '**', targetPattern))
+        .sync(path.resolve(currentDir, 'src', '**', 'vue', '**', targetPattern))
         .map(f => ({ name: createVueBundleName(f), path: f }))
         .reduce((a, b) => ((a[b.name] = b.path), a), {})
 }
@@ -40,10 +41,6 @@ const vueConfig = {
     ...baseConfig,
     name: 'vue',
     target: 'web',
-    entry: {
-        ...createVueEntries(),
-        'src/amazonq/webview/ui/amazonq-ui': './src/amazonq/webview/ui/main.ts',
-    },
     output: {
         ...baseConfig.output,
         libraryTarget: 'this',
@@ -75,7 +72,7 @@ const vueHotReload = {
     name: 'vue-hmr',
     devServer: {
         static: {
-            directory: path.resolve(__dirname, 'dist'),
+            directory: path.resolve(currentDir, 'dist'),
         },
         headers: {
             'Access-Control-Allow-Origin': '*',
@@ -90,4 +87,9 @@ const vueHotReload = {
     },
 }
 
-module.exports = process.env.npm_lifecycle_event === 'serve' ? [vueConfig, vueHotReload] : [vueConfig]
+module.exports = {
+    configs: process.env.npm_lifecycle_event === 'serve' ? [vueConfig, vueHotReload] : [vueConfig],
+    utils: {
+        createVueEntries,
+    },
+}
diff --git a/scripts/package.ts b/scripts/package.ts
diff --git a/tsconfig.json b/tsconfig.json
