Skip to content
This repository has been archived by the owner on Mar 17, 2021. It is now read-only.

Commit

Permalink
Fix dashboard build to accomodate upstream changes
Browse files Browse the repository at this point in the history
Commit 51bb0bb13f in upstream causes builds to fail on any webpack
error. To work around a typescript issue, commit 2181ed1340 adds
'index.d.ts' to the dashboard base directory. Since this is not included
in the packaged maven artifact, this commit adds the same file to the
rh-che dashboard directory and updates the build to copy it along with
the rest of the sources.

Should be undone when typescript is updated >3.5

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
  • Loading branch information
amisevsk committed Dec 3, 2019
1 parent 6061e23 commit 083102a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion assembly/fabric8-ide-dashboard-war/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Build step: $ docker build -t eclipse-che-dashboard .
# It builds an archive file that can be used by doing later
# $ docker run --rm eclipse-che-dashboard | tar -C target/ -zxf -
FROM node:8.15.1
FROM node:8.16.0

ARG SOURCES_DIR

Expand Down
8 changes: 8 additions & 0 deletions assembly/fabric8-ide-dashboard-war/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// remove this declaration after upgrading typescript version > 3.5
import * as _angular from 'angular';
import * as _jsyaml from 'js-yaml';

declare global {
const angular: typeof _angular;
const jsyaml: typeof _jsyaml;
}
1 change: 1 addition & 0 deletions assembly/fabric8-ide-dashboard-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
<copy overwrite="true" todir="${basedir}/target/sources/" verbose="true">
<fileset dir="${basedir}">
<include name="src/**" />
<include name="index.d.ts" />
</fileset>
</copy>
</target>
Expand Down

0 comments on commit 083102a

Please sign in to comment.