diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a3bb9b2..f26f80d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,20 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Install Rust + uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: nightly + components: rustfmt + target: x86_64-unknown-linux-musl,x86_64-pc-windows-gnu,i686-pc-windows-gnu,x86_64-apple-darwin,aarch64-apple-darwin + - name: Install Node.js + uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Install pnpm + run: npm i -g pnpm + - name: Test + run: cargo test - name: Get version id: get_version run: echo "version=$(grep "version" Cargo.toml | head -n1 | cut -d '"' -f2)" >> $GITHUB_OUTPUT @@ -43,12 +57,6 @@ jobs: wget -nc https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.3.sdk.tar.xz mv MacOSX11.3.sdk.tar.xz tarballs/ UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh - - name: Install Rust - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: nightly - components: rustfmt - target: x86_64-unknown-linux-musl,x86_64-pc-windows-gnu,i686-pc-windows-gnu,x86_64-apple-darwin,aarch64-apple-darwin - name: Build MacOS run: | export PATH="$(pwd)/osxcross/target/bin:$PATH" @@ -78,10 +86,6 @@ jobs: with: tag_name: ${{ steps.get_version.outputs.version }} files: compressed/artifacts/* - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 18 - name: Publish NPM Package run: | cd pkg diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 2b01f49a..00000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Test -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Rust - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: nightly - components: rustfmt - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Install pnpm - run: npm i -g pnpm - - name: Test - run: cargo test diff --git a/Cargo.lock b/Cargo.lock index 375eec92..87f44896 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,7 +34,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "create-o7-app" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anyhow", "crossterm 0.26.0", diff --git a/Cargo.toml b/Cargo.toml index 2bff5af4..5b76bdb7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "create-o7-app" -version = "0.2.2" +version = "0.2.3" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/template_builder/templates/base/package.json b/template_builder/templates/base/package.json index 70846479..700b4a5f 100644 --- a/template_builder/templates/base/package.json +++ b/template_builder/templates/base/package.json @@ -10,21 +10,21 @@ }, "devDependencies": { "@sveltejs/adapter-auto": "^2.1.0", - "@typescript-eslint/eslint-plugin": "^5.59.7", - "@typescript-eslint/parser": "^5.59.7", - "eslint": "^8.41.0", + "@typescript-eslint/eslint-plugin": "^5.59.11", + "@typescript-eslint/parser": "^5.59.11", + "eslint": "^8.42.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-svelte": "^2.29.0", + "eslint-plugin-svelte": "^2.30.0", "prettier": "^2.8.8", - "prettier-plugin-svelte": "^2.10.0", - "svelte-check": "^3.3.2", - "svelte-preprocess": "^5.0.3", - "typescript": "~5.0.4", - "vite": "^4.3.8" + "prettier-plugin-svelte": "^2.10.1", + "svelte-check": "^3.4.3", + "svelte-preprocess": "^5.0.4", + "typescript": "~5.1.3", + "vite": "^4.3.9" }, "dependencies": { - "@sveltejs/kit": "^1.18.0", + "@sveltejs/kit": "^1.20.2", "svelte": "^3.59.1" } -} +} \ No newline at end of file diff --git a/template_builder/templates/extras/{Database}package.json b/template_builder/templates/extras/{Database}package.json index a518064e..47f16406 100644 --- a/template_builder/templates/extras/{Database}package.json +++ b/template_builder/templates/extras/{Database}package.json @@ -6,12 +6,12 @@ }, "dependencies": { "better-sqlite3": "^8.4.0", - "kysely": "^0.24.2", - "dotenv": "^16.0.3" + "kysely": "^0.25.0", + "dotenv": "^16.1.4" }, "devDependencies": { "@types/better-sqlite3": "^7.6.4", "kysely-codegen": "^0.10.0", - "prisma": "^4.14.1" + "prisma": "^4.15.0" } -} +} \ No newline at end of file diff --git a/template_builder/templates/extras/{Edge}package.json b/template_builder/templates/extras/{Edge}package.json index 7f368068..c2364f9a 100644 --- a/template_builder/templates/extras/{Edge}package.json +++ b/template_builder/templates/extras/{Edge}package.json @@ -1,7 +1,7 @@ { "devDependencies": { "@cloudflare/workers-types": "^4.20230518.0", - "@sveltejs/adapter-cloudflare": "^2.2.4", + "@sveltejs/adapter-cloudflare": "^2.3.0", "@sveltejs/adapter-auto": null } -} +} \ No newline at end of file diff --git a/template_builder/templates/extras/{Tailwind}package.json b/template_builder/templates/extras/{Tailwind}package.json index 539df0d3..2d4696b2 100644 --- a/template_builder/templates/extras/{Tailwind}package.json +++ b/template_builder/templates/extras/{Tailwind}package.json @@ -1,9 +1,9 @@ { "devDependencies": { "autoprefixer": "^10.4.14", - "postcss": "^8.4.23", + "postcss": "^8.4.24", "postcss-load-config": "^4.0.1", "prettier-plugin-tailwindcss": "^0.3.0", "tailwindcss": "^3.3.2" } -} +} \ No newline at end of file diff --git a/template_builder/templates/extras/{Trpc}package.json b/template_builder/templates/extras/{Trpc}package.json index 50f0f062..7b04a67f 100644 --- a/template_builder/templates/extras/{Trpc}package.json +++ b/template_builder/templates/extras/{Trpc}package.json @@ -1,10 +1,10 @@ { "dependencies": { - "@tanstack/svelte-query": "^4.29.7", - "@trpc/client": "^10.27.1", - "@trpc/server": "^10.27.1", + "@tanstack/svelte-query": "^4.29.11", + "@trpc/client": "^10.30.0", + "@trpc/server": "^10.30.0", "devalue": "^4.3.2", - "trpc-svelte-query": "1.0.0", + "trpc-svelte-query": "1.0.1", "zod": "^3.21.4" } -} +} \ No newline at end of file