chore: output directory is now dist

ubiquity-os · Dec 23, 2023 · 48b247c · 48b247c
1 parent 4d59298
commit 48b247c
Show file tree

Hide file tree

Showing 14 changed files with 6,866 additions and 4,783 deletions.
diff --git a/.github/workflows/cloudflare-deploy.yml b/.github/workflows/cloudflare-deploy.yml
@@ -35,8 +35,8 @@ jobs:
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           REPOSITORY: ${{ github.repository }}
-          PRODUCTION_BRANCH: "development"
-          OUTPUT_DIRECTORY: "static"
+          PRODUCTION_BRANCH: "main"
+          OUTPUT_DIRECTORY: "dist"
         run: |
           IFS='/' read -ra fields <<< "$REPOSITORY"
           projectName="${fields[1]}"

diff --git a/.github/workflows/conventional-commits.yml b/.github/workflows/conventional-commits.yml
@@ -3,7 +3,6 @@ name: Conventional Commits
 on:
   pull_request:
   push:
-    branches: [development]
 
 jobs:
   conventional-commits:

diff --git a/.gitignore b/.gitignore
@@ -170,3 +170,5 @@ dist
 
 .dev.vars
 .wrangler/
+.pnp.loader.mjs
+.pnp.cjs
diff --git a/build/esbuild-build.ts b/build/esbuild-build.ts
@@ -19,7 +19,7 @@ export const esBuildContext: esbuild.BuildOptions = {
     ".ttf": "dataurl",
     ".svg": "dataurl",
   },
-  outdir: "static/dist",
+  outdir: "dist",
 };
 
 esbuild

diff --git a/build/esbuild-server.ts b/build/esbuild-server.ts
@@ -11,7 +11,7 @@ import { esBuildContext } from "./esbuild-build";
 export async function server() {
   const _context = await esbuild.context(esBuildContext);
   const { port } = await _context.serve({
-    servedir: "static",
+    servedir: "dist",
     port: 8080,
   });
   console.log(`http://localhost:${port}`);

diff --git a/package.json b/package.json
@@ -35,9 +35,7 @@
 	"devDependencies": {
 		"@cloudflare/workers-types": "^4.20231121.0",
 		"@commitlint/cli": "^18.4.3",
-		"typescript": "^5.0.4",
 		"@commitlint/config-conventional": "^18.4.3",
-		"wrangler": "^3.0.0",
 		"@types/node": "^20.10.4",
 		"@typescript-eslint/eslint-plugin": "^6.13.1",
 		"@typescript-eslint/parser": "^6.13.1",
@@ -50,11 +48,13 @@
 		"lint-staged": "^15.1.0",
 		"npm-run-all": "^4.1.5",
 		"prettier": "^3.1.0",
-		"tsx": "^4.6.2"
+		"tsx": "^4.6.2",
+		"typescript": "^5.0.4",
+		"wrangler": "^3.0.0"
 	},
 	"lint-staged": {
 		"*.ts": [
-			"yarn prettier --write",
+			"prettier --write",
 			"eslint --fix"
 		]
 	},

diff --git a/static/fonts/ubiquity-nova-standard.eot b/static/fonts/ubiquity-nova-standard.eot
diff --git a/static/fonts/ubiquity-nova-standard.ttf b/static/fonts/ubiquity-nova-standard.ttf
diff --git a/static/fonts/ubiquity-nova-standard.woff b/static/fonts/ubiquity-nova-standard.woff
diff --git a/static/index.html b/static/index.html
diff --git a/static/main.ts b/static/main.ts
diff --git a/static/style.css b/static/style.css
diff --git a/tsconfig.json b/tsconfig.json
@@ -47,7 +47,7 @@
 		// "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
 		// "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
 		// "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
-		// "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+		"outDir": "./dist",                                   /* Specify an output folder for all emitted files. */
 		// "removeComments": true,                           /* Disable emitting comments. */
 		"noEmit": true /* Disable emitting files from a compilation. */,
 		// "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */