From 9051aa91ea33733924b58771a6b57206b19bcd74 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 13 Nov 2020 13:34:17 +0100 Subject: [PATCH] minor: migrate to skypack --- src/components/hubl-reactivity.js | 6 +++--- src/components/hubl-search-users.js | 2 +- src/components/hubl-status.js | 6 +++--- src/dependencies.pug | 33 +++++++++++++++++------------ src/sw.js | 1 + 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/components/hubl-reactivity.js b/src/components/hubl-reactivity.js index 443a517..a60045c 100644 --- a/src/components/hubl-reactivity.js +++ b/src/components/hubl-reactivity.js @@ -1,6 +1,6 @@ -import { store } from 'https://unpkg.com/@startinblox/core@0.12'; -import { Sib } from "https://unpkg.com/@startinblox/core@0.12/dist/libs/Sib.js"; -import { StoreMixin } from "https://unpkg.com/@startinblox/core@0.12/dist/mixins/storeMixin.js"; +import { store } from 'https://cdn.skypack.dev/@startinblox/core@0.13'; +import { Sib } from "https://cdn.skypack.dev/@startinblox/core@0.13/dist/libs/Sib.js"; +import { StoreMixin } from "https://cdn.skypack.dev/@startinblox/core@0.13/dist/mixins/storeMixin.js"; export const HublReactivity = { name: 'hubl-reactivity', diff --git a/src/components/hubl-search-users.js b/src/components/hubl-search-users.js index b640f3b..6f4cb11 100644 --- a/src/components/hubl-search-users.js +++ b/src/components/hubl-search-users.js @@ -1,4 +1,4 @@ -import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.12/dist/widgets/widget-factory.js'; +import { widgetFactory } from 'https://cdn.skypack.dev/@startinblox/core@0.13/dist/widgets/widget-factory.js'; const HublSearchUsers = widgetFactory( 'hubl-search-users', diff --git a/src/components/hubl-status.js b/src/components/hubl-status.js index 76372c0..8549995 100644 --- a/src/components/hubl-status.js +++ b/src/components/hubl-status.js @@ -1,6 +1,6 @@ -import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.12/dist/widgets/widget-factory.js'; -import { importCSS } from 'https://unpkg.com/@startinblox/core@0.12/dist/libs/helpers.js'; -import SlimSelect from 'https://dev.jspm.io/slim-select@1.23'; +import { widgetFactory } from 'https://cdn.skypack.dev/@startinblox/core@0.13/dist/widgets/widget-factory.js'; +import { importCSS } from 'https://cdn.skypack.dev/@startinblox/core@0.13/dist/libs/helpers.js'; +import SlimSelect from 'https://cdn.skypack.dev/slim-select@1.23'; const HublStatus = widgetFactory( 'hubl-status', diff --git a/src/dependencies.pug b/src/dependencies.pug index fac6741..a6682f5 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -1,49 +1,54 @@ script(src="https://browser.sentry-cdn.com/5.25.0/bundle.tracing.min.js" defer) + script(type="module" src="/components/sentry.js" defer) script(type="module" src="/components/hubl-search-users.js" defer) script(type="module" src="/components/hubl-status.js" defer) script(type="module" src="/components/hubl-reactivity.js" defer) -script(type="module" src="https://unpkg.com/@startinblox/core@0.12" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/core@0.13" defer) //- script(type="module" src="/lib/sib-core/dist/index.js" defer) -script(type="module" src="https://unpkg.com/@startinblox/oidc@0.10" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/oidc@0.11" defer) //- script(type="module" src="/lib/sib-auth/index.js" defer) -script(type="module" src="https://unpkg.com/@startinblox/router@0.10" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/router@0.11" defer) //- script(type="module" src="/lib/sib-router/src/index.js" defer) -script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.7" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.8" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) -if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)) - script(type="module" src="https://unpkg.com/@startinblox/component-event@1.2" defer) +//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13 +//- if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)) +//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.2" defer) //- script(type="module" src="/lib/sib-event-component/sib-event.js" defer) -if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)) - script(type="module" src="https://unpkg.com/@startinblox/component-resource@1.0" defer) +//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13 +//- if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)) +//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.0" defer) //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) - script(type="module" src="https://unpkg.com/@startinblox/component-job-board@1.1" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@1.2" defer) //- script(type="module" src="/lib/solid-job-board/dist/index.js" defer) if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) - script(type="module" src="https://unpkg.com/@startinblox/component-directory@1.1" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@1.2" defer) //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) - script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.5" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@0.5" defer) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) - script(type="module" src="https://unpkg.com/@startinblox/component-chat@1.2" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@1.3" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) -if endpoints.polls || (endpoints.get && endpoints.get.polls) - script(type="module" src="https://unpkg.com/@startinblox/component-poll@1.0" defer) +//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13 +//- if endpoints.polls || (endpoints.get && endpoints.get.polls) + //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.0" defer) //- script(type="module" src="/lib/sib-polls-component/index.js" defer) +//- swal2 does not work with skypack script(src="https://cdn.jsdelivr.net/npm/sweetalert2@10") script(src="/scripts/index.js" defer) diff --git a/src/sw.js b/src/sw.js index 86ec4b2..a3f8d5f 100644 --- a/src/sw.js +++ b/src/sw.js @@ -72,6 +72,7 @@ self.addEventListener('fetch', function (event) { } else { if ( /unpkg/.test(requestURL.origin) || + /skypack/.test(request.origin) || /jspm/.test(requestURL.origin) || /jsdeliver/.test(requestURL.origin) || /cdn/.test(requestURL.origin) ||