fix package:dev script

ref #37
Merge commit 'a284806d3cb769030a4e28d0403190b746f8fc61' into dev
2021-01-17 19:22:45 +01:00 · 2021-01-17 19:18:42 +01:00 · 2021-01-17 19:15:22 +01:00 · 2021-01-17 19:14:14 +01:00 · 2021-01-17 19:01:11 +01:00 · 2021-01-17 18:59:26 +01:00
18 changed files with 91 additions and 58 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
-.vscode
-.idea
 node_modules
-dist
-dist-ssr
 public/env.js
-/build
+build
 yarn.lock
 package-lock.json
 *.map
+public/index.html
+svelte.config.js
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -0,0 +1,11 @@
+{
+    "recommendations": [
+        "2gua.rainbow-brackets",
+        "christian-kohler.npm-intellisense",
+        "remimarsal.prettier-now",
+        "svelte.svelte-vscode",
+        "antfu.i18n-ally",
+        "fivethree.vscode-svelte-snippets"
+    ],
+    "unwantedRecommendations": []
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "i18n-ally.localesPaths": "src/locales",
+    "i18n-ally.keystyle": "nested"
+}
--- a/4
+++ b/4
@@ -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
--- a/index.template.html
+++ b/index.template.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <link rel="icon" href="/favicon.png" />
+  <link rel="manifest" href="/manifest.webmanifest">
+  <link rel="apple-touch-icon" href="/lfk-logo.png">
+  <meta name="theme-color" content="#FFFFFF">
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="description" content="Lauf Für Kaya! - Admin" />
+  <title>Lauf für Kaya! - Admin</title>
+  __TAILWIND_INSERT__
+</head>
+
+<body>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.3.1-RELEASE_INFO</span>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <script src="/env.js"></script>
+  <script defer type="module" src="/_dist_/index.js"></script>
+</body>
+
+</html>
--- a/package.json
+++ b/package.json
@@ -3,8 +3,10 @@
 	"version": "0.3.1",
 	"scripts": {
 		"i18n-order": "node order.js",
-		"dev": "snowpack dev",
-		"build": "snowpack build",
+		"dev:all": "yarn prebuild && snowpack dev",
+		"dev": "cross-env NODE_ENV_ODIT=development_fast node template-copy.js && yarn build:sw && 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"
@@ -28,6 +30,7 @@
 		"@snowpack/plugin-svelte": "3.5.1",
 		"auto-changelog": "^2.2.1",
 		"autoprefixer": "10.2.1",
+		"cross-env": "^7.0.3",
 		"postcss": "8.2.4",
 		"postcss-load-config": "3.0.0",
 		"release-it": "^14.2.2",
--- a/public/index.html
+++ b/public/index.html
@@ -1,22 +1 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8" />
-  <link rel="icon" href="/favicon.png" />
-  <link rel="manifest" href="/manifest.webmanifest">
-  <link rel="apple-touch-icon" href="/lfk-logo.png">
-  <meta name="theme-color" content="#FFFFFF">
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="description" content="Lauf Für Kaya! - Admin" />
-  <title>Lauf für Kaya! - Admin</title>
-</head>
-
-<body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.3.1-RELEASE_INFO</span>
-  <noscript>You need to enable JavaScript to run this app.</noscript>
-  <script src="/env.js"></script>
-  <script defer type="module" src="/_dist_/index.js"></script>
-</body>
-
-</html>
+<!-- this is configured with dev scripts -->
--- a/public/licenses.json
+++ b/public/licenses.json
--- a/public/manifest.webmanifest
+++ b/public/manifest.webmanifest
@@ -1,11 +1,18 @@
 {
 	"name": "Lauf für Kaya! - Admin",
 	"short_name": "LfK!Admin",
-	"start_url": ".",
+	"start_url": "/?utm_source=pwa",
+	"orientation": "portrait-primary",
 	"display": "standalone",
 	"background_color": "#fff",
 	"theme_color": "#fff",
 	"description": "Lauf für Kaya! - Admin",
+	"shortcuts": [
+		{
+			"name": "Users",
+			"url": "/users/?utm_source=pwa"
+		}
+	],
 	"icons": [
 		{
 			"src": "/favicon.png",
--- a/public/sw.js
+++ b/public/sw.js
@@ -1,2 +0,0 @@
-if(!self.define){const e=e=>{"require"!==e&&(e+=".js");let r=Promise.resolve();return i[e]||(r=new Promise((async r=>{if("document"in self){const i=document.createElement("script");i.src=e,document.head.appendChild(i),i.onload=r}else importScripts(e),r()}))),r.then((()=>{if(!i[e])throw new Error(`Module ${e} didn’t register its module`);return i[e]}))},r=(r,i)=>{Promise.all(r.map(e)).then((e=>i(1===e.length?e[0]:e)))},i={require:Promise.resolve(r)};self.define=(r,s,o)=>{i[r]||(i[r]=Promise.resolve().then((()=>{let i={};const c={uri:location.origin+r.slice(1)};return Promise.all(s.map((r=>{switch(r){case"exports":return i;case"module":return c;default:return e(r)}}))).then((e=>{const r=o(...e);return i.default||(i.default=r),i}))})))}}define("./sw.js",["./workbox-c8ead010"],(function(e){"use strict";self.addEventListener("message",(e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()})),e.precacheAndRoute([{url:"favicon.ico",revision:"ba44f340afba5bb1a07f14decc15dd04"},{url:"favicon.png",revision:"07a9941cec62319578fa2a1734db9959"},{url:"favicon.svg",revision:"689d6c6fda51e359c0e5725d9e905064"},{url:"index.html",revision:"931c34f3675364dcc09411aa0f223776"},{url:"logo.svg",revision:"4c9e31a1f4268d7e36e22cda7656e561"},{url:"manifest.webmanifest",revision:"75c93eb352c4877216e77b1d7f73445f"},{url:"robots.txt",revision:"61c27d2cd39a713f7829422c3d9edcc7"}],{})}));
-//# sourceMappingURL=sw.js.map
--- a/public/workbox-c8ead010.js
+++ b/public/workbox-c8ead010.js
--- a/s-config.template.js
+++ b/s-config.template.js
@@ -0,0 +1,6 @@
+const sveltePreprocess = require('svelte-preprocess');
+const preprocess = sveltePreprocess(__insert__);
+
+module.exports = {
+	preprocess
+};
--- 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();
 </script>

 <Route>
--- 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";
--- 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";
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,11 +1 @@
-const sveltePreprocess = require('svelte-preprocess');
-
-const preprocess = sveltePreprocess({
-	postcss: {
-		plugins: [ require('tailwindcss'), require('autoprefixer') ]
-	}
-});
-
-module.exports = {
-	preprocess
-};
+// this is configured with dev scripts
--- a/template-copy.js
+++ b/template-copy.js
@@ -0,0 +1,19 @@
+const fs = require('fs');
+let content_svelteconfig = fs.readFileSync('./s-config.template.js', { encoding: 'utf8' });
+let content_html = fs.readFileSync('./index.template.html', { encoding: 'utf8' });
+if (process.env.NODE_ENV_ODIT == 'development_fast') {
+	content_html = content_html.replace(
+		'__TAILWIND_INSERT__',
+		'<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.0.2/dist/tailwind.min.css">'
+	);
+	content_svelteconfig = content_svelteconfig.replace('__insert__', '{postcss:{}}');
+} else {
+	content_html = content_html.replace('__TAILWIND_INSERT__', '');
+	content_svelteconfig = content_svelteconfig.replace(
+		'__insert__',
+		"{postcss:{plugins:[require('tailwindcss'),require('autoprefixer')]}}"
+	);
+}
+fs.writeFileSync('./public/index.html', content_html);
+fs.writeFileSync('./svelte.config.js', content_svelteconfig);
+console.info('dev setup script done');
--- a/workbox-config.js
+++ b/workbox-config.js
@@ -1,6 +1,9 @@
 module.exports = {
 	globDirectory: 'public',
-	globPatterns: [ '**/*.{js,ico,png,svg,html,webmanifest,txt}' ],
-	globIgnores: [ 'env.js', 'env.sample.js', 'licenses.json' ],
-	swDest: 'public/sw.js'
+	globPatterns: [ '**/*.{js,ico,png,svg,html,webmanifest,txt,json}' ],
+	globIgnores: [ 'env.js', 'env.sample.js' ],
+	swDest: 'public/sw.js',
+	cleanupOutdatedCaches: true,
+	mode: 'production',
+	sourcemap: false
 };
Author	SHA1	Message	Date
Philipp Dormann	aa6348a29a	fix package:dev script All checks were successful continuous-integration/drone/push Build is passing Details ref #37	2021-01-17 19:22:45 +01:00
Philipp Dormann	b9f0f1a69a	Merge commit 'a284806d3cb769030a4e28d0403190b746f8fc61' into dev All checks were successful continuous-integration/drone/push Build is passing Details close #37	2021-01-17 19:18:42 +01:00
Philipp Dormann	a284806d3c	⚡ re-enable PWA functionality via serviceworker ref #37	2021-01-17 19:15:22 +01:00
Philipp Dormann	7e10c1db65	🔨 cleaned up build process + Dockerfile ref #37	2021-01-17 19:14:14 +01:00
Philipp Dormann	11790638d6	🔨 cleaned up build process + Dockerfile All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-17 19:01:11 +01:00
Philipp Dormann	0583cbe266	⚡ improved serviceworker + PWA logic Some checks failed continuous-integration/drone/push Build was killed Details	2021-01-17 18:59:26 +01:00
Philipp Dormann	2e6874c822	apply new gitignore config	2021-01-17 18:32:32 +01:00
Philipp Dormann	2ce41990bf	🐞 fix cross-env logic for faster dev starts ⚡	2021-01-17 18:31:35 +01:00
Philipp Dormann	c8aeba38ba	Merge branch 'dev' of https://git.odit.services/lfk/frontend into dev Some checks failed continuous-integration/drone/push Build is failing Details	2021-01-17 18:22:57 +01:00
Philipp Dormann	5e02502a5c	👩‍💻 developer configs/ recommendations for VSCode	2021-01-17 18:22:28 +01:00
Philipp Dormann	382cc3d844	new license file version [CI SKIP]	2021-01-17 17:19:48 +00:00
Philipp Dormann	dd74d9ee89	🧹 gitignore changes in public/index.html & svelte.config.js Some checks failed continuous-integration/drone/push Build is failing Details	2021-01-17 18:19:07 +01:00
Philipp Dormann	383f82807f	⚡ improved dev scripts for speed starts Some checks failed continuous-integration/drone/push Build was killed Details	2021-01-17 18:16:02 +01:00
Philipp Dormann	dccf7c6c8d	⚡ PWA optimizations All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-17 15:59:28 +01:00