@openmrs/esm-report-builder 0.1.1-pre.87 → 0.1.1-pre.89

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","pages":[{"component":"root","route":"report-builder","online":true,"offline":false,"order":1}],"extensions":[{"name":"system-administration-report-builder-card-link","slot":"system-admin-page-card-link-slot","component":"reportBuilderAdminLink","online":true,"offline":false,"privileges":"Task: reportbuilder.report.view"},{"component":"confirmModal","name":"confirm-modal","online":true,"offline":true}],"version":"0.1.1-pre.87"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","pages":[{"component":"root","route":"report-builder","online":true,"offline":false,"order":1}],"extensions":[{"name":"system-administration-report-builder-card-link","slot":"system-admin-page-card-link-slot","component":"reportBuilderAdminLink","online":true,"offline":false,"privileges":"Task: reportbuilder.report.view"},{"component":"confirmModal","name":"confirm-modal","online":true,"offline":true}],"version":"0.1.1-pre.89"}

package/e2e/core/global-setup.ts

@@ -10,12 +10,12 @@ async function globalSetup(config: FullConfig) {
   const requestContext = await request.newContext({ baseURL: e2eBaseUrl });
 
   const authHeader = `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`;
-  const response = await requestContext.post('/ws/rest/v1/session', {
+  const response = await requestContext.post(`${e2eBaseUrl}/ws/rest/v1/session`, {
     headers: {
       Authorization: authHeader,
-      'Content-Type': 'application/x-www-form-urlencoded',
+      'Content-Type': 'application/json',
     },
-    form: {
+    data: {
       sessionLocation: loginLocation,
     },
     failOnStatusCode: false,

package/e2e/pages/app-shell.page.ts

@@ -1,10 +1,11 @@
 import type { Page } from '@playwright/test';
+import { playwrightBaseUrl } from '../core/env';
 
 export class AppShellPage {
   constructor(private readonly page: Page) {}
 
   async goto(path = '/') {
-    await this.page.goto(path);
+    await this.page.goto(`${playwrightBaseUrl}${path}`);
   }
 
   async openHome() {

package/e2e/pages/etl-sources.page.ts

@@ -1,11 +1,12 @@
 import type { Page } from '@playwright/test';
 import { expect } from '@playwright/test';
+import { playwrightBaseUrl } from '../core/env';
 
 export class ETLSourcesPage {
   constructor(private readonly page: Page) {}
 
   async goto() {
-    await this.page.goto('/admin/etl-sources');
+    await this.page.goto(`${playwrightBaseUrl}/admin/etl-sources`);
   }
 
   async expectLoaded() {

package/e2e/pages/report-sections.page.ts

@@ -1,11 +1,12 @@
 import type { Page } from '@playwright/test';
 import { expect } from '@playwright/test';
+import { playwrightBaseUrl } from '../core/env';
 
 export class ReportSectionsPage {
   constructor(private readonly page: Page) {}
 
   async goto() {
-    await this.page.goto('/sections');
+    await this.page.goto(`${playwrightBaseUrl}/sections`);
   }
 
   async expectLoaded() {

package/e2e/support/github/Dockerfile

@@ -10,11 +10,16 @@ RUN corepack enable && yarn install --immutable
 
 COPY . .
 
-# Build the module, pack it, and assemble the SPA (shell + this app)
+# Build and pack this module
 RUN yarn build
 RUN yarn pack -o /app/_openmrs_esm_report_builder.tgz
-RUN yarn openmrs assemble --manifest --mode config --config e2e/support/github/spa-assemble-config.json --target /app/spa
-RUN yarn openmrs build --target /app/spa
+
+# Assemble the SPA from the manifest's default module set plus this module.
+# Do not run `openmrs build` afterwards: rebuilding the shell here decouples it
+# from the manifest-pinned modules and breaks module federation.
+RUN npm_config_legacy_peer_deps=true npm install -g openmrs@next
+ARG CACHE_BUST
+RUN npm_config_legacy_peer_deps=true openmrs assemble --manifest --mode config --config e2e/support/github/spa-assemble-config.json --target /app/spa
 
 FROM openmrs/openmrs-reference-application-3-frontend:nightly
 

package/e2e/support/github/spa-assemble-config.json

@@ -1,9 +1,6 @@
 {
   "frontendModules": {
-    "@openmrs/esm-login-app": "next",
     "@openmrs/esm-primary-navigation-app": "next",
-    "@openmrs/esm-home-app": "next",
-    "@openmrs/esm-system-admin-app": "next",
     "@openmrs/esm-report-builder": "file:/app/_openmrs_esm_report_builder.tgz"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-report-builder",
-  "version": "0.1.1-pre.87",
+  "version": "0.1.1-pre.89",
   "license": "MPL-2.0",
   "description": "OpenMRS ESM Report Builder",
   "browser": "dist/openmrs-esm-report-builder.js",