@vscode/test-web 0.0.54 → 0.0.56

package/fs-provider/dist/fsExtensionMain.js

@@ -962,10 +962,11 @@ class Minimatch {
         for (let i = 0; i < globParts.length - 1; i++) {
             for (let j = i + 1; j < globParts.length; j++) {
                 const matched = this.partsMatch(globParts[i], globParts[j], !this.preserveMultipleSlashes);
-                if (!matched)
-                    continue;
-                globParts[i] = matched;
-                globParts[j] = [];
+                if (matched) {
+                    globParts[i] = [];
+                    globParts[j] = matched;
+                    break;
+                }
             }
         }
         return globParts.filter(gs => gs.length);

package/fs-provider/package-lock.json

@@ -9,14 +9,14 @@
 			"version": "0.0.1",
 			"license": "MIT",
 			"devDependencies": {
-				"@types/vscode": "^1.81.0",
-				"minimatch": "9.0.4",
+				"@types/vscode": "^1.90.0",
+				"minimatch": "9.0.5",
 				"path-browserify": "^1.0.1",
 				"process": "^0.11.10",
 				"request-light": "^0.7.0",
 				"ts-loader": "^9.5.1",
 				"vscode-uri": "^3.0.8",
-				"webpack": "^5.91.0",
+				"webpack": "^5.92.1",
 				"webpack-cli": "^5.1.4"
 			},
 			"engines": {
@@ -136,11 +136,10 @@
 			}
 		},
 		"node_modules/@types/vscode": {
-			"version": "1.81.0",
-			"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.81.0.tgz",
-			"integrity": "sha512-YIaCwpT+O2E7WOMq0eCgBEABE++SX3Yl/O02GoMIF2DO3qAtvw7m6BXFYsxnc6XyzwZgh6/s/UG78LSSombl2w==",
-			"dev": true,
-			"license": "MIT"
+			"version": "1.90.0",
+			"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.90.0.tgz",
+			"integrity": "sha512-oT+ZJL7qHS9Z8bs0+WKf/kQ27qWYR3trsXpq46YDjFqBsMLG4ygGGjPaJ2tyrH0wJzjOEmDyg9PDJBBhWg9pkQ==",
+			"dev": true
 		},
 		"node_modules/@webassemblyjs/ast": {
 			"version": "1.12.1",
@@ -359,12 +358,11 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/acorn-import-assertions": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+		"node_modules/acorn-import-attributes": {
+			"version": "1.9.5",
+			"resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+			"integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
 			"dev": true,
-			"license": "MIT",
 			"peerDependencies": {
 				"acorn": "^8"
 			}
@@ -428,13 +426,12 @@
 			}
 		},
 		"node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"fill-range": "^7.0.1"
+				"fill-range": "^7.1.1"
 			},
 			"engines": {
 				"node": ">=8"
@@ -599,9 +596,9 @@
 			"dev": true
 		},
 		"node_modules/enhanced-resolve": {
-			"version": "5.16.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz",
-			"integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==",
+			"version": "5.17.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
+			"integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.4",
@@ -719,11 +716,10 @@
 			"license": "MIT"
 		},
 		"node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"to-regex-range": "^5.0.1"
 			},
@@ -832,7 +828,6 @@
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.12.0"
 			}
@@ -1000,9 +995,9 @@
 			}
 		},
 		"node_modules/minimatch": {
-			"version": "9.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-			"integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
@@ -1440,7 +1435,6 @@
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
 			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"is-number": "^7.0.0"
 			},
@@ -1556,9 +1550,9 @@
 			}
 		},
 		"node_modules/webpack": {
-			"version": "5.91.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-			"integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
+			"version": "5.92.1",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
+			"integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
 			"dev": true,
 			"dependencies": {
 				"@types/eslint-scope": "^3.7.3",
@@ -1567,10 +1561,10 @@
 				"@webassemblyjs/wasm-edit": "^1.12.1",
 				"@webassemblyjs/wasm-parser": "^1.12.1",
 				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.9.0",
+				"acorn-import-attributes": "^1.9.5",
 				"browserslist": "^4.21.10",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.16.0",
+				"enhanced-resolve": "^5.17.0",
 				"es-module-lexer": "^1.2.1",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",

package/fs-provider/package.json

@@ -39,10 +39,10 @@
 		"package-web": "webpack --mode production --devtool hidden-source-map"
 	},
 	"devDependencies": {
-		"@types/vscode": "^1.81.0",
-		"minimatch": "9.0.4",
+		"@types/vscode": "^1.90.0",
+		"minimatch": "9.0.5",
 		"ts-loader": "^9.5.1",
-		"webpack": "^5.91.0",
+		"webpack": "^5.92.1",
 		"webpack-cli": "^5.1.4",
 		"process": "^0.11.10",
 		"path-browserify": "^1.0.1",

package/out/server/workbench.js

@@ -15,10 +15,11 @@ function asJSON(value) {
     return JSON.stringify(value).replace(/"/g, '"');
 }
 class Workbench {
-    constructor(baseUrl, dev, esm, builtInExtensions = [], productOverrides) {
+    constructor(baseUrl, dev, esm, devCSSModules, builtInExtensions = [], productOverrides) {
         this.baseUrl = baseUrl;
         this.dev = dev;
         this.esm = esm;
+        this.devCSSModules = devCSSModules;
         this.builtInExtensions = builtInExtensions;
         this.productOverrides = productOverrides;
     }
@@ -32,6 +33,7 @@ class Workbench {
             WORKBENCH_WEB_BASE_URL: this.baseUrl,
             WORKBENCH_BUILTIN_EXTENSIONS: asJSON(this.builtInExtensions),
             WORKBENCH_MAIN: this.getMain(),
+            WORKBENCH_DEV_CSS_MODULES: JSON.stringify(this.devCSSModules)
         };
         try {
             const workbenchTemplate = (await fs_1.promises.readFile(path.resolve(__dirname, `../../views/workbench${this.esm ? '-esm' : ''}.html`))).toString();
@@ -48,7 +50,8 @@ class Workbench {
         if (this.dev) {
             return `<script> require(['vs/code/browser/workbench/workbench'], function() {}); </script>`;
         }
-        return `<script src="${this.baseUrl}/out/vs/workbench/workbench.web.main.nls.js"></script>`
+        return `<script src="${this.baseUrl}/out/nls.messages.js"></script>`
+            + `<script src="${this.baseUrl}/out/vs/workbench/workbench.web.main.nls.js"></script>`
             + `<script src="${this.baseUrl}/out/vs/workbench/workbench.web.main.js"></script>`
             + `<script src="${this.baseUrl}/out/vs/code/browser/workbench/workbench.js"></script>`;
     }
@@ -111,7 +114,8 @@ function default_1(config) {
         if (config.build.type === 'sources') {
             const builtInExtensions = await (0, extensions_1.getScannedBuiltinExtensions)(config.build.location);
             const productOverrides = await getProductOverrides(config.build.location);
-            ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/sources`, true, config.esm, builtInExtensions, {
+            const devCSSModules = config.esm ? await getDevCssModules(config.build.location) : [];
+            ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/sources`, true, config.esm, devCSSModules, builtInExtensions, {
                 ...productOverrides,
                 webEndpointUrlTemplate: `${ctx.protocol}://{{uuid}}.${ctx.host}/static/sources`,
                 webviewContentExternalBaseUrlTemplate: `${ctx.protocol}://{{uuid}}.${ctx.host}/static/sources/out/vs/workbench/contrib/webview/browser/pre/`
@@ -119,13 +123,13 @@ function default_1(config) {
         }
         else if (config.build.type === 'static') {
             const baseUrl = `${ctx.protocol}://${ctx.host}/static/build`;
-            ctx.state.workbench = new Workbench(baseUrl, false, config.esm, [], {
+            ctx.state.workbench = new Workbench(baseUrl, false, config.esm, [], [], {
                 webEndpointUrlTemplate: `${ctx.protocol}://{{uuid}}.${ctx.host}/static/build`,
                 webviewContentExternalBaseUrlTemplate: `${ctx.protocol}://{{uuid}}.${ctx.host}/static/build/out/vs/workbench/contrib/webview/browser/pre/`
             });
         }
         else if (config.build.type === 'cdn') {
-            ctx.state.workbench = new Workbench(config.build.uri, false, config.esm);
+            ctx.state.workbench = new Workbench(config.build.uri, false, config.esm, []);
         }
         await next();
     });
@@ -151,3 +155,7 @@ async function getProductOverrides(vsCodeDevLocation) {
         return undefined;
     }
 }
+async function getDevCssModules(vsCodeDevLocation) {
+    const glob = await Promise.resolve().then(() => require('glob'));
+    return glob.glob('**/*.css', { cwd: path.join(vsCodeDevLocation, 'out') });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.54",
+  "version": "0.0.56",
   "scripts": {
     "install-extensions": "npm i --prefix=fs-provider && npm i --prefix=sample",
     "compile": "tsc -p ./ && npm run compile-fs-provider",
@@ -23,33 +23,34 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@koa/router": "^12.0.1",
     "@koa/cors": "^5.0.0",
+    "@koa/router": "^12.0.1",
+    "@playwright/browser-chromium": "^1.45.0",
+    "glob": "^10.4.2",
+    "gunzip-maybe": "^1.4.2",
+    "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.4",
     "koa": "^2.15.3",
     "koa-morgan": "^1.0.1",
     "koa-mount": "^4.0.0",
     "koa-static": "^5.0.0",
     "minimist": "^1.2.8",
-    "playwright": "^1.43.1",
-    "@playwright/browser-chromium": "^1.43.1",
-    "vscode-uri": "^3.0.8",
-    "http-proxy-agent": "^7.0.2",
-    "https-proxy-agent": "^7.0.4",
-    "tar-fs": "^3.0.5",
-    "gunzip-maybe": "^1.4.2"
+    "playwright": "^1.45.0",
+    "tar-fs": "^3.0.6",
+    "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
+    "@types/gunzip-maybe": "^1.4.2",
     "@types/koa": "^2.15.0",
+    "@types/koa__router": "^12.0.4",
     "@types/koa-morgan": "^1.0.8",
     "@types/koa-mount": "^4.0.5",
     "@types/koa-static": "^4.0.4",
-    "@types/koa__router": "^12.0.4",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^20.12.7",
-    "@types/gunzip-maybe": "^1.4.2",
+    "@types/node": "^20.14.9",
     "@types/tar-fs": "^2.0.4",
-    "@typescript-eslint/eslint-plugin": "^7.7.1",
-    "@typescript-eslint/parser": "^7.7.1",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
     "eslint": "^8.57.0",
     "eslint-plugin-header": "^3.1.1",
     "typescript": "^5.4.5"
@@ -63,4 +64,4 @@
   "bugs": {
     "url": "https://github.com/microsoft/vscode-test-web/issues"
   }
-}
+}

package/views/workbench-esm.html

@@ -28,6 +28,8 @@
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/favicon.ico" type="image/x-icon" />
 		<link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/manifest.json">
+
+		<style id="vscode-css-modules" type="text/css" media="screen"></style>
 	</head>
 
 	<body aria-label="">
@@ -39,6 +41,26 @@
 		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
 		globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
 	</script>
+	<script>
+		const sheet = document.getElementById('vscode-css-modules').sheet;
+		globalThis._VSCODE_CSS_LOAD = function (url) {
+			sheet.insertRule(`@import url(${url});`);
+		};
+
+		const importMap = { imports: {} };
+		const cssModules = JSON.parse('{{WORKBENCH_DEV_CSS_MODULES}}');
+		for (const cssModule of cssModules) {
+			const cssUrl = new URL(cssModule, globalThis._VSCODE_FILE_ROOT).href;
+			const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+			const blob = new Blob([jsSrc], { type: 'application/javascript' });
+			importMap.imports[cssUrl] = URL.createObjectURL(blob);
+		}
+		const importMapElement = document.createElement('script');
+		importMapElement.type = 'importmap';
+		importMapElement.setAttribute('nonce', '1nline-m4p')
+		importMapElement.textContent = JSON.stringify(importMap, undefined, 2);
+		document.head.appendChild(importMapElement);
+	</script>
 	<script>
 		performance.mark('code/willLoadWorkbenchMain');
 	</script>