Fix verification builds

kaisalmen · kaisalmen · commit 0a7026fa80b1 · 2024-10-10T17:23:29.000+02:00
- Angular verification. Switch to esbuild based build
diff --git a/verify/angular/angular.json b/verify/angular/angular.json
@@ -3,86 +3,68 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "angular-client": {
+    "ng-mlc": {
       "projectType": "application",
       "schematics": {},
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-builders/custom-webpack:browser",
+          "builder": "@angular-builders/custom-esbuild:application",
           "options": {
-            "outputPath": "dist/angular-client",
+            "outputPath": "dist/ng-mlc",
             "index": "src/index.html",
-            "main": "src/main.ts",
+            "browser": "src/main.ts",
+            "tsConfig": "tsconfig.json",
+            // "plugins": ["./node_modules/@codingame/esbuild-import-meta-url-plugin/dist/esbuildImportMetaUrlPlugin.js"],
             "polyfills": [
               "zone.js"
             ],
-            "tsConfig": "tsconfig.json",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "./node_modules/monaco-editor-wrapper/dist",
-                "output": "assets/monaco-editor-wrapper/dist"
-              }
-            ],
+            "assets": [],
             "styles": [],
             "scripts": [],
-            "customWebpackConfig": {
-              "path": "./custom-webpack.config.js"
-            },
+            "aot": false,
+            "optimization": false,
+            "sourceMap": true,
+            "namedChunks": false,
+            "extractLicenses": false,
             "allowedCommonJsDependencies": [
-              "vscode-jsonrpc",
               "vscode-languageclient",
               "vscode-languageserver-protocol",
-              "vscode-semver",
+              "vscode-jsonrpc",
               "vscode-oniguruma",
               "vscode-textmate",
-              "vscode-marked"
+              "@vscode/iconv-lite-umd"
             ]
           },
           "configurations": {
             "production": {
-              "buildOptimizer": true,
               "aot": true,
               "optimization": true,
-              "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
-              "vendorChunk": false,
               "extractLicenses": true
             },
             "development": {
-              "buildOptimizer": false,
-              "aot": false,
-              "optimization": false,
-              "outputHashing": "none",
-              "sourceMap": true,
-              "namedChunks": true,
-              "vendorChunk": true,
-              "extractLicenses": false
             }
           },
           "defaultConfiguration": "development"
         },
         "serve": {
-          "builder": "@angular-builders/custom-webpack:dev-server",
+          "builder": "@angular-builders/custom-esbuild:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "angular-client:build:production"
+              "buildTarget": "ng-mlc:build:production"
             },
             "development": {
-              "browserTarget": "angular-client:build:development"
+              "buildTarget": "ng-mlc:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "angular-client:build"
-          }
+          "builder": "@angular/build:extract-i18n"
         }
       }
     }
diff --git a/verify/angular/custom-webpack.config.js b/verify/angular/custom-webpack.config.js
diff --git a/verify/angular/package.json b/verify/angular/package.json
@@ -16,27 +16,28 @@
     "reset:repo": "git clean -f -X -d"
   },
   "dependencies": {
-    "@angular/compiler": "~18.1.0",
-    "@angular/core": "~18.1.0",
-    "@angular/platform-browser": "~18.1.0",
-    "@angular/platform-browser-dynamic": "~18.1.0",
+    "@angular/compiler": "~18.2.8",
+    "@angular/core": "~18.2.8",
+    "@angular/platform-browser": "~18.2.8",
+    "@angular/platform-browser-dynamic": "~18.2.8",
     "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~10.0.1",
-    "monaco-editor-wrapper": "../../packages/wrapper",
-    "monaco-languageclient-examples": "../../packages/examples",
+    "monaco-editor-wrapper": "~6.0.0-next.2",
+    "monaco-languageclient-examples": "~2024.10.1",
     "vscode": "npm:@codingame/monaco-vscode-api@~10.0.1",
     "rxjs": "~7.8.1",
-    "zone.js": "~0.14.7"
+    "zone.js": "~0.14.10"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "~18.0.0",
-    "@angular-devkit/build-angular": "~18.1.0",
-    "@angular/cli": "~18.1.0",
-    "@angular/compiler-cli": "~18.1.0",
-    "@types/node": "~20.14.10",
-    "@types/vscode": "~1.91.0",
+    "@angular-builders/custom-esbuild": "~18.0.0",
+    "@angular/cli": "~18.2.8",
+    "@angular/compiler-cli": "~18.2.8",
+    "@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
+    "@types/node": "~20.16.11",
+    "@types/vscode": "~1.94.0",
     "css-loader": "~7.1.2",
     "shx": "~0.3.4",
-    "style-loader": "~4.0.0"
+    "style-loader": "~4.0.0",
+    "typescript": "~5.5.4"
   },
   "volta": {
     "node": "20.18.0",
diff --git a/verify/angular/tsconfig.json b/verify/angular/tsconfig.json
@@ -18,7 +18,6 @@
     "strict": true,
     "strictPropertyInitialization": false,
     "importHelpers": true,
-    "downlevelIteration": false,
     "noImplicitReturns": true,
     "noUnusedParameters": true,
     "noUnusedLocals": true,
diff --git a/verify/buildAll.ps1 b/verify/buildAll.ps1
@@ -6,4 +6,4 @@ Set-Location $MyPath/angular; npm run verify:ci
 Set-Location $MyPath/pnpm; pnpm run verify:ci
 
 # yarn example is instable because we can't refence local file based dependencies
-# Set-Location $MyPath/yarn; yarn run verify:ci
+Set-Location $MyPath/yarn; yarn run verify:ci
diff --git a/verify/buildAll.sh b/verify/buildAll.sh
@@ -6,4 +6,4 @@ cd $MyPath/angular; npm run verify:ci
 cd $MyPath/pnpm; pnpm run verify:ci
 
 # yarn example is instable because we can't refence local file based dependencies
-# cd $MyPath/yarn; yarn run verify:ci
+cd $MyPath/yarn; yarn run verify:ci
diff --git a/verify/pnpm/package.json b/verify/pnpm/package.json
@@ -5,17 +5,17 @@
   "type": "module",
   "dependencies": {
     "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~10.0.1",
-    "monaco-editor-wrapper": "../../packages/wrapper",
-    "monaco-languageclient-examples": "../../packages/examples",
+    "monaco-editor-wrapper": "~6.0.0-next.2",
+    "monaco-languageclient-examples": "~2024.10.1",
     "vscode": "npm:@codingame/monaco-vscode-api@~10.0.1"
   },
   "devDependencies": {
     "shx": "~0.3.4",
-    "vite": "~5.3.3"
+    "vite": "~5.4.8"
   },
   "volta": {
     "node": "20.18.0",
-    "pnpm": "9.9.0"
+    "pnpm": "9.12.1"
   },
   "scripts": {
     "verify": "pnpm install && pnpm run build && pnpm run start",
diff --git a/verify/pnpm/vite.config.ts b/verify/pnpm/vite.config.ts
@@ -8,5 +8,8 @@ import { defineConfig } from 'vite';
 export default defineConfig({
     preview: {
         port: 8083
+    },
+    worker: {
+        format: 'es'
     }
 });
diff --git a/verify/vite/package.json b/verify/vite/package.json
@@ -5,13 +5,13 @@
   "type": "module",
   "dependencies": {
     "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~10.0.1",
-    "monaco-editor-wrapper": "../../packages/wrapper",
-    "monaco-languageclient-examples": "../../packages/examples",
+    "monaco-editor-wrapper": "~6.0.0-next.2",
+    "monaco-languageclient-examples": "~2024.10.1",
     "vscode": "npm:@codingame/monaco-vscode-api@~10.0.1"
   },
   "devDependencies": {
     "shx": "~0.3.4",
-    "vite": "~5.3.3"
+    "vite": "~5.4.8"
   },
   "volta": {
     "node": "20.18.0",
diff --git a/verify/vite/vite.config.ts b/verify/vite/vite.config.ts
@@ -8,5 +8,8 @@ import { defineConfig } from 'vite';
 export default defineConfig({
     preview: {
         port: 8082
+    },
+    worker: {
+        format: 'es'
     }
 });
diff --git a/verify/webpack/package.json b/verify/webpack/package.json
@@ -5,8 +5,8 @@
   "type": "module",
   "dependencies": {
     "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~10.0.1",
-    "monaco-editor-wrapper": "../../packages/wrapper",
-    "monaco-languageclient-examples": "../../packages/examples",
+    "monaco-editor-wrapper": "~6.0.0-next.2",
+    "monaco-languageclient-examples": "~2024.10.1",
     "vscode": "npm:@codingame/monaco-vscode-api@~10.0.1"
   },
   "devDependencies": {
diff --git a/verify/yarn/package.json b/verify/yarn/package.json
@@ -7,13 +7,13 @@
     "@typefox/monaco-editor-react": "~6.0.0-next.2",
     "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~10.0.1",
     "monaco-editor-wrapper": "~6.0.0-next.2",
-    "monaco-languageclient-examples": "~2024.9.1",
+    "monaco-languageclient-examples": "~2024.10.1",
     "vscode": "npm:@codingame/monaco-vscode-api@~10.0.1",
     "vscode-ws-jsonrpc": "~3.3.2"
   },
   "devDependencies": {
     "shx": "~0.3.4",
-    "vite": "~5.3.3"
+    "vite": "~5.4.8"
   },
   "volta": {
     "node": "20.18.0",
diff --git a/verify/yarn/vite.config.ts b/verify/yarn/vite.config.ts
@@ -8,5 +8,8 @@ import { defineConfig } from 'vite';
 export default defineConfig({
     preview: {
         port: 8084
+    },
+    worker: {
+        format: 'es'
     }
 });

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,8 @@ import { defineConfig } from 'vite';`
`8`	`8`	`export default defineConfig({`
`9`	`9`	`preview: {`
`10`	`10`	`port: 8083`
	`11`	`+ },`
	`12`	`+ worker: {`
	`13`	`+ format: 'es'`
`11`	`14`	`}`
`12`	`15`	`});`