Skip to content

Commit

Permalink
Update ckeditor and Google Maps dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
niksy committed Nov 28, 2024
1 parent 26524b7 commit 9af39e6
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 122 deletions.
3 changes: 3 additions & 0 deletions documentation/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 0.84.0
* Upgrade ckeditor and Google Maps loader dependencies

## 0.83.3
* Upgrade Node, Vite and Sass dependencies

Expand Down
129 changes: 22 additions & 107 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
"release": "np --no-release-draft"
},
"dependencies": {
"@googlemaps/js-api-loader": "^1.16.8",
"axios": "^1.1.3",
"ckeditor": "^4.11.4",
"ckeditor4": "^4.22.1",
"codemirror": "^5.65.9",
"dragula": "^3.7.3",
"dropzone": "^5.9.3",
"escape-html": "^1.0.3",
"fecha": "^4.2.3",
"fuse.js": "^6.6.2",
"google-maps": "^4.3.3",
"json-api-resource": "^0.8.0",
"little-loader": "^0.2.0",
"mitt": "^3.0.0",
Expand All @@ -51,18 +51,15 @@
},
"devDependencies": {
"@babel/core": "^7.22.1",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/preset-env": "^7.22.4",
"@vitejs/plugin-vue": "^5.2.1",
"babel-eslint": "^10.0.1",
"babel-plugin-istanbul": "^5.1.4",
"eslint": "^8.41.0",
"eslint-config-standard": "^17.1.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-standard": "^5.0.0",
"eslint-plugin-vue": "^9.14.1",
"express": "^4.17.0",
"fkill": "^8.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/js/library/ckeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import littleLoader from 'little-loader';
import bootData from '../library/bootData.js';
import app from '../app.js';

const ckeditorPath = new URL('ckeditor/ckeditor.js', import.meta.url);
const ckeditorPath = new URL('ckeditor4/ckeditor.js', import.meta.url);
let ckeditorImport = null;
function importCkEditor() {
if (ckeditorImport) {
Expand Down
19 changes: 10 additions & 9 deletions src/js/library/googleMaps.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import * as pkg from '@googlemaps/js-api-loader';
import bootData from '../library/bootData.js';
import app from '../app.js';

const __default = 'default';
const Loader = pkg.Loader || pkg[__default].Loader;

let loadApiPromise;

export function loadApi() {
Expand All @@ -9,17 +13,14 @@ export function loadApi() {
return loadApiPromise;
}

loadApiPromise = import('google-maps').then(({Loader}) => {

const loader = new Loader(bootData('googleMapsApiKey'), {
libraries: ['places'],
language: app.getLocale()
});

return loader.load().then((googleLib) => googleLib);

const loader = new Loader({
apiKey: bootData('googleMapsApiKey'),
libraries: ['places'],
language: app.getLocale()
});

loadApiPromise = loader.load().then((googleLib) => googleLib);

return loadApiPromise;

};

0 comments on commit 9af39e6

Please sign in to comment.