Skip to content

Commit a9218cc

Browse files
committed
Publish as es6
1 parent f3fb8f9 commit a9218cc

12 files changed

+52
-59
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/contribs/gmf/apps/build/
1515
/contribs/gmf/examples/https.js
1616
/dist/
17+
/distlib/
1718
/test/check-example/*.html.png
1819
/examples/dist
1920
/contribs/dist

eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default [
4141
sourceType: 'module',
4242

4343
parserOptions: {
44-
project: ['tsconfig-eslint.json'],
44+
project: ['tsconfig-all.json'],
4545
},
4646
},
4747

package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"dist": "TARGET=dist webpack --mode=production --progress",
1717
"dist-spinner": "svgo --config=svgo.js src/icons/spinner.svg --output=dist/spinner.svg",
1818
"build-gmf-apps-profile": "TARGET=gmf-apps webpack --profile --json > profile.json",
19-
"typecheck": "tsc --noEmit",
19+
"prepare": "tsc --pretty",
20+
"typecheck": "tsc --project tsconfig-all.json --noEmit",
2021
"doc": "typedoc",
2122
"build-storybook": "NODE_ENV=env TARGET=ngeo-examples storybook build --output-dir=.build/storybook",
2223
"storybook": "NODE_ENV=env TARGET=ngeo-examples storybook dev --port=6006",
@@ -93,7 +94,6 @@
9394
"@types/jquery": "3.5.30",
9495
"@types/jquery.ui.datetimepicker": "0.3.35",
9596
"@types/jqueryui": "1.12.23",
96-
"@types/jsts": "0.17.24",
9797
"@types/node": "20.16.3",
9898
"@types/offscreencanvas": "2019.7.3",
9999
"@types/proj4": "2.5.5",
@@ -160,7 +160,6 @@
160160
"jquery-ui": "1.14.0",
161161
"jquery-ui-touch-punch": "0.2.3",
162162
"jscodeshift": "17.0.0",
163-
"jsts": "2.11.3",
164163
"karma": "6.4.4",
165164
"karma-chrome-launcher": "3.2.0",
166165
"karma-jasmine": "5.1.0",
@@ -174,7 +173,6 @@
174173
"loc-i18next": "0.1.6",
175174
"localforage": "1.10.0",
176175
"magic-comments-loader": "2.1.3",
177-
"mapillary-js": "4.1.2",
178176
"minify-html-literals-loader": "1.1.1",
179177
"moment": "2.30.1",
180178
"neat-csv": "6.0.1",
@@ -211,5 +209,10 @@
211209
"webpack-cli": "5.1.4",
212210
"webpack-dev-server": "5.0.4",
213211
"webpack-merge": "6.0.1"
212+
},
213+
"peerDependencies": {
214+
"@types/jsts": "^0.17.24",
215+
"jsts": "^2.11.3",
216+
"mapillary-js": "^4.1.2"
214217
}
215218
}

src/auth/component.spec.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
2020
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
23-
/* eslint-disable @typescript-eslint/no-unsafe-call */
24-
2522
import gmfAuthenticationService from 'ngeo/auth/service';
2623

2724
import configuration, {Configuration} from 'gmfapi/store/config';

src/controllers/AbstractAppController.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@ export function AbstractAppController($scope, $injector, mobile) {
289289
this.hasEditableLayers = false;
290290

291291
/**
292-
* @this {AbstractAppController}
292+
* Check editable layers
293293
*/
294-
this.updateHasEditableLayers_ = function () {
294+
this.updateHasEditableLayers_ = () => {
295295
this.gmfThemes.hasEditableLayers().then((hasEditableLayers) => {
296296
this.hasEditableLayers = hasEditableLayers;
297297
});

src/e2e/desktop.spec.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
2020
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
/* eslint-disable @typescript-eslint/no-unsafe-call */
2322
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
24-
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
25-
/* eslint-disable @typescript-eslint/no-unsafe-argument */
2623

2724
import olMap from 'ol/Map';
2825
import path from 'path';

src/e2e/mobile.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
2020
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
/* eslint-disable @typescript-eslint/no-unsafe-call */
2322
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
2423
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
2524
/* eslint-disable @typescript-eslint/restrict-template-expressions */
@@ -463,7 +462,8 @@ if (Cypress.browser.isHeaded) {
463462
cy.wrap(btn)
464463
.click({force: true})
465464
.then((btn) => {
466-
expect(btn).to.not.be.visible; // eslint-disable-line @typescript-eslint/no-unused-expressions
465+
// eslint-disable-next-line @typescript-eslint/no-unused-expressions, @typescript-eslint/unbound-method
466+
expect(btn).to.not.be.visible;
467467

468468
// Check the placeholder
469469
cy.get('.tt-input').should('have.attr', 'placeholder', 'Search…');

tsconfig-all.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"_description_": "Tsconfig to use lint on every ts files",
3+
"extends": "./tsconfig.json",
4+
"include": [
5+
"*.js",
6+
"*.ts",
7+
"src/**/*.js",
8+
"src/**/*.ts",
9+
"utils/**/*.js",
10+
"utils/**/*.ts",
11+
"buildtools/**/*.js",
12+
"buildtools/**/*.ts",
13+
"cypress/**/*.js",
14+
"cypress/**/*.ts",
15+
"test/spec/**/*.js",
16+
"test/spec/**/*.ts",
17+
"examples/*.js",
18+
"examples/*.ts",
19+
"api/src/**/*.js",
20+
"api/src/**/*.ts",
21+
"contribs/gmf/apps/**/*.js",
22+
"contribs/gmf/apps/**/*.ts",
23+
"contribs/gmf/test/spec/**/*.js",
24+
"contribs/gmf/test/spec/**/*.ts",
25+
"contribs/gmf/examples/*.js",
26+
"contribs/gmf/examples/*.ts"
27+
],
28+
"exclude": []
29+
}

tsconfig-build.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

tsconfig-eslint.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)