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

Jump to bottom

Merge Vue CLI updates & upgrade to OpenLayers v6.15.7 #320

Merged
merged 95 commits into from
Jun 26, 2023
Merged

Merge Vue CLI updates & upgrade to OpenLayers v6.15.7 #320

merged 95 commits into from
Jun 26, 2023

Conversation

spwoodcock
Copy link
Contributor

@spwoodcock spwoodcock commented Feb 28, 2023 •
edited
Loading

What is included:

What I missed:

  • I couldn't get the Karma ChromeHeadless tests to work, as I run my coding environment inside a docker container.
    I get (expected) errors related to system dbus and WebGL:
Failed to connect to the bus: Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
Passthrough is not supported, GL is disabled

@sronveaux
Fixed a typo
d6ba287
@sronveaux
Added a few lines to stick with the source template
f3f0bb2
@sronveaux
Changed eslint-html-plugin to eslint-vue-plugin
4619cf9
@sronveaux
Changed import style to conform to source template
ee7aff8
@sronveaux
Changed import style and var usage to conform to source templates
51a0b49
@sronveaux
Changed import style, var usage and arrow functions to conform to sou…
01b99e8 
…rce templates
@sronveaux
Removed some packages and added others to stay in tune with source te…
e82af80 
…mplate. The biggest difference is updating to Webpack 3.x and using Webpack-dev-server instead of Express
@sronveaux
Added the first version of the new webpack config files
5edb0c4
@sronveaux
Corrected a bug linked to babel-eslint-parser
b6ab124
@sronveaux
Added the possibility to open the browser specified in the config/ind…
b75d91a 
…ex.js file
@sronveaux
Removed opn which is installed as peer dependency now
909b7eb
@sronveaux
Corrected a bug linked to serving static files while in development mode
66a889b
@sronveaux
Removed the now useless build scripts
1b28a45
@sronveaux
Added a useless <div> tag so that vue-eslint stops complaining about it
c11e37b
@sronveaux
Fixed a lot of lint errors now that vue-eslint works as expected
77b0b75
@sronveaux
Resetted the package-lock.json to avoid a small incompatibility with …
abbf7cc 
…peerDeps and newer versions of NPM. This was already present before the latest updates though
@sronveaux
Upgraded the first files to the new vue-CLI V3 format
ee51e31
@sronveaux
Made changes to conform to new linting configuration format
91c3174
@sronveaux
Corrected an indentation error returned by ESLint
a9cdcd2
@sronveaux
Converted the Babel and postCSS config files to the new format
40b7ce7
@sronveaux
Moved the index.html and embedded.html files to the public directory.…
012547d 
… Changed their content to conform to the new template
@sronveaux
Added a first version of the vue.config.js file
cb96ffe
@sronveaux
Changed the dev and build script to conform to the Vue-CLI V3 format
d5e6ade
@sronveaux
Added two Babel polyfills needed as the project was reverted to core-…
cf19d16 
…js@2 because Vue-CLI V3 is incompatible with core-js@3
@sronveaux
Added eslint-formatter-friendly again to avoid a warning reporting bu…
1bed884 
…g of eslint to devServer
@sronveaux
Changed the main.js to conform to new Vue-CLI template and to Vue bes…
a468846 
…t practices
@sronveaux
Changed the vue.config.js to have the favicon working again
e7762ef
@sronveaux
Commented an ESLint rule as wegue main script uses console logs to re…
ff0c8c1 
…port config file deprecations
@sronveaux
Changed README.md to reflect the new npm commands syntax
a141396
@sronveaux
Renamed test directory to tests as in the new Vue-CLI template
611764b
@spwoodcock
Copy link
Contributor Author

Based on the discussions around fixing the unit tests, what are the two constants that require updating here?

Feel free to update my branch, or I can update in a few days when I'm back.

@fschmenger fschmenger mentioned this pull request Mar 27, 2023
Closed
@fschmenger
Copy link
Collaborator

Hi @spwoodcock, I couldn`t push the fixes for the unit tests to your branch,
so I temporarily parked them in #331 2a451d9.
Could you just pull it from there?

@spwoodcock
Copy link
Contributor Author

@fschmenger done 👍

@spwoodcock
Copy link
Contributor Author

spwoodcock commented Apr 26, 2023 •
edited
Loading

I updated this to include the additional commits to #314 and the latest commit on master as of 26/04/2023 (c549872).

The merge conflicts should be easy fixes (formatting only for AttributeTableWin.vue, but I'm not sure about the tests).

@spwoodcock spwoodcock mentioned this pull request Apr 26, 2023
Closed
@spwoodcock
Copy link
Contributor Author

I will close this PR in favour of #333.

@spwoodcock spwoodcock closed this Apr 26, 2023
@spwoodcock spwoodcock reopened this Apr 27, 2023
@chrismayer chrismayer mentioned this pull request May 8, 2023
Merged
@chrismayer
Copy link
Collaborator

chrismayer commented May 8, 2023 •
edited
Loading

This works quite well. Just tested again.

The conflict is just a removed trailing whitespace in src/components/attributeTable/AttributeTableWin.vue, so is easily fixable.

I am going to approve now.

@chrismayer chrismayer mentioned this pull request May 15, 2023
Merged
@spwoodcock
Copy link
Contributor Author

Thanks for the PR @chrismayer 👍

@chrismayer chrismayer merged commit 2f2be80 into wegue-oss:master Jun 26, 2023
@spwoodcock
Copy link
Contributor Author

Just in time for FOSS4G 😉

@chrismayer
Copy link
Collaborator

Just in time for FOSS4G wink

Total coincidence, but certainly not bad at all 😉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrismayer chrismayer chrismayer approved these changes

Assignees
No one assigned
Labels
Wegue v2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@spwoodcock @fschmenger @chrismayer @sronveaux