From b6864fc5037fccb57a30e2b99df629e289bd0e47 Mon Sep 17 00:00:00 2001 From: sundaram Date: Fri, 30 Oct 2020 18:37:31 +0530 Subject: [PATCH 1/8] adding ember leaflet --- app/components/public/event-map.js | 15 ++- app/styles/components/extras.scss | 4 + app/templates/components/public/event-map.hbs | 20 ++-- app/templates/public/index.hbs | 4 +- package.json | 2 + yarn.lock | 106 +++++++++++++++++- 6 files changed, 135 insertions(+), 16 deletions(-) diff --git a/app/components/public/event-map.js b/app/components/public/event-map.js index bb0861a1cb8..c81e74e9ad1 100644 --- a/app/components/public/event-map.js +++ b/app/components/public/event-map.js @@ -1,7 +1,20 @@ import classic from 'ember-classic-decorator'; import { classNames } from '@ember-decorators/component'; import Component from '@ember/component'; +import { tracked } from '@glimmer/tracking'; @classic @classNames('ui', 'stackable', 'grid') -export default class EventMap extends Component {} +export default class EventMap extends Component { + @tracked + lat = this.event.latitude; + + @tracked + lng = this.event.longitude; + + @tracked + zoom = 4; + + @tracked + emberConfLocation = [this.event.latitude, this.event.longitude]; +} diff --git a/app/styles/components/extras.scss b/app/styles/components/extras.scss index 20c0df19634..a3587ab4760 100644 --- a/app/styles/components/extras.scss +++ b/app/styles/components/extras.scss @@ -10,3 +10,7 @@ a.link-item { background-color: rgba(0, 0, 0, .05); } } + +.leaflet-container { + height: 300px; +} diff --git a/app/templates/components/public/event-map.hbs b/app/templates/components/public/event-map.hbs index d0a452df5bc..c2850b683eb 100644 --- a/app/templates/components/public/event-map.hbs +++ b/app/templates/components/public/event-map.hbs @@ -1,17 +1,15 @@ {{#if this.event.isMapShown}}

{{t 'Getting Here'}}

- {{#if (eq this.mapConfig.display 'embed') }} - - {{else}} - - {{#g-map-address-marker context address=this.event.locationName as |markerContext|}} - {{#g-map-infowindow markerContext}} - {{this.event.locationName}} - {{/g-map-infowindow}} - {{/g-map-address-marker}} - - {{/if}} + + + + +

{{this.event.name}}

+ {{this.event.locationName}} + + +
{{/if}}
diff --git a/app/templates/public/index.hbs b/app/templates/public/index.hbs index bd587bb71bf..d057b7e6e8b 100644 --- a/app/templates/public/index.hbs +++ b/app/templates/public/index.hbs @@ -66,9 +66,7 @@ {{/if}}
{{#if this.model.event.locationName}} - + {{/if}} {{#if this.model.event.online}}

{{t 'Online Event'}}

diff --git a/package.json b/package.json index 806cf5fe9df..eda53f89ae2 100644 --- a/package.json +++ b/package.json @@ -136,6 +136,7 @@ "fastboot-app-server": "^3.0.0", "google-material-color": "^1.3.1", "http-status": "^1.4.2", + "leaflet": "0.7", "loader.js": "^4.7.0", "lodash-es": "^4.17.15", "mini-css-extract-plugin": "^1.2.1", @@ -165,6 +166,7 @@ }, "private": true, "dependencies": { + "ember-leaflet": "^4.1.1", "ua-parser-js": "^0.7.22" }, "ember": { diff --git a/yarn.lock b/yarn.lock index 3a8ba7e0f83..821ca7a8ff3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3311,6 +3311,11 @@ babel-plugin-htmlbars-inline-precompile@^3.0.1: resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.0.1.tgz#e1e38a4087f446578e419a21c112530c8df02345" integrity sha512-ZiFY0nQjtdMPGIDwp/5LYOs6rCr54QfcSV5nPbrA7C++Fv4Vb2Q/qrKYx78t+dwmARJztnOBlObFk4z8veHxNA== +babel-plugin-htmlbars-inline-precompile@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.2.0.tgz#c4882ea875d0f5683f0d91c1f72e29a4f14b5606" + integrity sha512-IUeZmgs9tMUGXYu1vfke5I18yYJFldFGdNFQOWslXTnDWXzpwPih7QFduUqvT+awDpDuNtXpdt5JAf43Q1Hhzg== + babel-plugin-htmlbars-inline-precompile@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-4.2.0.tgz#73e7a199c14db139b9c9aea240e03b7112784c81" @@ -6416,7 +6421,7 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.10.0, ember-cli-version-checker "^2.1.2" semver "^5.5.0" -ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: +ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3, ember-cli-babel@^7.8.0: version "7.23.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.23.0.tgz#ec580aa2c115d0810e454dd5c2fffce238284b92" integrity sha512-ix58DlRDAbGITtdJoRUPcAoQwKLYr/x/kIXjU9u1ATyhmuUjqb+0FDXghOWbkNihGiNOqBBR49+LBgK9AeBcNw== @@ -6744,6 +6749,36 @@ ember-cli-htmlbars@^3.0.0, ember-cli-htmlbars@^3.0.1: json-stable-stringify "^1.0.0" strip-bom "^3.0.0" +ember-cli-htmlbars@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.1.0.tgz#87806c2a0bca2ab52d4fb8af8e2215c1ca718a99" + integrity sha512-cgvRJM73IT0aePUG7oQ/afB7vSRBV3N0wu9BrWhHX2zkR7A7cUBI7KC9VPk6tbctCXoM7BRGsCC4aIjF7yrfXA== + dependencies: + broccoli-persistent-filter "^2.3.1" + hash-for-dep "^1.5.1" + json-stable-stringify "^1.0.1" + strip-bom "^3.0.0" + +ember-cli-htmlbars@^4.2.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.4.0.tgz#7ca17d5ca8f7550984346d9e6e93da0c3323f8d9" + integrity sha512-ohgctqk7dXIZR4TgN0xRoUYltWhghFJgqmtuswQTpZ7p74RxI9PKx+E8WV/95mGcPzraesvMNBg5utQNvcqgNg== + dependencies: + "@ember/edition-utils" "^1.2.0" + babel-plugin-htmlbars-inline-precompile "^3.2.0" + broccoli-debug "^0.6.5" + broccoli-persistent-filter "^2.3.1" + broccoli-plugin "^3.1.0" + common-tags "^1.8.0" + ember-cli-babel-plugin-helpers "^1.1.0" + fs-tree-diff "^2.0.1" + hash-for-dep "^1.5.1" + heimdalljs-logger "^0.1.10" + json-stable-stringify "^1.0.1" + semver "^6.3.0" + strip-bom "^4.0.0" + walk-sync "^2.0.2" + ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.1.2, ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.3.1.tgz#61793964fc2599ce750db9e972ab55c6dd177c48" @@ -7218,6 +7253,15 @@ ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-co ember-cli-version-checker "^2.1.1" semver "^5.4.1" +ember-composability-tools@^0.0.12: + version "0.0.12" + resolved "https://registry.yarnpkg.com/ember-composability-tools/-/ember-composability-tools-0.0.12.tgz#ac7954d4220468af2f431fefd8141d999daa1110" + integrity sha512-twb7I60OSSzHyJnCcl9OFw8OwfHvscHSQrgTFa4u6YNftKgNqXqc/Ejez1HqbG6I/CwGAcCrXquvTNDVSZdxvA== + dependencies: + ember-cli-babel "^7.8.0" + ember-cli-htmlbars "^3.1.0" + ember-in-element-polyfill "^0.2.0" + ember-composable-helpers@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-4.3.0.tgz#afe03e14e20639652bed86b84d91633ede2cb129" @@ -7306,6 +7350,15 @@ ember-debug-handlers-polyfill@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ember-debug-handlers-polyfill/-/ember-debug-handlers-polyfill-1.1.1.tgz#e9ae0a720271a834221179202367421b580002ef" +ember-decorators-polyfill@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ember-decorators-polyfill/-/ember-decorators-polyfill-1.1.5.tgz#49203c302ea4486618ba4866923ec657cf2c9f3d" + integrity sha512-O154i8sLoVjsiKzSqxGRfHGr+N+drT6mRrLDbNgJCnW/V5uLg/ppZFpUsrdxuXnp5Q9us3OfXV1nX2CH+7bUpA== + dependencies: + ember-cli-babel "^7.1.2" + ember-cli-version-checker "^3.1.3" + ember-compatibility-helpers "^1.2.0" + ember-decorators@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/ember-decorators/-/ember-decorators-6.1.1.tgz#6d770f8999cf5a413a1ee459afd520838c0fc470" @@ -7377,6 +7430,15 @@ ember-fetch@8.0.2, "ember-fetch@^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0": node-fetch "^2.6.0" whatwg-fetch "^3.4.0" +ember-fn-helper-polyfill@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ember-fn-helper-polyfill/-/ember-fn-helper-polyfill-1.0.2.tgz#deb035fced77f98b9256ba4eb17694b7a2e2a526" + integrity sha512-T/YG1Do59xvyMCUItqvY61ZJfSLiUsUuykG8C4o9ffrwDuspbquL3eJdLi+NF1dNoihwcIdJHcxLKvwvQB05LQ== + dependencies: + calculate-cache-key-for-tree "^2.0.0" + ember-cli-babel "^7.7.3" + ember-cli-version-checker "^3.1.3" + ember-fullcalendar@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/ember-fullcalendar/-/ember-fullcalendar-1.8.0.tgz#264da8513da5d0db355dcad713111c72d50cc0b9" @@ -7419,6 +7481,16 @@ ember-href-to@4.1.0: dependencies: ember-cli-babel "^7.13.2" +ember-in-element-polyfill@^0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-0.2.2.tgz#d1e7c9cdea7903b668bc4622c106add8d9558df7" + integrity sha512-aWFWTpDU+6mHqQd3Gr0UyrwMXGiGuLBJXYczExNGJsc2zUv/9rDot9HIpMr0sgXtWddzM0Z9Ly1H0sbYZ1ExCA== + dependencies: + debug "^3.1.0" + ember-cli-babel "^7.13.0" + ember-cli-htmlbars "^4.2.0" + ember-cli-version-checker "^2.1.0" + ember-in-element-polyfill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-1.0.0.tgz#10365af6fe31bc59e71ec463ed209d4ba4caecda" @@ -7481,6 +7553,33 @@ ember-l10n@^4.3.1: inquirer "^7.0.4" shelljs "^0.8.2" +ember-leaflet@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ember-leaflet/-/ember-leaflet-4.1.1.tgz#8012a2b36a930afafe141a4aa19ebcfe34e1b98b" + integrity sha512-W0RPVmSPh8+NYPRlTzHh+msxlM9wQqBVIfo0226AkaT6qEzyWyxmGeIybJ5i+oQhA+4rEjEuIFlgnfixWMPvuw== + dependencies: + broccoli-funnel "^3.0.3" + broccoli-merge-trees "^4.2.0" + ember-cli-babel "^7.21.0" + ember-cli-htmlbars "^5.2.0" + ember-composability-tools "^0.0.12" + ember-decorators-polyfill "^1.1.5" + ember-fn-helper-polyfill "^1.0.2" + ember-get-config "^0.2.4" + ember-in-element-polyfill "^1.0.0" + ember-invoke-action "^1.5.1" + ember-let-polyfill "^0.1.0" + fastboot-transform "^0.1.3" + resolve "^1.17.0" + +ember-let-polyfill@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ember-let-polyfill/-/ember-let-polyfill-0.1.0.tgz#9d37c610441eb41eaaea3a6782bbd4203f5cf0a9" + integrity sha512-olLHpS7JnqZcfyYRXcdLATYwDIopKA+ZzI8xswzCIcBYoRgoUJY7E/eW84Unu8ea1jtr/Unx+dQrsU+NrNSoBg== + dependencies: + ember-cli-babel "^6.16.0" + ember-cli-version-checker "^2.1.2" + ember-link-action@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ember-link-action/-/ember-link-action-2.0.0.tgz#5955ca92dc5515c05023d3bd13876637f2593d02" @@ -11125,6 +11224,11 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" +leaflet@0.7: + version "0.7.7" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-0.7.7.tgz#1e352ba54e63d076451fa363c900890cb2cf75ee" + integrity sha1-HjUrpU5j0HZFH6NjyQCJDLLPde4= + leek@0.0.24: version "0.0.24" resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda" From ec327cbdffaba904ef9cfad82305c2e1608362b9 Mon Sep 17 00:00:00 2001 From: sundaram Date: Sat, 31 Oct 2020 15:32:32 +0530 Subject: [PATCH 2/8] updating as per required --- app/components/public/event-map.js | 2 +- app/templates/components/public/event-map.hbs | 37 ++++++++++++++----- app/templates/public/index.hbs | 4 +- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/app/components/public/event-map.js b/app/components/public/event-map.js index c81e74e9ad1..463c44a45ac 100644 --- a/app/components/public/event-map.js +++ b/app/components/public/event-map.js @@ -11,7 +11,7 @@ export default class EventMap extends Component { @tracked lng = this.event.longitude; - + @tracked zoom = 4; diff --git a/app/templates/components/public/event-map.hbs b/app/templates/components/public/event-map.hbs index c2850b683eb..0977e8fe8d0 100644 --- a/app/templates/components/public/event-map.hbs +++ b/app/templates/components/public/event-map.hbs @@ -1,18 +1,37 @@ {{#if this.event.isMapShown}}

{{t 'Getting Here'}}

- - - - -

{{this.event.name}}

- {{this.event.locationName}} - - - + {{#if (and this.lat this.lng)}} + + + + +

{{this.event.name}}

+ {{this.event.locationName}} + + + + {{else}} + {{#if (eq this.mapConfig.display 'embed') }} + + {{else}} + + {{#g-map-address-marker context address=this.event.locationName as |markerContext|}} + {{#g-map-infowindow markerContext}} + {{this.event.locationName}} + {{/g-map-infowindow}} + {{/g-map-address-marker}} + + {{/if}} + {{/if}}
{{/if}}

{{t 'Address'}}

{{this.event.locationName}}

+ +
+

{{t 'Address'}}

+

{{this.event.locationName}}

+
diff --git a/app/templates/public/index.hbs b/app/templates/public/index.hbs index d057b7e6e8b..cfa8f83e63d 100644 --- a/app/templates/public/index.hbs +++ b/app/templates/public/index.hbs @@ -66,7 +66,9 @@ {{/if}}
{{#if this.model.event.locationName}} - + {{/if}} {{#if this.model.event.online}}

{{t 'Online Event'}}

From bb2d856ae18f17df26eb8cdcf415a31ce47a86c9 Mon Sep 17 00:00:00 2001 From: sundaram Date: Sat, 31 Oct 2020 23:13:47 +0530 Subject: [PATCH 3/8] fix --- app/components/public/event-map.js | 5 ----- app/templates/components/public/event-map.hbs | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/app/components/public/event-map.js b/app/components/public/event-map.js index 463c44a45ac..c75dad007f9 100644 --- a/app/components/public/event-map.js +++ b/app/components/public/event-map.js @@ -6,13 +6,8 @@ import { tracked } from '@glimmer/tracking'; @classic @classNames('ui', 'stackable', 'grid') export default class EventMap extends Component { - @tracked lat = this.event.latitude; - - @tracked lng = this.event.longitude; - - @tracked zoom = 4; @tracked diff --git a/app/templates/components/public/event-map.hbs b/app/templates/components/public/event-map.hbs index 0977e8fe8d0..096c87bb370 100644 --- a/app/templates/components/public/event-map.hbs +++ b/app/templates/components/public/event-map.hbs @@ -14,14 +14,6 @@ {{else}} {{#if (eq this.mapConfig.display 'embed') }} - {{else}} - - {{#g-map-address-marker context address=this.event.locationName as |markerContext|}} - {{#g-map-infowindow markerContext}} - {{this.event.locationName}} - {{/g-map-infowindow}} - {{/g-map-address-marker}} - {{/if}} {{/if}}
@@ -30,8 +22,3 @@

{{t 'Address'}}

{{this.event.locationName}}

- -
-

{{t 'Address'}}

-

{{this.event.locationName}}

-
From 9a0b736bde0482e21ee38fe92f9167a63e2eaab0 Mon Sep 17 00:00:00 2001 From: sundaram Date: Wed, 4 Nov 2020 16:11:11 +0530 Subject: [PATCH 4/8] finalizing pr --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eda53f89ae2..7f1f0b41140 100644 --- a/package.json +++ b/package.json @@ -109,6 +109,7 @@ "ember-href-to": "4.1.0", "ember-infinity": "^2.1.2", "ember-l10n": "^4.3.1", + "ember-leaflet": "^4.1.1", "ember-link-action": "2.0.0", "ember-load-initializers": "^2.1.1", "ember-math-helpers": "^2.15.0", @@ -166,7 +167,6 @@ }, "private": true, "dependencies": { - "ember-leaflet": "^4.1.1", "ua-parser-js": "^0.7.22" }, "ember": { From 48647d586e1448ee9ced4d873fbfe76623ac818c Mon Sep 17 00:00:00 2001 From: iamareebjamal Date: Sat, 7 Nov 2020 06:32:57 +0530 Subject: [PATCH 5/8] fix --- app/components/public/event-map.js | 15 ------- app/templates/components/public/event-map.hbs | 42 +++++++++---------- app/templates/public/index.hbs | 2 +- 3 files changed, 22 insertions(+), 37 deletions(-) delete mode 100644 app/components/public/event-map.js diff --git a/app/components/public/event-map.js b/app/components/public/event-map.js deleted file mode 100644 index c75dad007f9..00000000000 --- a/app/components/public/event-map.js +++ /dev/null @@ -1,15 +0,0 @@ -import classic from 'ember-classic-decorator'; -import { classNames } from '@ember-decorators/component'; -import Component from '@ember/component'; -import { tracked } from '@glimmer/tracking'; - -@classic -@classNames('ui', 'stackable', 'grid') -export default class EventMap extends Component { - lat = this.event.latitude; - lng = this.event.longitude; - zoom = 4; - - @tracked - emberConfLocation = [this.event.latitude, this.event.longitude]; -} diff --git a/app/templates/components/public/event-map.hbs b/app/templates/components/public/event-map.hbs index 096c87bb370..09a7cb6dc6b 100644 --- a/app/templates/components/public/event-map.hbs +++ b/app/templates/components/public/event-map.hbs @@ -1,24 +1,24 @@ -{{#if this.event.isMapShown}} -
-

{{t 'Getting Here'}}

- {{#if (and this.lat this.lng)}} - - - - -

{{this.event.name}}

- {{this.event.locationName}} - - - - {{else}} - {{#if (eq this.mapConfig.display 'embed') }} - +
+ {{#if @event.isMapShown}} +
+

{{t 'Getting Here'}}

+ {{#if (and @event.latitude @event.longitude)}} + + + + +

{{@event.name}}

+ {{@event.locationName}} + + + + {{else}} + {{/if}} - {{/if}} +
+ {{/if}} +
+

{{t 'Address'}}

+

{{@event.locationName}}

-{{/if}} -
-

{{t 'Address'}}

-

{{this.event.locationName}}

diff --git a/app/templates/public/index.hbs b/app/templates/public/index.hbs index cfa8f83e63d..bd587bb71bf 100644 --- a/app/templates/public/index.hbs +++ b/app/templates/public/index.hbs @@ -67,7 +67,7 @@
{{#if this.model.event.locationName}} {{/if}} {{#if this.model.event.online}} From 71ad234b76990c3025d96a1e8ac5b024f43fcb29 Mon Sep 17 00:00:00 2001 From: iamareebjamal Date: Sat, 7 Nov 2020 06:34:55 +0530 Subject: [PATCH 6/8] fix --- ember-cli-build.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ember-cli-build.js b/ember-cli-build.js index e451aa444ed..56aea700abc 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -45,8 +45,16 @@ module.exports = function(defaults) { fingerprint: { enabled : env === 'production', generateAssetMap : true, - exclude : ['package.json', 'assets/moment-locales'], - extensions : ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg', 'json'] + exclude : [ + 'package.json', + 'assets/moment-locales', + 'images/layers-2x.png', + 'images/layers.png', + 'images/marker-icon-2x.png', + 'images/marker-icon.png', + 'images/marker-shadow.png' + ], + extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg', 'json'] }, sourcemaps: { enabled: true From 9d3fb9a4d2d3c07bd2cb76fa6ac2d78e69dea2a4 Mon Sep 17 00:00:00 2001 From: iamareebjamal Date: Sat, 7 Nov 2020 06:47:30 +0530 Subject: [PATCH 7/8] fix --- package.json | 2 +- yarn.lock | 62 +++++++++++++--------------------------------------- 2 files changed, 16 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 131bf9ef28f..32d42cfe877 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "fastboot-app-server": "^3.0.0", "google-material-color": "^1.3.1", "http-status": "^1.4.2", - "leaflet": "0.7", + "leaflet": "^1.6.0", "loader.js": "^4.7.0", "lodash-es": "^4.17.15", "mini-css-extract-plugin": "^1.2.1", diff --git a/yarn.lock b/yarn.lock index 485f6811fbf..90ca75d3d70 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6360,7 +6360,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879" integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw== -ember-cli-babel@7.23.0, ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: +ember-cli-babel@7.23.0, ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3, ember-cli-babel@^7.8.0: version "7.23.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.23.0.tgz#ec580aa2c115d0810e454dd5c2fffce238284b92" integrity sha512-ix58DlRDAbGITtdJoRUPcAoQwKLYr/x/kIXjU9u1ATyhmuUjqb+0FDXghOWbkNihGiNOqBBR49+LBgK9AeBcNw== @@ -6420,37 +6420,6 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.10.0, ember-cli-version-checker "^2.1.2" semver "^5.5.0" -ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3, ember-cli-babel@^7.8.0: - version "7.23.0" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.23.0.tgz#ec580aa2c115d0810e454dd5c2fffce238284b92" - integrity sha512-ix58DlRDAbGITtdJoRUPcAoQwKLYr/x/kIXjU9u1ATyhmuUjqb+0FDXghOWbkNihGiNOqBBR49+LBgK9AeBcNw== - dependencies: - "@babel/core" "^7.12.0" - "@babel/helper-compilation-targets" "^7.12.0" - "@babel/plugin-proposal-class-properties" "^7.10.4" - "@babel/plugin-proposal-decorators" "^7.10.5" - "@babel/plugin-transform-modules-amd" "^7.10.5" - "@babel/plugin-transform-runtime" "^7.12.0" - "@babel/plugin-transform-typescript" "^7.12.0" - "@babel/polyfill" "^7.11.5" - "@babel/preset-env" "^7.12.0" - "@babel/runtime" "^7.12.0" - amd-name-resolver "^1.2.1" - babel-plugin-debug-macros "^0.3.3" - babel-plugin-ember-data-packages-polyfill "^0.1.2" - babel-plugin-ember-modules-api-polyfill "^3.2.0" - babel-plugin-module-resolver "^3.1.1" - broccoli-babel-transpiler "^7.8.0" - broccoli-debug "^0.6.4" - broccoli-funnel "^2.0.1" - broccoli-source "^1.1.0" - clone "^2.1.2" - ember-cli-babel-plugin-helpers "^1.1.1" - ember-cli-version-checker "^4.1.0" - ensure-posix-path "^1.0.2" - fixturify-project "^1.10.0" - rimraf "^3.0.1" - semver "^5.5.0" ember-cli-babel@~7.11.0: version "7.11.1" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.11.1.tgz#77bc8f4001d47b91d80e3d36a4754412616fc0d8" @@ -6758,13 +6727,13 @@ ember-cli-htmlbars@^3.1.0: json-stable-stringify "^1.0.1" strip-bom "^3.0.0" -ember-cli-htmlbars@^4.2.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.4.0.tgz#7ca17d5ca8f7550984346d9e6e93da0c3323f8d9" - integrity sha512-ohgctqk7dXIZR4TgN0xRoUYltWhghFJgqmtuswQTpZ7p74RxI9PKx+E8WV/95mGcPzraesvMNBg5utQNvcqgNg== +ember-cli-htmlbars@^4.0.0, ember-cli-htmlbars@^4.2.2, ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.3.1.tgz#4af8adc21ab3c4953f768956b7f7d207782cb175" + integrity sha512-CW6AY/yzjeVqoRtItOKj3hcYzc5dWPRETmeCzr2Iqjt5vxiVtpl0z5VTqHqIlT5fsFx6sGWBQXNHIe+ivYsxXQ== dependencies: "@ember/edition-utils" "^1.2.0" - babel-plugin-htmlbars-inline-precompile "^3.2.0" + babel-plugin-htmlbars-inline-precompile "^3.0.1" broccoli-debug "^0.6.5" broccoli-persistent-filter "^2.3.1" broccoli-plugin "^3.1.0" @@ -6777,14 +6746,14 @@ ember-cli-htmlbars@^4.2.0: semver "^6.3.0" strip-bom "^4.0.0" walk-sync "^2.0.2" -ember-cli-htmlbars@^4.0.0, ember-cli-htmlbars@^4.2.2, ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.3.1.tgz#4af8adc21ab3c4953f768956b7f7d207782cb175" - integrity sha512-CW6AY/yzjeVqoRtItOKj3hcYzc5dWPRETmeCzr2Iqjt5vxiVtpl0z5VTqHqIlT5fsFx6sGWBQXNHIe+ivYsxXQ== +ember-cli-htmlbars@^4.2.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.4.0.tgz#7ca17d5ca8f7550984346d9e6e93da0c3323f8d9" + integrity sha512-ohgctqk7dXIZR4TgN0xRoUYltWhghFJgqmtuswQTpZ7p74RxI9PKx+E8WV/95mGcPzraesvMNBg5utQNvcqgNg== dependencies: "@ember/edition-utils" "^1.2.0" - babel-plugin-htmlbars-inline-precompile "^3.0.1" + babel-plugin-htmlbars-inline-precompile "^3.2.0" broccoli-debug "^0.6.5" broccoli-persistent-filter "^2.3.1" broccoli-plugin "^3.1.0" @@ -7582,7 +7551,6 @@ ember-link-action@2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/ember-link-action/-/ember-link-action-2.0.2.tgz#4a5fdf0f49cb2b5061625b126b4329519c601938" integrity sha512-xxKv8X2lTl3hlP9ajbRinawUAxUGRwgnvThRwXJhBXqzxYhBDezhFZl3LXLi3wfPzQsdCrXPKPCpzl6dsi2DyQ== - dependencies: ember-cli-babel "7.23.0" ember-cli-htmlbars "5.3.1" @@ -11233,10 +11201,10 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -leaflet@0.7: - version "0.7.7" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-0.7.7.tgz#1e352ba54e63d076451fa363c900890cb2cf75ee" - integrity sha1-HjUrpU5j0HZFH6NjyQCJDLLPde4= +leaflet@^1.6.0: + version "1.7.1" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19" + integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw== leek@0.0.24: version "0.0.24" From 57df6de519e424ae6924a4ef5c8a2d6c0b9d58cc Mon Sep 17 00:00:00 2001 From: iamareebjamal Date: Sat, 7 Nov 2020 06:55:11 +0530 Subject: [PATCH 8/8] fix --- package.json | 6 +- yarn.lock | 167 ++++++++++++++++++++++++--------------------------- 2 files changed, 82 insertions(+), 91 deletions(-) diff --git a/package.json b/package.json index 32d42cfe877..69fd68119a4 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "ember-l10n": "^4.3.1", "ember-leaflet": "^4.1.1", "ember-link-action": "2.0.2", - "ember-load-initializers": "^2.1.1", + "ember-load-initializers": "^2.1.2", "ember-math-helpers": "^2.15.0", "ember-maybe-import-regenerator": "^0.1.6", "ember-metrics": "^0.17.0", @@ -143,7 +143,7 @@ "leaflet": "^1.6.0", "loader.js": "^4.7.0", "lodash-es": "^4.17.15", - "mini-css-extract-plugin": "^1.2.1", + "mini-css-extract-plugin": "^1.3.0", "moment-timezone": "^0.5.31", "npm-run-all": "^4.1.5", "object-to-formdata": "^4.1.0", @@ -160,7 +160,7 @@ "torii": "^0.10.1", "typescript": "^4.0.5", "url-parse": "^1.4.7", - "webpack-bundle-analyzer": "^3.9.0", + "webpack-bundle-analyzer": "^4.1.0", "wysihtml": "^0.5.5", "xgettext-template": "^4.1.0" }, diff --git a/yarn.lock b/yarn.lock index 90ca75d3d70..e6c3f8ab57d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2529,6 +2529,11 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e" integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== +acorn-walk@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.0.tgz#56ae4c0f434a45fff4a125e7ea95fa9c98f67a16" + integrity sha512-oZRad/3SMOI/pxbbmqyurIx7jHw1wZDcR9G44L8pUVFEomX/0dH89SrM1KaDXuv1NpzAXz6Op/Xu/Qd5XXzdEA== + acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" @@ -2539,12 +2544,7 @@ acorn@^5.0.0, acorn@^5.2.1, acorn@^5.5.0, acorn@^5.5.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== -acorn@^6.0.1, acorn@^6.0.2, acorn@^6.1.1: - version "6.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" - integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== - -acorn@^6.4.1: +acorn@^6.0.1, acorn@^6.0.2, acorn@^6.1.1, acorn@^6.4.1: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== @@ -2554,6 +2554,11 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== +acorn@^8.0.4: + version "8.0.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.4.tgz#7a3ae4191466a6984eee0fe3407a4f3aa9db8354" + integrity sha512-XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ== + after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" @@ -2936,6 +2941,11 @@ async-promise-queue@^1.0.3, async-promise-queue@^1.0.4, async-promise-queue@^1.0 async "^2.4.1" debug "^2.6.8" +async@0.9.x: + version "0.9.2" + resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" + integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= + async@^2.4.1, async@^2.6.2, async@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" @@ -3807,16 +3817,6 @@ better-assert@~1.0.0: dependencies: callsite "1.0.0" -bfj@^6.1.1: - version "6.1.2" - resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f" - integrity sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw== - dependencies: - bluebird "^3.5.5" - check-types "^8.0.3" - hoopy "^0.1.4" - tryer "^1.0.1" - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -5028,11 +5028,6 @@ charm@^1.0.0: dependencies: inherits "^2.0.1" -check-types@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" - integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ== - cheerio@^0.19.0: version "0.19.0" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.19.0.tgz#772e7015f2ee29965096d71ea4175b75ab354925" @@ -5359,7 +5354,7 @@ commander@2.8.x: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.5.0, commander@^2.6.0, commander@^2.8.1, commander@~2.20.0: +commander@^2.19.0, commander@^2.20.0, commander@^2.5.0, commander@^2.6.0, commander@^2.8.1, commander@~2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -5369,10 +5364,10 @@ commander@^4.0.0, commander@^4.1.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc" - integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA== +commander@^6.1.0, commander@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75" + integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q== commander@~2.17.1: version "2.17.1" @@ -6199,10 +6194,12 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -ejs@^2.6.1: - version "2.7.4" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" - integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== +ejs@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b" + integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w== + dependencies: + jake "^10.6.1" electron-to-chromium@^1.3.413, electron-to-chromium@^1.3.47: version "1.3.418" @@ -7555,12 +7552,12 @@ ember-link-action@2.0.2: ember-cli-babel "7.23.0" ember-cli-htmlbars "5.3.1" -ember-load-initializers@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.1.tgz#d1a8bead00bc44222b0ab181840869992beb30f5" - integrity sha512-Ho5sBeaZPN3HmZkYkcLrjSBF3DTNmzC5h0DizzDj8cjpnCvaqeofphJDnH41k6kLv/QHMk4pMRISPcwc+bOceQ== +ember-load-initializers@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.2.tgz#8a47a656c1f64f9b10cecdb4e22a9d52ad9c7efa" + integrity sha512-CYR+U/wRxLbrfYN3dh+0Tb6mFaxJKfdyz+wNql6cqTrA0BBi9k6J3AaKXj273TqvEpyyXegQFFkZEiuZdYtgJw== dependencies: - ember-cli-babel "^7.11.0" + ember-cli-babel "^7.13.0" ember-cli-typescript "^2.0.2" ember-macro-helpers@^4.2.2: @@ -8677,7 +8674,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -express@^4.10.7, express@^4.16.3, express@^4.17.1: +express@^4.10.7, express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== @@ -8980,15 +8977,17 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== +filelist@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb" + integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ== + dependencies: + minimatch "^3.0.4" + filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" -filesize@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" - integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== - filesize@^4.1.2: version "4.2.1" resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.2.1.tgz#ab1cb2069db5d415911c1a13e144c0e743bc89bc" @@ -9867,7 +9866,7 @@ growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" -gzip-size@^5.0.0: +gzip-size@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== @@ -10119,11 +10118,6 @@ homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" -hoopy@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" - integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== - hosted-git-info@^2.1.4: version "2.8.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" @@ -10935,6 +10929,16 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" +jake@^10.6.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" + integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + dependencies: + async "0.9.x" + chalk "^2.4.2" + filelist "^1.0.1" + minimatch "^3.0.4" + jquery-deferred@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/jquery-deferred/-/jquery-deferred-0.3.1.tgz#596eca1caaff54f61b110962b23cafea74c35355" @@ -11723,7 +11727,7 @@ lodash@^3.10.0, lodash@^3.2.0, lodash@^3.9.3: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.10: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -12167,10 +12171,10 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -mini-css-extract-plugin@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.2.1.tgz#30ea7dee632b3002b0c77aeed447790408cb247e" - integrity sha512-G3yw7/TQaPfkuiR73MDcyiqhyP8SnbmLhUbpC76H+wtQxA6wfKhMCQOCb6wnPK0dQbjORAeOILQqEesg4/wF7A== +mini-css-extract-plugin@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.0.tgz#bbcba978b68c39f0a9c75822cfb2874f9cf6b018" + integrity sha512-4DKmPwFd0XKlwoqvrkLi2X8Mlosh2ey/E/OVAucnPUdzGqrSWHgSqed/p4Ue2Q39JjIvcdSDgmZDO6mir5Ovmw== dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0" @@ -12839,10 +12843,10 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -opener@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" - integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA== +opener@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" + integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== optionator@^0.8.1: version "0.8.2" @@ -15971,11 +15975,6 @@ try-resolve@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/try-resolve/-/try-resolve-1.0.1.tgz#cfde6fabd72d63e5797cfaab873abbe8e700e912" -tryer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" - integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== - tryor@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b" @@ -16477,33 +16476,25 @@ webidl-conversions@^6.1.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== -webpack-bundle-analyzer@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz#f6f94db108fb574e415ad313de41a2707d33ef3c" - integrity sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA== - dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" - bfj "^6.1.1" - chalk "^2.4.1" - commander "^2.18.0" - ejs "^2.6.1" - express "^4.16.3" - filesize "^3.6.1" - gzip-size "^5.0.0" - lodash "^4.17.19" - mkdirp "^0.5.1" - opener "^1.5.1" - ws "^6.0.0" - -webpack-sources@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85" +webpack-bundle-analyzer@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.1.0.tgz#31f9e5e187ee32fae2392b21806582cc6fe74cf9" + integrity sha512-R3oQaPn7KGJGqnOyuAbdNlH4Nm+w+gvoXQZWqYjgaMnR+vY4Ga8VD5ntfkKa00GarO7LQfOlePvtGvr254Z4Ag== dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" + acorn "^8.0.4" + acorn-walk "^8.0.0" + chalk "^4.1.0" + commander "^6.2.0" + ejs "^3.1.5" + express "^4.17.1" + filesize "^6.1.0" + gzip-size "^5.1.1" + lodash "^4.17.20" + mkdirp "^1.0.4" + opener "^1.5.2" + ws "^7.3.1" -webpack-sources@^1.4.0, webpack-sources@^1.4.1: +webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -16740,14 +16731,14 @@ write@^0.2.1: dependencies: mkdirp "^0.5.1" -ws@^6.0.0, ws@^6.1.0: +ws@^6.1.0: version "6.2.1" resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== dependencies: async-limiter "~1.0.0" -ws@^7.2.3: +ws@^7.2.3, ws@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8" integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==