chore: wip

chrisbbreuer · chrisbbreuer · commit 701b29ddce76 · 2024-01-16T17:18:50.000-08:00
chore: wip

chore: wip
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -34,7 +34,7 @@ functions:
   - resources/functions/**
 
 scripts:
-  - ./storage/framework/core/scripts/**
+  - ./storage/framework/scripts/**
 
 stack:
   - 'storage/framework/stacks/**'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,7 +44,7 @@ jobs:
         run: bunx pnpm --filter='./storage/framework' build
 
       - name: Publish framework
-        run: ./storage/framework/core/scripts/publish
+        run: ./storage/framework/scripts/publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
 
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   "scripts": {
     "buddy": "bun --bun ./storage/framework/core/buddy/src/cli.ts",
     "stacks": "bun run buddy",
-    "setup": "./storage/framework/core/scripts/setup.sh",
+    "setup": "./storage/framework/scripts/setup.sh",
     "fresh": "bun run buddy fresh",
     "clean": "bun run buddy clean",
     "upgrade": "bun run buddy upgrade",
diff --git a/storage/framework/core/bun-create/bud/package.json b/storage/framework/core/bun-create/bud/package.json
@@ -40,7 +40,7 @@
   "scripts": {
     "buddy": "bun --bun ./storage/framework/core/buddy/src/cli.ts",
     "stacks": "bun run buddy",
-    "setup": "./storage/framework/core/scripts/setup.sh",
+    "setup": "./storage/framework/scripts/setup.sh",
     "fresh": "bun run buddy fresh",
     "clean": "bun run buddy clean",
     "upgrade": "bun run buddy upgrade",
diff --git a/storage/framework/core/bun-create/buddy/package.json b/storage/framework/core/bun-create/buddy/package.json
@@ -40,7 +40,7 @@
   "scripts": {
     "buddy": "bun --bun ./storage/framework/core/buddy/src/cli.ts",
     "stacks": "bun run buddy",
-    "setup": "./storage/framework/core/scripts/setup.sh",
+    "setup": "./storage/framework/scripts/setup.sh",
     "fresh": "bun run buddy fresh",
     "clean": "bun run buddy clean",
     "upgrade": "bun run buddy upgrade",
diff --git a/storage/framework/core/bun-create/stack/package.json b/storage/framework/core/bun-create/stack/package.json
@@ -40,7 +40,7 @@
   "scripts": {
     "buddy": "bun --bun ./storage/framework/core/buddy/src/cli.ts",
     "stacks": "bun run buddy",
-    "setup": "./storage/framework/core/scripts/setup.sh",
+    "setup": "./storage/framework/scripts/setup.sh",
     "fresh": "bun run buddy fresh",
     "clean": "bun run buddy clean",
     "upgrade": "bun run buddy upgrade",
diff --git a/storage/framework/core/bun-create/stacks/package.json b/storage/framework/core/bun-create/stacks/package.json
@@ -40,7 +40,7 @@
   "scripts": {
     "buddy": "bun --bun ./storage/framework/core/buddy/src/cli.ts",
     "stacks": "bun run buddy",
-    "setup": "./storage/framework/core/scripts/setup.sh",
+    "setup": "./storage/framework/scripts/setup.sh",
     "fresh": "bun run buddy fresh",
     "clean": "bun run buddy clean",
     "upgrade": "bun run buddy upgrade",
diff --git a/storage/framework/core/bun-create/stx/package.json b/storage/framework/core/bun-create/stx/package.json
@@ -40,7 +40,7 @@
   "scripts": {
     "buddy": "bun --bun ./storage/framework/core/buddy/src/cli.ts",
     "stacks": "bun run buddy",
-    "setup": "./storage/framework/core/scripts/setup.sh",
+    "setup": "./storage/framework/scripts/setup.sh",
     "fresh": "bun run buddy fresh",
     "clean": "bun run buddy clean",
     "upgrade": "bun run buddy upgrade",
diff --git a/storage/framework/core/enums/src/index.ts b/storage/framework/core/enums/src/index.ts
@@ -42,7 +42,7 @@ export enum NpmScript {
   TypesGenerate = 'types:generate',
   Preinstall = 'preinstall',
   Prepublish = 'prepublish',
-  UpgradeBun = './storage/framework/core/scripts/setup.sh +bun.sh',
+  UpgradeBun = './storage/framework/scripts/setup.sh +bun.sh',
   UpgradeDependencies = 'pnpm up',
 }
 
diff --git a/storage/framework/core/path/src/index.ts b/storage/framework/core/path/src/index.ts
@@ -345,7 +345,7 @@ export function settingsPath(path?: string) {
 }
 
 export function scriptsPath(path?: string) {
-  return frameworkPath(`core/scripts/${path || ''}`)
+  return frameworkPath(`scripts/${path || ''}`)
 }
 
 export function schedulerPath(path?: string) {
diff --git a/storage/framework/package.json b/storage/framework/package.json
@@ -100,6 +100,11 @@
       "types": "./core/cli/dist/index.d.ts",
       "import": "./core/cli/dist/index.js"
     },
+    "./cloud": {
+      "bun": "./core/cloud/src/index.ts",
+      "types": "./core/cloud/dist/index.d.ts",
+      "import": "./core/cloud/dist/index.js"
+    },
     "./collections": {
       "bun": "./core/collections/src/index.ts",
       "types": "./core/collections/dist/index.d.ts",
@@ -340,10 +345,9 @@
   ],
   "scripts": {
     "buddy": "bun --bun run ./core/buddy/src/cli.ts",
-    "build": "./core/scripts/build",
-    "dev": "bunx pnpm --filter='./core/**' dev",
+    "build": "./scripts/build",
     "up": "bunx taze major -I",
-    "publish:framework": "./core/scripts/publish",
+    "publish:framework": "./scripts/publish",
     "publish:dummy-libs": "bun --bun run generate:entries && bunx pnpm --filter './libs/components/vue' --filter './libs/components/web' --filter './libs/functions' publish --access public --no-git-checks",
     "fresh": "bun buddy fresh",
     "clean": "bun buddy clean",
diff --git a/storage/framework/scripts/build b/storage/framework/scripts/build
@@ -4,7 +4,7 @@
 script_dir=$(realpath $(dirname "$0"))
 
 # Get all directories in the core path
-dirs=$(find "$script_dir/../" -type d -maxdepth 1)
+dirs=$(find "$script_dir/../core/" -type d -maxdepth 1)
 
 # Check if no directories found
 if [ -z "$dirs" ]; then
@@ -14,11 +14,6 @@ fi
 
 # Loop through each directory
 for dir in $dirs; do
-  # Skip the ../scripts directory
-  if [ "$dir" = "$script_dir/../scripts" ]; then
-    continue
-  fi
-
   echo ""
   echo "🏗️  Building..."
   echo "📦 $dir"
diff --git a/storage/framework/scripts/ensure b/storage/framework/scripts/ensure
diff --git a/storage/framework/scripts/fresh b/storage/framework/scripts/fresh
diff --git a/storage/framework/scripts/install-pkgx b/storage/framework/scripts/install-pkgx
@@ -40,6 +40,11 @@ _install_pre_reqs() {
     esac
   elif test -f /etc/fedora-release; then
     $SUDO yum --assumeyes install libatomic
+  elif test -f /etc/arch-release; then
+    # installing gcc isn't my favorite thing, but even clang depends on it
+    # on archlinux. it provides libgcc. since we use it for testing, the risk
+    # to our builds is very low.
+    $SUDO pacman --noconfirm -Sy gcc libc++ libatomic_ops libxcrypt-compat
   fi
 }
 
@@ -166,11 +171,3 @@ elif [ $(basename "/$0") != 'installer.sh' ]; then
 fi
 
 eval "$(pkgx integrate)"
-
-# todo: need to check if this repo already exists locally
-git clone https://github.com/stacksjs/stacks.git $1
-
-cd $1
-
-# need to log to console: "in order to finish the setup,
-# please run 
diff --git a/storage/framework/scripts/link b/storage/framework/scripts/link
diff --git a/storage/framework/scripts/move-built-src-files.ts b/storage/framework/scripts/move-built-src-files.ts
diff --git a/storage/framework/scripts/move-dts-files.ts b/storage/framework/scripts/move-dts-files.ts
diff --git a/storage/framework/scripts/publish b/storage/framework/scripts/publish
diff --git a/storage/framework/scripts/setup b/storage/framework/scripts/setup
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+DIR="$(cd "$(dirname "$0")" && pwd)"
+"$DIR/install-pkgx"
+
+if [ -n "$1" ]; then
+  # todo: need to check if this repo already exists locally
+  git clone https://github.com/stacksjs/stacks.git $1
+  cd $1
+fi
+
+# need to log to console: "in order to finish the setup,
+# please run
diff --git a/storage/framework/scripts/uninstall-pkgx b/storage/framework/scripts/uninstall-pkgx
@@ -0,0 +1,13 @@
+pkgx deintegrate
+sudo rm /usr/local/bin/pkgx
+rm -rf ~/.pkgx
+
+if [[ "$(uname)" == "Darwin" ]]; then
+  # on macOS
+  rm -rf "${XDG_CACHE_HOME:-$HOME/Library/Caches}/pkgx"
+  rm -rf "${XDG_DATA_HOME:-$HOME/Library/Application Support}/pkgx"
+else
+  # non macOS
+  rm -rf "${XDG_CACHE_HOME:-$HOME/.cache}/pkgx"
+  rm -rf "${XDG_DATA_HOME:-$HOME/.local/share}/pkgx"
+fi

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export enum NpmScript {`
`42`	`42`	`TypesGenerate = 'types:generate',`
`43`	`43`	`Preinstall = 'preinstall',`
`44`	`44`	`Prepublish = 'prepublish',`
`45`		`- UpgradeBun = './storage/framework/core/scripts/setup.sh +bun.sh',`
	`45`	`+ UpgradeBun = './storage/framework/scripts/setup.sh +bun.sh',`
`46`	`46`	`UpgradeDependencies = 'pnpm up',`
`47`	`47`	`}`
`48`	`48`