diff --git a/template/Makefile b/template/Makefile index 0d5939c..1d1e53d 100644 --- a/template/Makefile +++ b/template/Makefile @@ -120,9 +120,7 @@ compile-frontend: frontend/package.json ## compile latest frontend dependencies init-frontend-dependencies: ## compile initial frontend dependencies to be built into the docker image @docker run --rm --user $(shell id -u):$(shell id -g) -w "/app" -v $(shell pwd)/frontend:/app -e npm_config_cache=/tmp/.npm node:lts /bin/bash -c \ - "xargs npm install < dependencies-init.txt" - @docker run --rm --user $(shell id -u):$(shell id -g) -w "/app" -v $(shell pwd)/frontend:/app -e npm_config_cache=/tmp/.npm node:lts /bin/bash -c \ - "xargs npm install --save-dev < dependencies-dev-init.txt" + "xargs -n 5 npm install" shell-backend: ## Shell into the running Django container $(KUBECTL_EXEC_BACKEND) diff --git a/template/frontend/dependencies-dev-init.txt b/template/frontend/dependencies-dev-init.txt deleted file mode 100644 index 3880bc0..0000000 --- a/template/frontend/dependencies-dev-init.txt +++ /dev/null @@ -1,26 +0,0 @@ -@eslint/eslintrc -@graphql-codegen/cli -@graphql-codegen/client-preset -@graphql-typed-document-node/core -@tailwindcss/postcss -@testing-library/dom -@testing-library/react -@types/lodash -@types/react -@types/react-dom -@vitejs/plugin-react -eslint -eslint-config-next -eslint-plugin-import -eslint-plugin-jsx-a11y -eslint-plugin-react -eslint-plugin-react-hooks -graphql -husky -jsdom -prettier -prettier-plugin-tailwindcss -tailwindcss -typescript -typescript-eslint -vitest diff --git a/template/frontend/dependencies-init.txt b/template/frontend/dependencies-init.txt deleted file mode 100644 index 1c24b03..0000000 --- a/template/frontend/dependencies-init.txt +++ /dev/null @@ -1,11 +0,0 @@ -@apollo/client@3.14 -@testing-library/jest-dom -@testing-library/user-event -@typescript-eslint/eslint-plugin -clsx -deepmerge -eslint-plugin-unused-imports -lodash -next -react -react-dom diff --git a/template/frontend/package.json b/template/frontend/package.json index 4fab50e..19c923a 100644 --- a/template/frontend/package.json +++ b/template/frontend/package.json @@ -15,5 +15,46 @@ "typecheck": "tsc --noEmit", "prepare": "cd .. && husky frontend/.husky", "codegen": "graphql-codegen" + }, + "dependencies": { + "@apollo/client": "~3.14.0", + "@testing-library/jest-dom": "*", + "@testing-library/user-event": "*", + "@typescript-eslint/eslint-plugin": "*", + "clsx": "*", + "deepmerge": "*", + "eslint-plugin-unused-imports": "*", + "lodash": "*", + "next": "*", + "react": "*", + "react-dom": "*" + }, + "devDependencies": { + "@eslint/eslintrc": "*", + "@graphql-codegen/cli": "*", + "@graphql-codegen/client-preset": "*", + "@graphql-typed-document-node/core": "*", + "@tailwindcss/postcss": "*", + "@testing-library/dom": "*", + "@testing-library/react": "*", + "@types/lodash": "*", + "@types/react": "*", + "@types/react-dom": "*", + "@vitejs/plugin-react": "*", + "eslint": "*", + "eslint-config-next": "*", + "eslint-plugin-import": "*", + "eslint-plugin-jsx-a11y": "*", + "eslint-plugin-react": "*", + "eslint-plugin-react-hooks": "*", + "graphql": "*", + "husky": "*", + "jsdom": "*", + "prettier": "*", + "prettier-plugin-tailwindcss": "*", + "tailwindcss": "*", + "typescript": "*", + "typescript-eslint": "*", + "vitest": "*" } }