Skip to content

Commit

Permalink
wip: Upgrade to Quasar 2 / Vue 3 #393
Browse files Browse the repository at this point in the history
wip: Upgrade NodeJS to v16 and Feathers v5 #392
  • Loading branch information
cnouguier committed Aug 5, 2022
1 parent 491184e commit 257fc6b
Show file tree
Hide file tree
Showing 41 changed files with 8,507 additions and 12,673 deletions.
67 changes: 67 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
module.exports = {
// https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
// This option interrupts the configuration hierarchy at this file
// Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
root: true,

parserOptions: {
parser: '@babel/eslint-parser',
ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
sourceType: 'module' // Allows for the use of imports
},

env: {
browser: true,
'vue/setup-compiler-macros': true
},

// Rules order is important, please avoid shuffling them
extends: [
// Base ESLint recommended rules
// 'eslint:recommended',

// Uncomment any of the lines below to choose desired strictness,
// but leave only one uncommented!
// See https://eslint.vuejs.org/rules/#available-rules
'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
// 'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
// 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)

// https://github.com/prettier/eslint-config-prettier#installation
// usage with Prettier, provided by 'eslint-config-prettier'.
'prettier'
],

plugins: [
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
// required to lint *.vue files
'vue',

// https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
// Prettier has not been included as plugin to avoid performance impact
// add it as an extension for your IDE

],

globals: {
cordova: 'readonly',
__statics: 'readonly',
__QUASAR_SSR__: 'readonly',
__QUASAR_SSR_SERVER__: 'readonly',
__QUASAR_SSR_CLIENT__: 'readonly',
__QUASAR_SSR_PWA__: 'readonly',
process: 'readonly',
Capacitor: 'readonly',
chrome: 'readonly'
},

// add your custom rules here
rules: {

'prefer-promise-reject-errors': 'off',
'vue/multi-word-component-names': 0,

// allow debugger during development only
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
}
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ src/tours/core
src/tours/map

#KDK icons
src/assets/icons
public/icons/kdk/*.png
1 change: 1 addition & 0 deletions .postcssrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable */
// https://github.com/michael-ciniawsky/postcss-load-config

module.exports = {
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
licenses:
- '.+'
before_install:
- nvm install 16
- nvm install 12.16
- yes | sdkmanager "platforms;android-30"
- npm install -g yarn
- curl -k -O https://downloads.rclone.org/rclone-current-linux-amd64.zip
Expand All @@ -85,7 +85,7 @@ jobs:
language: objective-c
osx_image: xcode13.2
before_install:
- nvm install 16
- nvm install 12.16
- npm install -g yarn
- brew update
- brew install rclone
Expand Down
17 changes: 13 additions & 4 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
module.exports = {
presets: [
'@quasar/babel-preset-app'
]
/* eslint-disable */

module.exports = api => {
return {
presets: [
[
'@quasar/babel-preset-app',
api.caller(caller => caller && caller.target === 'node')
? { targets: { node: 'current' } }
: {}
]
]
}
}
16 changes: 0 additions & 16 deletions config/server.crt

This file was deleted.

15 changes: 0 additions & 15 deletions config/server.key

This file was deleted.

126 changes: 71 additions & 55 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aktnmap",
"description": "Kalisio Akt'n'Map Application",
"version": "2.0.0",
"version": "1.4.0",
"homepage": "https://github.com/kalisio/aktnmap",
"keywords": [
"kalisio"
Expand Down Expand Up @@ -42,7 +42,7 @@
"analyze": "npm run analyze:stats && npm run analyze:treemap",
"lint": "standard src/**/*.js src/**/*.vue test/**/*.js tutorials/**/*.js --fix",
"benchmark": "node ./benchmark",
"icons:cp": "shx cp -R node_modules/@kalisio/kdk/extras/icons src/assets",
"icons:cp": "shx cp -R node_modules/@kalisio/kdk/extras/icons public/icons/kdk",
"tours:cp": "shx cp -R node_modules/@kalisio/kdk/extras/tours/* src/tours",
"mocha": "mocha test/**/*.test.js --timeout 30000 --require esm",
"coverage": "c8 npm run mocha",
Expand All @@ -66,7 +66,7 @@
"mocha"
],
"ignore": [
"public"
"src/statics"
],
"globals": [
"DEV",
Expand All @@ -88,11 +88,11 @@
},
"dependencies": {
"@feathersjs/client": "^5.0.0-pre.22",
"@feathersjs/commons": "^5.0.0-pre.22",
"@geoman-io/leaflet-geoman-free": "^2.11.1",
"@kalisio/kdk": "https://github.com/kalisio/kdk#es-modules",
"@mapbox/geojsonhint": "^3.0.1",
"@panter/vue-i18next": "^0.9.1",
"@quasar/extras": "^1.6.0",
"@quasar/extras": "^1.0.0",
"@tmcw/togeojson": "^4.5.0",
"@turf/area": "^6.0.1",
"@turf/bbox": "^6.0.1",
Expand All @@ -101,117 +101,116 @@
"@turf/clean-coords": "^6.0.0",
"@turf/distance": "^6.0.0",
"@turf/explode": "^6.2.0-alpha.2",
"@turf/flatten": "^6.0.0",
"@turf/helpers": "^6.0.0",
"@turf/invariant": "^6.0.0",
"@turf/kinks": "^6.0.0",
"@turf/length": "^6.0.0",
"@turf/meta": "^6.0.0",
"@weacast/core": "^2.1.2",
"@weacast/leaflet": "^2.1.2",
"Leaflet.Geodesic": "https://github.com/henrythasler/Leaflet.Geodesic.git",
"abort-controller": "^3.0.0",
"ajv": "^6.0.0",
"ajv": "6.0.0",
"ajv-i18n": "^3.6.0",
"babel-polyfill": "^6.23.0",
"babel-runtime": "^6.25.0",
"assert": "^2.0.0",
"browserify-zlib": "^0.2.0",
"casl": "^1.0.2",
"chart.js": "^3.7.1",
"chartjs-adapter-moment": "^1.0.0",
"chartjs-plugin-annotation": "^1.3.1",
"chartjs-plugin-annotation": "^1.4.0",
"chartjs-plugin-datalabels": "^2.0.0",
"chartjs-plugin-zoom": "^1.2.1",
"chroma-js": "^2.0.2",
"cross-env": "^5.2.0",
"chroma-js": "^2.4.2",
"d3": "^4.9.1",
"email-validator": "^2.0.4",
"fastclick": "^1.0.6",
"feathers-authentication-management": "^1.0.0",
"feathers-client": "^2.4.0",
"feathers-memory": "^2.2.0",
"feathers-memory": "^4.1.0",
"feathers-reactive": "^0.10.0",
"formatcoords": "^1.1.3",
"georaster": "^0.4.2",
"geotiff": "^2.0.4",
"i18next": "^10.5.0",
"https-browserify": "^1.0.0",
"i18next": "^21.6.16",
"iso8601-js-period": "^0.2.1",
"jquery": "^3.2.1",
"js-yaml": "^3.13.1",
"jsdap": "^8.1.0",
"leaflet": "^1.2.0",
"leaflet": "1.6.0",
"leaflet-fa-markers": "^0.0.5",
"leaflet-fullscreen": "^1.0.2",
"leaflet-heatmap": "^1.0.0",
"leaflet-pixi-overlay": "1.8.1",
"leaflet-realtime": "^2.2.0",
"leaflet-timedimension": "^1.1.0",
"leaflet-velocity": "^1.2.2",
"leaflet-velocity": "^1.7.0",
"leaflet.geodesic": "^2.6.1",
"leaflet.locatecontrol": "^0.67.0",
"leaflet.markercluster": "1.1.0",
"leaflet.vectorgrid": "^1.3.0",
"lodash": "^4.17.21",
"loglevel": "^1.6.0",
"loglevel": "^1.8.0",
"mapillary-js": "^4.0.0",
"mathjs": "^10.1.1",
"mime-types-browser": "^0.0.3",
"mathjs": "^10.5.0",
"mime": "^3.0.0",
"moment": "^2.29.4",
"moment-timezone": "^0.5.34",
"node-fetch": "^2.6.7",
"papaparse": "^4.6.1",
"papaparse": "^5.3.2",
"password-generator": "^2.2.0",
"path-browserify": "^1.0.1",
"pinch-zoom-element": "^1.1.1",
"pixi.js": "5.3.10",
"quasar": "^1.9.9",
"sanitize-html": "^1.27.1",
"showdown": "^1.9.1",
"quasar": "^2.7.7",
"sanitize-html": "^2.7.0",
"showdown": "^2.1.0",
"shpjs": "^4.0.2",
"sift": "^8.0.0",
"sift": "^16.0.0",
"socket.io-client": "^4.4.1",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"timers-browserify": "^2.0.12",
"tween.js": "^16.6.0",
"vue-slider-component": "^3.0.33",
"vue": "^3.0.0",
"vue-i18n": "^9.2.0-beta.35",
"vue-router": "^4.0.0",
"vue-slider-component": "next",
"vue-stripe-elements-plus": "^0.2.8",
"vue-tour": "~1.4.0",
"vue2-dropzone": "^3.6.0",
"vue3-tour": "https://github.com/alexandreDavid/vue3-tour",
"whatwg-fetch": "^2.0.3",
"xml2js": "^0.4.22",
"xml2js": "^0.4.23",
"yallist": "^4.0.0"
},
"devDependencies": {
"@quasar/app": "1.1.4",
"babel-eslint": "^10.0.3",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-transform-export-extensions": "^6.22.0",
"@babel/eslint-parser": "^7.13.14",
"@quasar/app-webpack": "^3.5.4",
"c8": "^7.11.0",
"chai": "^4.3.4",
"chai": "^4.3.6",
"chai-lint": "^0.1.1",
"clui": "^0.3.6",
"colors": "^1.1.2",
"commander": "^2.15.0",
"config": "^1.26.1",
"config": "^3.3.7",
"connect-history-api-fallback": "^1.1.0",
"cordova": "^8.0.0",
"cordova-set-version": "^6.0.3",
"cordova": "^11.0.0",
"cordova-set-version": "^13.0.1",
"cross-env": "^7.0.3",
"debug": "^4.1.0",
"envsub": "^3.0.9",
"es6-promise": "^4.1.1",
"eslint": "^4.4.1",
"eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^1.9.0",
"eslint-plugin-vue": "^5.2.3",
"envsub": "^4.0.7",
"eslint": "^8.10.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-vue": "^8.5.0",
"eslint-webpack-plugin": "^3.1.1",
"esm": "^3.2.25",
"eventsource-polyfill": "^0.9.6",
"express": "^4.15.4",
"glob": "^7.1.2",
"mocha": "^9.1.1",
"mocha": "^10.0.0",
"mongodb": "^3.1.13",
"npm-run-all": "^4.1.2",
"opn": "^5.0.0",
"pixelmatch": "^5.2.0",
"pngjs": "^5.0.0",
"prettier": "^2.5.1",
"shelljs": "^0.8.5",
"shx": "^0.3.2",
"shx": "^0.3.4",
"sns-mobile": "https://github.com/kalisio/sns-mobile",
"standard": "^14.0.0",
"winston": "^3.2.1",
"worker-farm": "^1.6.0"
"standard": "^17.0.0"
},
"resolutions": {
"@pixi/accessibility": "5.3.10",
Expand Down Expand Up @@ -247,6 +246,23 @@
"@pixi/text": "5.3.10",
"@pixi/text-bitmap": "5.3.10",
"@pixi/ticker": "5.3.10",
"@pixi/utils": "5.3.10"
}
"@pixi/utils": "5.3.10",
"leaflet": "1.6.0"
},
"engines": {
"node": ">= 16.0.0",
"npm": ">= 6.13.4",
"yarn": ">= 1.21.1"
},
"browserslist": [
"last 10 Chrome versions",
"last 10 Firefox versions",
"last 4 Edge versions",
"last 7 Safari versions",
"last 8 Android versions",
"last 8 ChromeAndroid versions",
"last 8 FirefoxAndroid versions",
"last 10 iOS versions",
"last 5 Opera versions"
]
}
Empty file added public/icons/kdk/.gitkeep
Empty file.
Loading

0 comments on commit 257fc6b

Please sign in to comment.