Skip to content

Commit

Permalink
Remove alias
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Sep 20, 2024
1 parent ce95903 commit fede76d
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 22 deletions.
2 changes: 2 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type {StorybookConfig} from '@storybook/web-components-webpack5';
const MiniCssExtractPlugin = require('mini-css-extract-plugin');

const config: StorybookConfig = {
stories: ['../src/**/*.stories.@(ts|tsx)'],
Expand Down Expand Up @@ -27,6 +28,7 @@ const config: StorybookConfig = {
const mergedConfig = {
...config,
module: {...config.module, rules: projectConfig.module.rules},
plugins: [...config.plugins, new MiniCssExtractPlugin()],
resolve: {
...config.resolve,
alias: {
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 3 additions & 2 deletions buildtools/extract-ngeo-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 0 additions & 4 deletions buildtools/webpack.commons.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,7 @@ module.exports = function (config) {
api: path.resolve(__dirname, '../api/src'),
lib: path.resolve(__dirname, '../lib'),
gmf: path.resolve(__dirname, '../src'),
jsts: 'jsts/org/locationtech/jts',
olcs: 'ol-cesium/src/olcs',
'jquery-ui/datepicker': 'jquery-ui/ui/widgets/datepicker', // For angular-ui-date
// required to make it working with types
'typeahead': 'corejs-typeahead',
},
},
optimization: {
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/apps/desktop_alt/sass/desktop_alt.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/mapillarystreetview.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import './common_styles.scss';
@import 'mapillary-js/dist/mapillary.css';
@import 'mapillary-js';

ngeo-streetview {
display: block;
Expand Down
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@
"gmf": "./src",
"api": "./api/src",
"lib": "./lib",
"jsts": "jsts/org/locationtech/jts",
"olcs": "ol-cesium/src/olcs",
"jquery-ui/datepicker": "jquery-ui/ui/widgets/datepicker",
"mapillary-js/src/Mapillary": "mapillary-js/dist/mapillary.js",
"typeahead": "corejs-typeahead"
"jquery-ui/datepicker": "jquery-ui/ui/widgets/datepicker"
},
"dependencies": {
"@fortawesome/fontawesome-free": "5.15.4",
Expand Down
4 changes: 2 additions & 2 deletions src/objectediting/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
2 changes: 1 addition & 1 deletion srcapi/store/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {DefaultsOptions as OlInteractionDefaultsOptions} from 'ol/interaction/de
import {Options as OlControlZoomOptions} from 'ol/control/Zoom';
import OlFeature from 'ol/Feature';
import OlGeomGeometry from 'ol/geom/Geometry';
import 'typeahead';
import 'corejs-typeahead';
import {InitOptions} from 'i18next';

/**
Expand Down
6 changes: 1 addition & 5 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@
"gmfapi/*": ["srcapi/*"],
"api/*": ["api/src/*"],
"lib/*": ["lib/*"],
"olcs/*": ["node_modules/ol-cesium/src/olcs/*"],
"mapillary-js/*": ["node_modules/mapillary-js/dist/mapillary.d.ts"],
"moment": ["node_modules/moment/moment.d.ts"],
"jsts/*": ["node_modules/@types/jsts/index.d.ts"],
"localforage/*": ["node_modules/localforage/*"]
"mapillary-js/*": ["node_modules/mapillary-js/dist/mapillary.d.ts"]
}
},
"include": ["src/**/*.js", "src/**/*.ts", "srcapi/**/*.ts", "lib/**/*.js", "api/src/**/*.js"],
Expand Down

0 comments on commit fede76d

Please sign in to comment.