feat(*): upgrade to angular 7

infra-geo-ouverte · Feb 27, 2019 · 8a1b52d · 8a1b52d
1 parent ddd3d72
commit 8a1b52d
Show file tree

Hide file tree

Showing 34 changed files with 5,790 additions and 2,985 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "prettier.disableLanguages": ["html"]
+}
diff --git a/angular.json b/angular.json
@@ -41,7 +41,10 @@
               }
             ],
             "styles": ["src/styles.scss"],
-            "scripts": []
+            "scripts": [],
+            "stylePreprocessorOptions": {
+              "includePaths": ["src/style/partial"]
+            }
           },
           "configurations": {
             "production": {

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,10 +1,16 @@
 /*jshint esversion: 6 */
 const gulp = require('gulp');
-const replace = require('gulp-replace');
+const jeditor = require('gulp-json-editor');
 
-gulp.task('geo:fixOL', () => {
+gulp.task('geo:fixOL', done => {
   gulp
-    .src(['./node_modules/ol/proj.js'])
-    .pipe(replace('@typedef {module:ol/proj/Projection', '@typedef {'))
+    .src(['./node_modules/ol/package.json'])
+    .pipe(
+      jeditor({
+        sideEffects: true
+      })
+    )
     .pipe(gulp.dest('./node_modules/ol/'));
+
+  done();
 });