fix-alias

Makefile

@@ -20,7 +20,7 @@ GMF_EXAMPLES_JS_FILES := $(GMF_EXAMPLES_HTML_FILES:.html=.js)
 
 GMF_APPS += mobile desktop desktop_alt iframe_api mobile_alt oeedit
 GMF_APPS_JS_FILES = $(shell find contribs/gmf/apps/ -type f -name '*.js') $(shell find contribs/gmf/apps/ -type f -name '*.ts')
-BUILD_JS_FILES = $(shell ls -1 *.js) $(shell ls -1 utils/*.js) $(shell find buildtools/ -type f -name '*.js') $(shell find cypress/ -type f -name '*.js')
+BUILD_JS_FILES = $(shell ls -1 *.js) $(shell find buildtools/ -type f -name '*.js') $(shell find cypress/ -type f -name '*.js')
 GMF_APPS_PARTIALS_FILES = $(shell find contribs/gmf/apps/ -type f -name '*.html' -or -name '*.html.ejs')
 GMF_APPS_ALL_FILES = $(shell find contribs/gmf/apps/ -type f) $(NGEO_ALL_SRC_FILES)
 

buildtools/extract-ngeo-dependencies

@@ -51,12 +51,13 @@ all_required_js = {a for a in all_required_js if not a.startswith("./")}
 all_required_js = {a for a in all_required_js if not a.startswith("ngeo/")}
 all_required_js = {a for a in all_required_js if not a.startswith("gmf/")}
 all_required_js = {a for a in all_required_js if not a.startswith("gmfapi/")}
-all_required_js = {a for a in all_required_js if not a.startswith("goog/")}
 all_required_js = {a for a in all_required_js if not a.startswith("olcs/")}
 all_required_js = {a for a in all_required_js if not a.startswith("jsts/")}
 all_required_js = {a for a in all_required_js if not a.startswith("mapillary-js/")}
 all_required_js = {
-    a for a in all_required_js if a not in ("corejs-typeahead", "angular-float-thead", "moment")
+    a
+    for a in all_required_js
+    if a not in ("corejs-typeahead", "angular-float-thead", "moment", "mapillary-js", "jsts", "olsc")
 }
 all_required_js = {a for a in all_required_js if not a.endswith(".css")}
 for js in sorted(all_required_js):

buildtools/webpack.config.dll.js

@@ -50,17 +50,17 @@ module.exports = {
       $: 'jquery',
     }),
   ],
+  resolve: {
+    alias: {
+      'jquery-ui/datepicker': 'jquery-ui/ui/widgets/datepicker', // For angular-ui-date
+    },
+  },
   optimization: {
     minimizer: [
       new TerserPlugin({
         parallel: true,
       }),
     ],
-    resolve: {
-      alias: {
-        'jquery-ui/datepicker': 'jquery-ui/ui/widgets/datepicker', // For angular-ui-date
-      },
-    },
     sideEffects: false,
   },
 };

contribs/gmf/apps/desktop_alt/sass/desktop_alt.scss

@@ -23,7 +23,7 @@
 
 @import './vars_desktop_alt.scss';
 @import 'gmf/controllers/desktop.scss';
-@import '~mapillary-js/dist/mapillary.css';
+@import '~mapillary-js';
 
 html {
   body {

examples/mapillarystreetview.scss

@@ -1,5 +1,5 @@
 @import './common_styles.scss';
-@import 'mapillary-js/dist/mapillary.css';
+@import 'mapillary-js';
 
 ngeo-streetview {
   display: block;

src/objectediting/component.js

@@ -67,8 +67,8 @@ import olStyleStyle from 'ol/style/Style';
 import {CollectionEvent} from 'ol/Collection';
 
 // @ts-ignore: not supported import
-import {OL3Parser} from 'jsts/io';
-import 'jsts/monkey';
+import {OL3Parser} from 'jsts/org/locationtech/jts/io';
+import 'jsts/org/locationtech/jts/monkey';
 import htmlTemplate from './component.html';
 
 /**

tsconfig.json

@@ -24,7 +24,8 @@
       "gmf/*": ["src/*"],
       "gmfapi/*": ["srcapi/*"],
       "api/*": ["api/src/*"],
-      "lib/*": ["lib/*"]
+      "lib/*": ["lib/*"],
+      "mapillary-js/*": ["node_modules/mapillary-js/dist/mapillary.d.ts"]
     }
   },
   "include": ["src/**/*.js", "src/**/*.ts", "srcapi/**/*.ts", "lib/**/*.js", "api/src/**/*.js"],