From 7e10c1db659c21cd737b5d1e10bf3e61c4e0de94 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 17 Jan 2021 19:01:11 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A8=20cleaned=20up=20build=20proce?= =?UTF-8?q?ss=20+=20Dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #37 --- Dockerfile | 4 +--- package.json | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad0832da..c6e4e19f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,15 +3,13 @@ WORKDIR /app RUN npm i -g pnpm COPY package.json ./ RUN pnpm i -COPY package.json *.config.js workbox-config.js ./ +COPY package.json *.config.js workbox-config.js template-copy.js index.template.html s-config.template.js ./ COPY src ./src COPY public ./public -RUN pnpm run build:sw RUN pnpm run build # final image FROM alpine COPY --from=0 /app/build /app -RUN rm -rf build/sw.js.map build/workbox-*.js.map RUN rm -rf /app/build/_dist_/components RUN rm -rf /app/build/_dist_/locales RUN rm -rf /app/build-manifest.json diff --git a/package.json b/package.json index 632e8285..da750e5e 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,10 @@ "version": "0.3.1", "scripts": { "i18n-order": "node order.js", - "dev:all": "cross-env NODE_ENV_ODIT=production node template-copy.js && snowpack dev", - "dev:fast": "cross-env NODE_ENV_ODIT=development_fast node template-copy.js", - "build": "cross-env NODE_ENV_ODIT=production node template-copy.js && snowpack build", + "dev:all": "yarn prebuild && snowpack dev", + "dev:fast": "cross-env NODE_ENV_ODIT=development_fast node template-copy.js && snowpack dev", + "build": "yarn prebuild && snowpack build", + "prebuild": "cross-env NODE_ENV_ODIT=production node template-copy.js && yarn build:sw", "build:sw": "workbox generateSW workbox-config.js", "release": "release-it", "licenses:export": "license-exporter --json -o public" From a284806d3cb769030a4e28d0403190b746f8fc61 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 17 Jan 2021 19:08:48 +0100 Subject: [PATCH 2/2] =?UTF-8?q?=E2=9A=A1=20re-enable=20PWA=20functionality?= =?UTF-8?q?=20via=20serviceworker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #37 --- src/App.svelte | 6 ++---- src/components/OrgOverview.svelte | 1 - src/components/TeamsOverview.svelte | 1 - workbox-config.js | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/App.svelte b/src/App.svelte index c5548087..e6798d93 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -31,7 +31,6 @@ import Login from "./components/Login.svelte"; import Dashboard from "./components/Dashboard.svelte"; import store from "./store.js"; - import NotFound from "./components/NotFound.svelte"; import ForgotPassword from "./components/ForgotPassword.svelte"; import MainDashContent from "./components/MainDashContent.svelte"; import Users from "./components/Users.svelte"; @@ -41,17 +40,16 @@ import Orgs from "./components/Orgs.svelte"; import Runners from "./components/Runners.svelte"; import Footer from "./components/Footer.svelte"; - import Tracks from "./components/Tracks.svelte"; import TracksOverview from "./components/TracksOverview.svelte"; import OrgDetail from "./components/OrgDetail.svelte"; import Teams from "./components/Teams.svelte"; - import { OpenAPI, AuthService } from "@odit/lfk-client-js"; + import { OpenAPI } from "@odit/lfk-client-js"; import UserDetail from "./components/UserDetail.svelte"; OpenAPI.BASE = config.baseurl; import { register as registerSW } from "./swmodule"; import TeamDetail from "./components/TeamDetail.svelte"; store.init(); - // registerSW(); + registerSW(); diff --git a/src/components/OrgOverview.svelte b/src/components/OrgOverview.svelte index 5b4a7ff3..2006198b 100644 --- a/src/components/OrgOverview.svelte +++ b/src/components/OrgOverview.svelte @@ -3,7 +3,6 @@ let modal_open = false; let delete_org = {}; import { RunnerOrganisationService } from "@odit/lfk-client-js"; - import "gridjs/dist/theme/mermaid.css"; import store from "../store"; import OrgsEmptyState from "./OrgsEmptyState.svelte"; import Toastify from "toastify-js"; diff --git a/src/components/TeamsOverview.svelte b/src/components/TeamsOverview.svelte index eadf531d..da3079df 100644 --- a/src/components/TeamsOverview.svelte +++ b/src/components/TeamsOverview.svelte @@ -3,7 +3,6 @@ import Toastify from "toastify-js"; import { RunnerTeamService } from "@odit/lfk-client-js"; const teams_promise = RunnerTeamService.runnerTeamControllerGetAll(); - import "gridjs/dist/theme/mermaid.css"; import { users as usersstore } from "../store.js"; import store from "../store"; import TeamsEmptyState from "./TeamsEmptyState.svelte"; diff --git a/workbox-config.js b/workbox-config.js index 4ba940cf..368c3575 100644 --- a/workbox-config.js +++ b/workbox-config.js @@ -1,7 +1,7 @@ module.exports = { globDirectory: 'public', - globPatterns: [ '**/*.{js,ico,png,svg,html,webmanifest,txt}' ], - globIgnores: [ 'env.js', 'env.sample.js', 'licenses.json' ], + globPatterns: [ '**/*.{js,ico,png,svg,html,webmanifest,txt,json}' ], + globIgnores: [ 'env.js', 'env.sample.js' ], swDest: 'public/sw.js', cleanupOutdatedCaches: true, mode: 'production',