From f0c6b0f5223fad458076dfc9decb4470bbc41e39 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 14 Jun 2018 15:18:42 -0400 Subject: [PATCH] LP#1775466 Dynamic module as angular element experiment cleanup Note the zone.js error when loading is under repair: https://github.com/angular/angular/issues/24466 Signed-off-by: Bill Erickson --- .gitignore | 1 + Open-ILS/src/eg2/angular.json | 2 +- Open-ILS/src/eg2/package.json | 1 + Open-ILS/src/eg2/src/index.html | 32 +++++++------------------------- Open-ILS/src/eg2/src/polyfills.ts | 6 ++++++ 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index bfcf501cf7..8c16da5dc3 100644 --- a/.gitignore +++ b/.gitignore @@ -361,3 +361,4 @@ Open-ILS/web/js/ui/default/staff/node_modules/ Open-ILS/web/js/ui/default/staff/bower_components/ Open-ILS/web/js/ui/default/common/build/ Open-ILS/web/eg2/ +Open-ILS/web/eg2-dynamic/ diff --git a/Open-ILS/src/eg2/angular.json b/Open-ILS/src/eg2/angular.json index 3218f852a2..c8779b944d 100644 --- a/Open-ILS/src/eg2/angular.json +++ b/Open-ILS/src/eg2/angular.json @@ -101,7 +101,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "../../web/eg2/dynamic", + "outputPath": "../../web/eg2-dynamic", "index": "src/dynamic.html", "main": "src/dynamic.ts", "tsConfig": "src/tsconfig.app.json", diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json index 703ed6e758..82024bb8db 100644 --- a/Open-ILS/src/eg2/package.json +++ b/Open-ILS/src/eg2/package.json @@ -24,6 +24,7 @@ "@angular/platform-browser-dynamic": "6.0.1", "@angular/router": "6.0.1", "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.5", + "@webcomponents/webcomponentsjs": "^2.0.1", "core-js": "^2.4.1", "ngx-cookie": "^2.0.1", "rxjs": "^6.1.0", diff --git a/Open-ILS/src/eg2/src/index.html b/Open-ILS/src/eg2/src/index.html index eb5a20d60b..402c8ef00c 100644 --- a/Open-ILS/src/eg2/src/index.html +++ b/Open-ILS/src/eg2/src/index.html @@ -28,32 +28,14 @@ - - - - - - - - - + + + + + diff --git a/Open-ILS/src/eg2/src/polyfills.ts b/Open-ILS/src/eg2/src/polyfills.ts index a7822cde5f..e5b314a60c 100644 --- a/Open-ILS/src/eg2/src/polyfills.ts +++ b/Open-ILS/src/eg2/src/polyfills.ts @@ -64,6 +64,12 @@ import 'core-js/es7/reflect'; import 'zone.js/dist/zone'; // Included with Angular CLI. +/** + * Required fro Web components / Angular Elements + */ +import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js'; + + /*************************************************************************************************** * APPLICATION IMPORTS */ -- 2.11.0