Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix doc build #168

Merged
merged 8 commits into from
Oct 15, 2019
Merged

Fix doc build #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43b6113
Fix versions
oterral Oct 15, 2019
f8b5e0e
Update libs
oterral Oct 15, 2019
c95069c
Merge branch 'master' into olivier/build
oterral Oct 15, 2019
6d1ec34
Revert changes
oterral Oct 15, 2019
65f050d
Fix terser version see https://github.com/terser/terser/issues/490 fo…
oterral Oct 15, 2019
578e413
Fix package.json order
oterral Oct 15, 2019
99ba6ed
Merge branch 'master' into olivier/build
oterral Oct 15, 2019
d06042a
Merge remote-tracking branch 'origin/master' into olivier/build
oterral Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,27 @@
"main": "build/es/index.js",
"proxy": "http://127.0.0.1:8000",
"dependencies": {
"@babel/plugin-transform-async-to-generator": "^7.5.0",
"@babel/preset-react": "^7.6.3",
"@turf/intersect": "^6.1.3",
"abortcontroller-polyfill": "^1.2.3",
"color": "^3.1.2",
"i18next": "^17.0.12",
"i18next-browser-languagedetector": "^3.0.1",
"i18next-browser-languagedetector": "^4.0.0",
"i18next-xhr-backend": "^3.1.2",
"jsts": "^2.0.3",
"lodash": "^4.17.11",
"mapbox-gl": "^1.2.1",
"node-sass": "^4.11.0",
"ol": "^6.0.0-beta.13",
"ol": "^6.0.1",
"proj4": "^2.5.0",
"prop-types": "^15.6.2",
"query-string": "^6.3.0",
"react": "^16.7.0",
"react-app-polyfill": "^1.0.1",
"react-dom": "^16.7.0",
"react-i18next": "^10.2.0",
"react": "^16.10.2",
"react-app-polyfill": "^1.0.4",
"react-dom": "^16.10.2",
"react-i18next": "^10.13.1",
"react-icons": "^3.1.0",
"react-redux": "^7.0.3",
"react-router-dom": "^5.0.0",
"react-router-dom": "^5.1.2",
"react-router-prop-types": "^1.0.4",
"react-spatial": "^0.1.0-beta.24",
"react-styleguidist": "^9.1.11",
Expand All @@ -40,12 +38,11 @@
"react-dom": "^16.7.0"
},
"devDependencies": {
"@babel/cli": "^7.2.3",
"@babel/core": "^7.5.5",
"@babel/core": "^7.6.4",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-runtime": "^7.5.5",
"@babel/runtime": "^7.3.1",
"@babel/preset-react": "^7.0.0",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.0.6",
"babel-plugin-named-asset-import": "^0.3.0",
Expand All @@ -55,27 +52,27 @@
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.8.0",
"esdoc-standard-plugin": "^1.0.0",
"eslint": "^6.3.0",
"eslint": "^6.4.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.2.0",
"eslint-config-prettier": "^6.3.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-react": "^7.14.3",
"eslint-plugin-react-hooks": "^2.0.1",
"fetch-mock": "^7.2.5",
"fetch-mock": "^7.3.9",
"fixpack": "^2.3.1",
"generact": "^0.4.0",
"geops-docjs-template": "^1.0.0",
"husky": "^3.0.0",
"jest": "^24.9.0",
"jest-canvas-mock": "^2.0.0-alpha.2",
"jest-canvas-mock": "^2.1.2",
"jest-serializer-html": "^7.0.0",
"lint-staged": "^9.2.3",
"lint-staged": "^9.3.0",
"node-fetch": "^2.3.0",
"prettier": "^1.16.3",
"react-scripts": "^3.1.1",
"react-test-renderer": "^16.5.2",
"react-scripts": "^3.1.2",
"react-test-renderer": "^16.10.2",
"redux-mock-store": "^1.5.3",
"rewire": "^4.0.1",
"sort-json": "^2.0.0",
Expand All @@ -85,7 +82,10 @@
"stylelint-config-standard": "^19.0.0",
"stylelint-scss": "^3.5.1",
"vinyl-fs": "^3.0.3",
"webpack": "4.40.2"
"webpack": "4.41.0"
},
"resolutions": {
"terser": "4.3.4"
},
"scripts": {
"build": "node ./scripts/build-non-split.js && yarn build:es && node scripts/prepare-package.js",
Expand Down Expand Up @@ -185,7 +185,7 @@
"yarn test --bail --findRelatedTests"
],
"package.json": [
"fixpack --sortToTop name --sortToTop descrpition --sortToTop version --sortToTop author --sortToTop main --sortToTop proxy --sortToTop dependencies --sortToTop peerDependencies --sortToTop devDependencies --sortToTop scripts",
"fixpack --sortToTop name --sortToTop description --sortToTop version --sortToTop author --sortToTop main --sortToTop proxy --sortToTop dependencies --sortToTop peerDependencies --sortToTop devDependencies --sortToTop resolutions --sortToTop scripts",
"git add"
],
"src/**/*.{css,scss}": [
Expand Down
23 changes: 11 additions & 12 deletions public/lang/locale-de-main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@
"EPSG:21781": "CH1903 / LV03",
"EPSG:3857": "Web Mercator",
"EPSG:4326": "WGS 84",
"eurok_wc": "Eurokey WC",
"Fahrplan": "Fahrplan",
"faltrampe": "Faltrampe",
"Format A4": "Format A4",
"gemeinde": "Gemeinde",
"gemeinde_plural": "Gemeinden",
Expand All @@ -133,6 +135,7 @@
"Höhe": "Höhe",
"id": "ID",
"Impressum": "Impressum",
"induktionsverstaerker": "Induktionsverstärker",
"Interaktiver Bahnhofplan": "Interaktiver Bahnhofplan",
"Karte als Bild speichern": "Karte als Bild speichern.",
"Karte per Email versenden": "Karte per Email versenden.",
Expand All @@ -150,6 +153,7 @@
"Länge": "Länge",
"last-import": "Letzer Import",
"Layer": "Layer",
"lift_zu_perron": "Lift zu Perron",
"linie": "Linie",
"linie_plural": "Linien",
"linien": "Linien",
Expand All @@ -174,15 +178,20 @@
"park_plural": "Pärke",
"passagier_freq_jahr": "Durchschnittlicher werktäglicher Verkehr {{statisticDate}}:",
"Permalink generieren": "Permalink.",
"perronhoehe_P55": "Perronhöhe P55",
"Plakat": "Plakat",
"Printprodukte": "Printprodukte",
"Projektionswahl": "Projektionswahl",
"Pünktlichkeit": "Pünktlichkeit",
"rampe": "Rampe",
"Rechtliches": "Rechtliches",
"Regionaler Naturpark": "Regionaler Naturpark",
"Reisende mit Handicap": "Reisende mit Handicap",
"rollstuhl_billet": "Rollstuhl Billet",
"rollstuhl_wc": "Rollstuhl WC",
"SBB Logo": "SBB Logo",
"sbb_hafas": "Fahrplan",
"sbb_rollstuhl": "SBB Rollstuhl",
"sbb_url": "http://www.sbb.ch/home.html",
"Schliessen": "Schliessen",
"Schweizerischer Nationalpark": "Schweizerischer Nationalpark",
Expand All @@ -198,6 +207,7 @@
"Stationen, Verbindungen, Orte": "Stationen, Verbindungen, Orte",
"Suche": "Suche",
"Suchergebnisse sind verfügbar. Verwenden Sie die TAB-Taste um zu navigieren.": "Suchergebnisse sind verfügbar. Verwenden Sie die TAB-Taste um zu navigieren.",
"taktile_sicherheitslinien": "Taktile Sicherheitslinien",
"Teilen": "Teilen",
"Themen": "Themen",
"trackit100": "Trafimage",
Expand All @@ -218,16 +228,5 @@
"xmas": "SBB-Weihnacht",
"xmastr": "Weihnachts-Tracker",
"Zeichnen": "Zeichnen",
"Zugtracker": "Zugtracker",

"faltrampe": "Faltrampe",
"sbb_rollstuhl": "SBB Rollstuhl",
"rollstuhl_billet": "Rollstuhl Billet",
"rollstuhl_wc": "Rollstuhl WC",
"eurok_wc": "Eurokey WC",
"lift_zu_perron": "Lift zu Perron",
"perronhoehe_P55": "Perronhöhe P55",
"taktile_sicherheitslinien": "Taktile Sicherheitslinien",
"induktionsverstaerker": "Induktionsverstärker",
"rampe": "Rampe"
"Zugtracker": "Zugtracker"
}
2 changes: 1 addition & 1 deletion src/apps/Casa/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@ const elements = {
elements={elements}
/>
</div>;
```
```
Loading