From 95b6971de72a24e0f42501ec32101673434d7c5d Mon Sep 17 00:00:00 2001
From: Steel <mael.acier@ensiie.fr>
Date: Tue, 12 Dec 2023 00:17:32 +0100
Subject: [PATCH] remove env
---
.gitlab-ci.yml | 2 +-
package.json | 6 +-----
src/app.d.ts | 17 -----------------
src/lib/app.d.ts | 11 +++++++++++
src/lib/utils/env.ts | 18 ------------------
src/lib/utils/public_env.ts | 21 ---------------------
6 files changed, 13 insertions(+), 62 deletions(-)
delete mode 100644 src/app.d.ts
create mode 100644 src/lib/app.d.ts
delete mode 100644 src/lib/utils/env.ts
delete mode 100644 src/lib/utils/public_env.ts
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24fadfa..e90c2c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ build:
stage: build
extends: .pnpm
script:
- - pnpm build
+ - pnpm package
artifacts:
untracked: false
when: on_success
diff --git a/package.json b/package.json
index acf7c42..e361de3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@arise/aidc-sveltekit",
- "version": "0.0.7",
+ "version": "0.0.8",
"type": "module",
"scripts": {
"dev": "vite dev",
@@ -20,10 +20,6 @@
".": {
"types": "./dist/index.d.ts",
"svelte": "./dist/index.js"
- },
- "./paths": {
- "types": "./dist/paths.d.ts",
- "svelte": "./dist/paths.js"
}
},
"files": [
diff --git a/src/app.d.ts b/src/app.d.ts
deleted file mode 100644
index 0ae5781..0000000
--- a/src/app.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// See https://kit.svelte.dev/docs/types#app
-
-import type { AriseData } from "$lib/index.ts";
-
-// for information about these interfaces
-declare global {
- namespace App {
- // interface Error {}
- interface Locals {
- arise: AriseData;
- }
- // interface PageData {}
- // interface Platform {}
- }
-}
-
-export {};
diff --git a/src/lib/app.d.ts b/src/lib/app.d.ts
new file mode 100644
index 0000000..20ce246
--- /dev/null
+++ b/src/lib/app.d.ts
@@ -0,0 +1,11 @@
+// See https://kit.svelte.dev/docs/types#app
+
+import type { Locals as AriseLocals } from "$lib/types.ts";
+
+declare global {
+ namespace App {
+ interface Locals extends AriseLocals {}
+ }
+}
+
+export {};
diff --git a/src/lib/utils/env.ts b/src/lib/utils/env.ts
deleted file mode 100644
index 50f5fb6..0000000
--- a/src/lib/utils/env.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as assert from "assert";
-import { env } from "$env/dynamic/private";
-
-type RecordFromKeys<T extends readonly string[]> = Record<T[number], string> &
- Partial<typeof env>;
-
-export function ensureEnv<K extends readonly string[]>(
- keys: K,
-): RecordFromKeys<K> {
- for (const key of keys) {
- const value = env[key];
- if (!env.CI) {
- assert.ok(value, `Variable d'environnement ${key} manquante`);
- }
- }
-
- return env as RecordFromKeys<K>;
-}
diff --git a/src/lib/utils/public_env.ts b/src/lib/utils/public_env.ts
deleted file mode 100644
index c7085c4..0000000
--- a/src/lib/utils/public_env.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as assert from "assert";
-import { env } from "$env/dynamic/public";
-import { browser } from "$app/environment";
-
-type RecordFromKeys<T extends readonly string[]> = Record<T[number], string> &
- Partial<typeof env>;
-
-export function ensurePublicEnv<K extends readonly `PUBLIC_${string}`[]>(
- keys: K,
-): RecordFromKeys<K> {
- for (const key of keys) {
- const value = env[key];
- if (!browser) {
- assert.ok(value, `Variable d'environnement ${key} manquante`);
- } else {
- console.error("Variable d'environnement manquante");
- }
- }
-
- return env as RecordFromKeys<K>;
-}
--
GitLab