Merge branch 'main' into 10351-updateUserRoles-changes

GCTC-NTGC · Jun 27, 2024 · 4d92c26 · 4d92c26
2 parents a17b338 + 90b330b
commit 4d92c26
Show file tree

Hide file tree

Showing 47 changed files with 900 additions and 738 deletions.
diff --git a/Makefile b/Makefile
@@ -45,4 +45,4 @@ lint-php:
 	$(DOCKER_API) "vendor/bin/pint --test"
 
 queue-work:
-	docker-compose exec sh -c "runuser -u www-data -- php /home/site/wwwroot/api/artisan queue:work"
+	docker-compose exec webserver sh -c "runuser -u www-data -- php /home/site/wwwroot/api/artisan queue:work"
diff --git a/api/composer.lock b/api/composer.lock
diff --git a/apps/playwright/package.json b/apps/playwright/package.json
@@ -18,15 +18,15 @@
     "@gc-digital-talent/env": "workspace:*",
     "@gc-digital-talent/eslint-config": "workspace:*",
     "@gc-digital-talent/graphql": "workspace:*",
-    "@playwright/test": "^1.44.1",
-    "@types/node": "^20.14.6",
+    "@playwright/test": "^1.45.0",
+    "@types/node": "^20.14.9",
     "@types/sinon": "^17.0.3",
     "axe-core": "^4.9.1",
     "dotenv": "^16.4.5",
     "eslint": "^8.57.0",
     "eslint-plugin-playwright": "^1.6.2",
     "sinon": "^18.0.0",
-    "typescript-eslint": "^7.13.1"
+    "typescript-eslint": "^7.14.1"
   },
   "dependencies": {
     "@axe-core/playwright": "^4.9.1"

diff --git a/apps/web/.storybook/preview.js b/apps/web/.storybook/preview.js
@@ -8,6 +8,7 @@ import {
   ThemeDecorator,
   VIEWPORTS,
 } from "@gc-digital-talent/storybook-helpers";
+import { ToastDecorator } from "@gc-digital-talent/toast";
 import { richTextElements as defaultRichTextElements } from "@gc-digital-talent/i18n";
 
 import frCommonCompiled from "@gc-digital-talent/i18n/frCompiled.json";
@@ -62,6 +63,7 @@ export const parameters = {
 export const decorators = [
   FeatureFlagDecorator,
   HelmetDecorator,
+  ToastDecorator,
   ReducedMotionDecorator,
   MockGraphqlDecorator,
   ThemeDecorator,