Skip to content

Revert "chore(web): prepare package.json and env files for monorepo tooling" #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2025
Merged

Revert "chore(web): prepare package.json and env files for monorepo tooling" #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
default: list-commands

list-commands:
@just --list --justfile {{justfile()}} --list-heading $'\nMonorepo recipes:\n'
@just --list --justfile {{justfile()}} --list-heading $'\nMonorepo recipes:\n'

# Prepares the repo for development
setup:
# ignore personal vscode settings. to contribute a change, use `just stop-ignore $file`
@just ignore .vscode/settings.json api/.vscode/settings.json web/.vscode/settings.json
# ignore api local-state files
@just ignore api/dev/states/myservers.cfg api/dev/Unraid.net/myservers.cfg
pnpm install

just api/setup
just web/setup

# restore notification files under api/dev
restore-notifications:
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
{
"name": "unraid-api-monorepo",
"version": "4.1.2",
"private": true,
"version": "4.1.2",
"scripts": {
"build": "pnpm -r build",
"deps:check": "manypkg check",
"dev": "pnpm -r dev",
"test": "pnpm -r test",
"lint": "pnpm -r lint",
"lint:fix": "pnpm -r lint:fix",
"test": "pnpm -r test"
},
"dependencies": {
"@manypkg/cli": "^0.23.0"
"check": "manypkg check"
},
"packageManager": "pnpm@10.4.1",
"pnpm": {
"peerDependencyRules": {
"allowAny": [
Expand All @@ -32,5 +28,9 @@
"ssh2",
"vue-demi"
]
}
},
"dependencies": {
"@manypkg/cli": "^0.23.0"
},
"packageManager": "pnpm@10.4.1"
}
4 changes: 1 addition & 3 deletions unraid-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
"test": "vitest",
"test:ui": "vitest --ui",
"coverage": "vitest run --coverage",
"clean": "pnpm run clean:build",
"clean:build": "pnpx rimraf dist",
"clean:deps": "pnpx rimraf node_modules",
"clean": "rm -rf dist",
"prebuild": "npm run clean",
"typecheck": "vue-tsc --noEmit",
"storybook": "storybook dev -p 6006",
Expand Down
0 web/.env → web/.env.example
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions web/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# Env vars here shouldn't be secret
!.env.*
!.env
!.env.staging
5 changes: 5 additions & 0 deletions web/justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ default:
@just --list --justfile {{justfile()}} --list-heading $'\nWeb project recipes:\n'
@just list-commands

setup:
just ../unraid-ui/setup
cp .env.example .env
npm install

clean:
rm -rf .nuxt
rm -rf node_modules
93 changes: 46 additions & 47 deletions web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,59 @@
"version": "4.1.2",
"private": true,
"scripts": {
"dev": "nuxt dev",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"type-check": "nuxi typecheck",
"prebuild:dev": "./scripts/prebuild-webgui-set-env.sh .env.staging",
"prebuild:webgui": "./scripts/prebuild-webgui-set-env.sh",
"build": "NODE_ENV=production nuxt build && pnpm run manifest-ts",
"build:dev": "nuxt build && pnpm run manifest-ts && pnpm run deploy-to-unraid:dev",
"build:webgui": "pnpm run type-check && nuxt build && pnpm run manifest-ts && pnpm run copy-to-webgui-repo",
"postbuild:dev": "./scripts/postbuild-webgui-restore-env.sh",
"prebuild:webgui": "./scripts/prebuild-webgui-set-env.sh",
"build:webgui": "pnpm run type-check && nuxt build && pnpm run manifest-ts && pnpm run copy-to-webgui-repo",
"postbuild:webgui": "./scripts/postbuild-webgui-restore-env.sh",
"clean": "pnpx rimraf .nuxt node_modules",
"codegen": "graphql-codegen --config codegen.ts -r dotenv/config",
"codegen:watch": "graphql-codegen --config codegen.ts --watch -r dotenv/config",
"copy-to-webgui-repo": "./scripts/copy-to-webgui-repo.sh",
"build": "NODE_ENV=production nuxt build && pnpm run manifest-ts",
"deploy-to-unraid:dev": "./scripts/deploy-dev.sh",
"dev": "nuxt dev",
"generate": "nuxt generate",
"postinstall": "nuxt prepare",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"copy-to-webgui-repo": "./scripts/copy-to-webgui-repo.sh",
"manifest-ts": "node ./scripts/add-timestamp-webcomponent-manifest.js",
"generate": "nuxt generate",
"preview": "nuxt preview",
"postinstall": "nuxt prepare",
"serve": "NODE_ENV=production PORT=${PORT:-4321} node .output/server/index.mjs",
"codegen": "graphql-codegen --config codegen.ts -r dotenv/config",
"codegen:watch": "graphql-codegen --config codegen.ts --watch -r dotenv/config",
"test": "vitest",
"test:ci": "vitest run",
"type-check": "nuxi typecheck"
"test:ci": "vitest run"
},
"devDependencies": {
"@graphql-codegen/cli": "^5.0.3",
"@graphql-codegen/client-preset": "^4.5.1",
"@graphql-codegen/introspection": "^4.0.3",
"@ianvs/prettier-plugin-sort-imports": "^4.4.0",
"@nuxt/devtools": "^1.6.4",
"@nuxt/eslint": "^0.7.3",
"@nuxtjs/tailwindcss": "^6.12.2",
"@rollup/plugin-strip": "^3.0.4",
"@tailwindcss/typography": "^0.5.15",
"@types/crypto-js": "^4.2.2",
"@types/eslint-config-prettier": "^6.11.3",
"@types/node": "^22",
"@types/semver": "^7.5.8",
"@unraid/tailwind-rem-to-rem": "^1.1.0",
"@vue/apollo-util": "^4.0.0-beta.6",
"@vueuse/core": "^12.0.0",
"@vueuse/nuxt": "^12.0.0",
"eslint-config-prettier": "^9.1.0",
"lodash-es": "^4.17.21",
"nuxt": "^3.14.1592",
"nuxt-custom-elements": "2.0.0-beta.18",
"prettier": "3.5.1",
"prettier-plugin-tailwindcss": "^0.6.9",
"shadcn-nuxt": "^0.11.3",
"tailwindcss-animate": "^1.0.7",
"terser": "^5.37.0",
"vite-plugin-remove-console": "^2.2.0",
"vitest": "^2.1.3",
"vue-tsc": "^2.1.10"
},
"dependencies": {
"@apollo/client": "^3.12.3",
Expand Down Expand Up @@ -59,45 +89,14 @@
"vue-i18n": "^10.0.5",
"wretch": "^2.11.0"
},
"devDependencies": {
"@graphql-codegen/cli": "^5.0.3",
"@graphql-codegen/client-preset": "^4.5.1",
"@graphql-codegen/introspection": "^4.0.3",
"@ianvs/prettier-plugin-sort-imports": "^4.4.0",
"@nuxt/devtools": "^1.6.4",
"@nuxt/eslint": "^0.7.3",
"@nuxtjs/tailwindcss": "^6.12.2",
"@rollup/plugin-strip": "^3.0.4",
"@tailwindcss/typography": "^0.5.15",
"@types/crypto-js": "^4.2.2",
"@types/eslint-config-prettier": "^6.11.3",
"@types/node": "^22",
"@types/semver": "^7.5.8",
"@unraid/tailwind-rem-to-rem": "^1.1.0",
"@vue/apollo-util": "^4.0.0-beta.6",
"@vueuse/core": "^12.0.0",
"@vueuse/nuxt": "^12.0.0",
"eslint-config-prettier": "^9.1.0",
"lodash-es": "^4.17.21",
"nuxt": "^3.14.1592",
"nuxt-custom-elements": "2.0.0-beta.18",
"prettier": "3.5.1",
"prettier-plugin-tailwindcss": "^0.6.9",
"shadcn-nuxt": "^0.11.3",
"tailwindcss-animate": "^1.0.7",
"terser": "^5.37.0",
"vite-plugin-remove-console": "^2.2.0",
"vitest": "^2.1.3",
"vue-tsc": "^2.1.10"
},
"optionalDependencies": {
"@rollup/rollup-linux-x64-gnu": "^4.30.1"
},
"packageManager": "pnpm@10.4.1",
"overrides": {
"vue": "latest",
"radix-vue": {
"@floating-ui/vue": "^1.1.5"
}
}
},
"packageManager": "pnpm@10.4.1"
}
Loading