feat(angular-12): update all deps, tweak port-allocator (#340)

https://coveord.atlassian.net/browse/CDX-459
coveo · Jul 14, 2021 · 42540da · 42540da
1 parent 17e9b8b
commit 42540da
Show file tree

Hide file tree

Showing 11 changed files with 1,359 additions and 962 deletions.
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     }
   },
   "lint-staged": {
-    "*.{ts,tsx,js,jsx,json,html,vue,scss,css,md,yml}": "prettier --write",
+    "*.{ts,tsx,mjs,js,jsx,json,html,vue,scss,css,md,yml}": "prettier --write",
     "**/*.ts": "eslint --fix"
   },
   "engines": {

diff --git a/packages/angular/package-lock.json b/packages/angular/package-lock.json
diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -23,19 +23,19 @@
   "license": "Apache-2.0",
   "schematics": "./dist/collection.json",
   "dependencies": {
-    "@angular-devkit/core": "^11.1.2",
-    "@angular-devkit/schematics": "^11.1.2",
-    "@angular/cdk": "^11.1.1",
-    "@angular/cli": "^11.1.2",
+    "@angular-devkit/core": "^12.1.1",
+    "@angular-devkit/schematics": "^12.1.1",
+    "@angular/cdk": "^12.1.1",
+    "@angular/cli": "^12.1.1",
     "@coveo/search-token-server": "latest",
-    "@schematics/angular": "^11.1.2",
-    "typescript": "~4.1.2"
+    "@schematics/angular": "^12.1.1",
+    "typescript": "^4.3.5"
   },
   "devDependencies": {
-    "@angular/core": "^11.2.2",
-    "@angular/forms": "^11.2.2",
-    "@angular/material": "^11.2.1",
-    "@angular/router": "^11.1.2",
+    "@angular/core": "^12.1.1",
+    "@angular/forms": "^12.1.1",
+    "@angular/material": "^12.1.1",
+    "@angular/router": "^12.1.1",
     "@coveo/headless": "latest",
     "@types/fs-extra": "^9.0.9",
     "@types/jasmine": "~3.5.0",

diff --git a/packages/angular/src/search-token-server/files/scripts/port-allocator.mjs b/packages/angular/src/search-token-server/files/scripts/port-allocator.mjs
@@ -84,9 +84,12 @@ function updateAppPort(port) {
 
   const angularJSON = JSON.parse(readFileSync(angularJsonPath, 'utf-8'));
   const projectName = angularJSON.defaultProject;
-  const serveOptions =
-    angularJSON.projects[projectName].architect.serve.options;
-  serveOptions.port = parseInt(port);
+
+  const serve = angularJSON.projects[projectName].architect.serve;
+  if (!serve.options) {
+    serve.options = {};
+  }
+  serve.options.port = parseInt(port);
 
   writeFileSync(angularJsonPath, JSON.stringify(angularJSON, undefined, 2));
 }

diff --git a/packages/cli-e2e/__tests__/angular.specs.ts b/packages/cli-e2e/__tests__/angular.specs.ts
@@ -82,9 +82,12 @@ describe('ui:create:angular', () => {
   const forceAppPort = (port: number) => {
     const angularJsonPath = getProjectPath(join(projectName, 'angular.json'));
     const angularJSON = JSON.parse(readFileSync(angularJsonPath, 'utf-8'));
-    const serveOptions =
-      angularJSON.projects[projectName].architect.serve.options;
-    serveOptions.port = port;
+
+    const serve = angularJSON.projects[projectName].architect.serve;
+    if (!serve.options) {
+      serve.options = {};
+    }
+    serve.options.port = port;
 
     writeFileSync(angularJsonPath, JSON.stringify(angularJSON, undefined, 2));
   };

diff --git a/packages/cli-e2e/entrypoints/ci.sh b/packages/cli-e2e/entrypoints/ci.sh
@@ -16,6 +16,9 @@ docker run \
   -v "$GITHUB_WORKSPACE/packages/cli-e2e/docker/config:/verdaccio/conf" \
   verdaccio/verdaccio 
 
+git config --global user.name "notgroot"
+git config --global user.email "notgroot@coveo.com"
+
 while ! timeout 1 bash -c "echo > /dev/tcp/localhost/4873"; do sleep 10; done
 
 export UI_TEMPLATE_VERSION=0.0.0