Skip to content

Commit

Permalink
Merge pull request #9474 from camptocamp/GSNGEO-14-publish-as-es6
Browse files Browse the repository at this point in the history
Publish as es6
  • Loading branch information
ger-benjamin authored Sep 17, 2024
2 parents f3fb8f9 + 777e20f commit 42a9f95
Show file tree
Hide file tree
Showing 19 changed files with 23,188 additions and 119 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*.pyc
/package-lock.json
/apidoc/
/api/dist/api.*
/.transifexrc
Expand All @@ -14,6 +13,7 @@
/contribs/gmf/apps/build/
/contribs/gmf/examples/https.js
/dist/
/distlib/
/test/check-example/*.html.png
/examples/dist
/contribs/dist
Expand Down
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ repos:
|examples/measure\.js
|src/bootstrap-custom\.css\.map
|buildtools/sgx\.capabilities\.xml
|package-lock\.json
)$
args:
- --ignore-words=.github/spell-ignore-words.txt
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ contribs/dist: .build/build-dll.timestamp
touch $@

.build/node_modules.timestamp: package.json
npm install --omit=optional
npm install
# Installed from peer dependency from ol-layerswitcher and that breaks our types
rm -rf ./node_modules/@types/openlayers
mkdir -p $(dir $@)
Expand Down
6 changes: 5 additions & 1 deletion buildtools/webpack.commons.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ module.exports = function (config) {

const sassRule = {
test: /\.s[ac]ss$/i,
use: [{loader: 'style-loader'}, {loader: 'css-loader'}, {loader: 'sass-loader'}],
use: [
{loader: 'style-loader'},
{loader: 'css-loader'},
{loader: 'sass-loader', options: {warnRuleAsWarning: false}},
],
};

const resourcesRule = {
Expand Down
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default [
sourceType: 'module',

parserOptions: {
project: ['tsconfig-eslint.json'],
project: ['tsconfig-all.json'],
},
},

Expand Down
Loading

0 comments on commit 42a9f95

Please sign in to comment.