fix(ol): add gulp command to fix openlayers

infra-geo-ouverte · Aug 15, 2018 · 34d16fd · 34d16fd
1 parent 9a88f51
commit 34d16fd
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 136 deletions.
diff --git a/demo/src/app/auth/auth-form/auth-form.component.html b/demo/src/app/auth/auth-form/auth-form.component.html
@@ -2,15 +2,7 @@
   <mat-card-subtitle>Auth</mat-card-subtitle>
   <mat-card-title>Authentification</mat-card-title>
   <mat-card-content>
-    <p>* Dependencies: LanguageService</p>
-
-<pre>
-    <code>
-bla bla
-bal
-  blas
-    </code>
-</pre>
+    <p>* Dependencies: ConfigService, LanguageService</p>
 
     <p>Authentification form</p>
     <igo-auth-form></igo-auth-form>

diff --git a/demo/src/app/geo/catalog/catalog.component.html b/demo/src/app/geo/catalog/catalog.component.html
@@ -2,7 +2,7 @@
   <mat-card-subtitle>Geo</mat-card-subtitle>
   <mat-card-title>Catalog</mat-card-title>
   <mat-card-content>
-    <p>* Dependencies: LanguageService</p>
+    <p>* Dependencies: ConfigService, LanguageService</p>
 
   </mat-card-content>
 

diff --git a/demo/src/app/geo/search/search.component.html b/demo/src/app/geo/search/search.component.html
@@ -2,7 +2,7 @@
   <mat-card-subtitle>Geo</mat-card-subtitle>
   <mat-card-title>Search</mat-card-title>
   <mat-card-content>
-    <p>* Dependencies: LanguageService</p>
+    <p>* Dependencies: ConfigService, LanguageService</p>
 
   </mat-card-content>
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -5,6 +5,7 @@ const exec = require('gulp-exec');
 const merge = require('gulp-merge-json');
 const gulpSequence = require('gulp-sequence');
 const jeditor = require('gulp-json-editor');
+const replace = require('gulp-replace');
 
 const package = require('./package.json');
 const version = package.version;
@@ -313,6 +314,15 @@ gulp.task('bumpVersion', [
 
 // ==========================================================
 
+gulp.task('geo:fixOL', () => {
+  gulp
+    .src(['./node_modules/ol/proj.js'])
+    .pipe(replace('@typedef {module:ol/proj/Projection', '@typedef {'))
+    .pipe(gulp.dest('./node_modules/ol/'));
+});
+
+// ==========================================================
+
 gulp.task(
   'core',
   gulpSequence(
@@ -346,6 +356,7 @@ gulp.task(
   'geo',
   gulpSequence(
     'geo:clean',
+    'geo:fixOL',
     ['geo:copyAssets', 'geo:copyStyles', 'geo:copyLocale'],
     ['geo:bundleStyles'],
     'core:bundleLocale'