From 56a3d654c6ba23b7397b02aba651d60bce5e12ff Mon Sep 17 00:00:00 2001 From: tamaina Date: Mon, 22 Nov 2021 19:17:28 +0900 Subject: [PATCH] :v: --- packages/sw/src/{ => scripts}/create-notification.ts | 6 +++--- packages/sw/src/{ => scripts}/lang.ts | 0 packages/sw/src/{ => scripts}/notification-read.ts | 4 ++-- packages/sw/src/{ => scripts}/operations.ts | 2 +- packages/sw/src/{ => scripts}/types.ts | 0 packages/sw/src/sw.ts | 10 +++++----- packages/sw/tsconfig.json | 3 +-- packages/sw/webpack.config.js | 1 + 8 files changed, 13 insertions(+), 13 deletions(-) rename packages/sw/src/{ => scripts}/create-notification.ts (97%) rename packages/sw/src/{ => scripts}/lang.ts (100%) rename packages/sw/src/{ => scripts}/notification-read.ts (92%) rename packages/sw/src/{ => scripts}/operations.ts (97%) rename packages/sw/src/{ => scripts}/types.ts (100%) diff --git a/packages/sw/src/create-notification.ts b/packages/sw/src/scripts/create-notification.ts similarity index 97% rename from packages/sw/src/create-notification.ts rename to packages/sw/src/scripts/create-notification.ts index 70a112da61..c95d847cb1 100644 --- a/packages/sw/src/create-notification.ts +++ b/packages/sw/src/scripts/create-notification.ts @@ -3,9 +3,9 @@ */ declare var self: ServiceWorkerGlobalScope; -import { swLang } from '@/lang'; -import { cli } from '@/operations'; -import { pushNotificationDataMap } from '@/types'; +import { swLang } from '@/scripts/lang'; +import { cli } from '@/scripts/operations'; +import { pushNotificationDataMap } from '@/scripts/types'; import { getNoteSummary } from '@/scripts/get-note-summary'; import getUserName from '@/scripts/get-user-name'; import { I18n } from '@/scripts/i18n'; diff --git a/packages/sw/src/lang.ts b/packages/sw/src/scripts/lang.ts similarity index 100% rename from packages/sw/src/lang.ts rename to packages/sw/src/scripts/lang.ts diff --git a/packages/sw/src/notification-read.ts b/packages/sw/src/scripts/notification-read.ts similarity index 92% rename from packages/sw/src/notification-read.ts rename to packages/sw/src/scripts/notification-read.ts index bc7b64e8ed..f5f42875ad 100644 --- a/packages/sw/src/notification-read.ts +++ b/packages/sw/src/scripts/notification-read.ts @@ -1,8 +1,8 @@ declare var self: ServiceWorkerGlobalScope; import { get } from 'idb-keyval'; -import { pushNotificationDataMap } from '@/types'; -import { api } from '@/operations'; +import { pushNotificationDataMap } from '@/scripts/types'; +import { api } from '@/scripts/operations'; type Accounts = { [x: string]: { diff --git a/packages/sw/src/operations.ts b/packages/sw/src/scripts/operations.ts similarity index 97% rename from packages/sw/src/operations.ts rename to packages/sw/src/scripts/operations.ts index 02cf0d96cf..f297a05a8a 100644 --- a/packages/sw/src/operations.ts +++ b/packages/sw/src/scripts/operations.ts @@ -5,7 +5,7 @@ declare var self: ServiceWorkerGlobalScope; import * as Misskey from 'misskey-js'; -import { SwMessage, swMessageOrderType } from '@/types'; +import { SwMessage, swMessageOrderType } from '@/scripts/types'; import { acct as getAcct } from '@/filters/user'; import { getAccountFromId } from '@/scripts/get-account-from-id'; import { getUrlWithLoginId } from '@/scripts/login-id'; diff --git a/packages/sw/src/types.ts b/packages/sw/src/scripts/types.ts similarity index 100% rename from packages/sw/src/types.ts rename to packages/sw/src/scripts/types.ts diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts index 513be9c84e..0a489e6263 100644 --- a/packages/sw/src/sw.ts +++ b/packages/sw/src/sw.ts @@ -3,11 +3,11 @@ */ declare var self: ServiceWorkerGlobalScope; -import { createEmptyNotification, createNotification } from '@/create-notification'; -import { swLang } from '@/lang'; -import { swNotificationRead } from '@/notification-read'; -import { pushNotificationDataMap } from '@/types'; -import * as swos from '@/operations'; +import { createEmptyNotification, createNotification } from '@/scripts/create-notification'; +import { swLang } from '@/scripts/lang'; +import { swNotificationRead } from '@/scripts/notification-read'; +import { pushNotificationDataMap } from '@/scripts/types'; +import * as swos from '@/scripts/operations'; import { acct as getAcct } from '@/filters/user'; //#region Lifecycle: Install diff --git a/packages/sw/tsconfig.json b/packages/sw/tsconfig.json index 089cd08b5e..47045ec050 100644 --- a/packages/sw/tsconfig.json +++ b/packages/sw/tsconfig.json @@ -33,7 +33,6 @@ }, "compileOnSave": false, "include": [ - "./**/*.ts", - "./**/*.vue" + "./**/*.ts" ] } diff --git a/packages/sw/webpack.config.js b/packages/sw/webpack.config.js index 8b9910f1e0..c7f6fb246f 100644 --- a/packages/sw/webpack.config.js +++ b/packages/sw/webpack.config.js @@ -34,6 +34,7 @@ const postcss = { }; module.exports = { + target: 'webworker', entry: { sw: './src/sw.ts' },