diff --git a/main.js b/main.js index 7689ff8db..29a214633 100644 --- a/main.js +++ b/main.js @@ -16,10 +16,10 @@ let perfStats = { Object.defineProperty(exports, "__esModule", { value: true }); -const extension = require('./out/src/extension'); +const extension = require('./dist/extension.bundle'); async function activate(ctx) { - return await extension.activate(ctx, perfStats, true /* ignoreBundle */); + return await extension.activate(ctx, perfStats); } async function deactivate(ctx) { diff --git a/package-lock.json b/package-lock.json index 9cc3fbb1b..81de5aee2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,6 +34,7 @@ "@types/mocha": "^8.2.2", "@types/node": "^16.18.36", "@types/semver": "^7.3.8", + "@types/vinyl": "^2.0.12", "@types/vscode": "^1.95.0", "@typescript-eslint/eslint-plugin": "^5.59.11", "@vscode/test-electron": "^2.3.8", @@ -49,7 +50,7 @@ "mocha-multi-reporters": "^1.1.7", "process": "^0.11.10", "ts-node": "^10.9.1", - "typescript": "^5.1.3", + "typescript": "^5.9.2", "webpack": "^5.28.0", "webpack-cli": "^4.6.0" }, @@ -1225,10 +1226,11 @@ "dev": true }, "node_modules/@types/node": { - "version": "16.18.36", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.36.tgz", - "integrity": "sha512-8egDX8dE50XyXWH6C6PRCNkTP106DuUrvdrednFouDSmCi7IOvrqr0frznfZaHifHH/3aq/7a7v9N4wdXMqhBQ==", - "dev": true + "version": "16.18.126", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.126.tgz", + "integrity": "sha512-OTcgaiwfGFBKacvfwuHzzn1KLxH/er8mluiy8/uM3sGXHaRe73RrSIj01jow9t4kJEW633Ov+cOexXeiApTyAw==", + "dev": true, + "license": "MIT" }, "node_modules/@types/rimraf": { "version": "2.0.5", @@ -1264,10 +1266,11 @@ "dev": true }, "node_modules/@types/vinyl": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz", - "integrity": "sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz", + "integrity": "sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==", "dev": true, + "license": "MIT", "dependencies": { "@types/expect": "^1.20.4", "@types/node": "*" @@ -8078,10 +8081,11 @@ } }, "node_modules/typescript": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", - "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", + "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index 3e5ba1d44..d7860c482 100644 --- a/package.json +++ b/package.json @@ -471,6 +471,7 @@ "@types/fs-extra": "^8.1.1", "@types/git-url-parse": "^9.0.0", "@types/gulp": "^4.0.6", + "@types/vinyl": "^2.0.12", "@types/mocha": "^8.2.2", "@types/node": "^16.18.36", "@types/semver": "^7.3.8", @@ -489,7 +490,7 @@ "mocha-multi-reporters": "^1.1.7", "process": "^0.11.10", "ts-node": "^10.9.1", - "typescript": "^5.1.3", + "typescript": "^5.9.2", "webpack": "^5.28.0", "webpack-cli": "^4.6.0" }, diff --git a/src/commands/createStaticWebApp/createStaticWebApp.ts b/src/commands/createStaticWebApp/createStaticWebApp.ts index b0888de07..80f1bdee0 100644 --- a/src/commands/createStaticWebApp/createStaticWebApp.ts +++ b/src/commands/createStaticWebApp/createStaticWebApp.ts @@ -73,7 +73,7 @@ export async function createStaticWebApp(context: IActionContext & Partial fi.framework).join('), (')})` ?? 'N/A'; + context.telemetry.properties.detectedFrameworks = detectorResult?.frameworks.length ? `(${detectorResult.frameworks.map(fi => fi.framework).join('), (')})` : 'N/A'; context.telemetry.properties.rootHasSrcFolder = (await AzExtFsExtra.pathExists(Uri.joinPath(folder.uri, NodeConstants.srcFolderName))).toString(); const subfolderDetectorResults: DetectorResults[] = []; diff --git a/tsconfig.json b/tsconfig.json index 41693d0de..545a1bbdc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,6 +14,7 @@ "noImplicitReturns": true, "strictNullChecks": true, "noUnusedParameters": true, + "skipLibCheck": true, "baseUrl": "./", "paths": { "*": [