[Pages] Move functions into src folder (#15)

* [Pages] Move functions into src folder * tsconfig updates
MNThomson · Jan 16, 2023 · 6bb3e47 · 6bb3e47
1 parent e8a7f51
commit 6bb3e47
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -4,11 +4,11 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "dev:a": "PUBLIC_GIT_SHA=$(git rev-parse --short HEAD) astro dev",
-    "dev:cf": "( sleep 10 && curl http://localhost:8788/v2/seed ) & PUBLIC_GIT_SHA=$(git rev-parse --short HEAD) wrangler pages dev --compatibility-date=2023-01-12 --kv containerFlareKV --r2 containerFlareR2 --binding $(cat .env) -- astro dev #--proxy 3000",
-    "preview": "npm run build && rm functions/[[path]].js && wrangler pages dev dist/ --compatibility-date=2023-01-12 --kv containerFlareKV --r2 containerFlareR2 --binding $(cat .env)",
-    "build": "PUBLIC_GIT_SHA=$(git rev-parse --short HEAD) astro build",
-    "publish": "npm run build && rm functions/[[path]].js && npx wrangler pages publish --branch main dist/",
+    "dev:a": "astro dev",
+    "dev:cf": "( sleep 10 && curl http://localhost:8788/v2/seed ) & cd ./src && wrangler pages dev --compatibility-date=2023-01-12 --kv containerFlareKV --r2 containerFlareR2 --binding $(cat ../.env) -- npm run --prefix ../ dev:a",
+    "preview": "npm run build && cd ./src && wrangler pages dev ../dist --compatibility-date=2023-01-12 --kv containerFlareKV --r2 containerFlareR2 --binding $(cat ../.env) ",
+    "build": "astro build && rm -rf ./functions",
+    "publish": "npm run build && cd ./src && wrangler pages publish ../dist #--branch main",
     "astro": "astro",
     "--Oberservability": "---------------------------------------------------------",
     "logs:preview": "wrangler pages deployment tail --project-name containerflare --environment preview",

diff --git a/functions/tsconfig.json → src/functions/tsconfig.json b/functions/tsconfig.json → src/functions/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "target": "ESNext",
     "module": "ESNext",

diff --git a/...ns/v2/[[name]]/blobs/[reference]/index.ts → ...ns/v2/[[name]]/blobs/[reference]/index.ts b/...ns/v2/[[name]]/blobs/[reference]/index.ts → ...ns/v2/[[name]]/blobs/[reference]/index.ts
@@ -1,4 +1,4 @@
-import type {
+import {
   EventContext,
   PagesFunction,
   Response,

diff --git a/...2/[[name]]/manifests/[reference]/index.ts → ...2/[[name]]/manifests/[reference]/index.ts b/...2/[[name]]/manifests/[reference]/index.ts → ...2/[[name]]/manifests/[reference]/index.ts
@@ -1,4 +1,4 @@
-import type {
+import {
   EventContext,
   PagesFunction,
   Response,

diff --git a/functions/v2/seed.ts → src/functions/v2/seed.ts b/functions/v2/seed.ts → src/functions/v2/seed.ts
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -1,5 +1,6 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
+  "exclude": ["./functions"],
   "compilerOptions": {
     "target": "ESNext",
     "module": "ESNext",

diff --git a/tsconfig.json → tsconfig.base.json b/tsconfig.json → tsconfig.base.json