diff --git a/build.sh b/build.sh index b732cbb..e7d6131 100644 --- a/build.sh +++ b/build.sh @@ -21,10 +21,10 @@ python3 -m pip install -r requirements.txt # --noinput || true echo "Running npm install..." -pnpm bootstrap +npm run bootstrap echo "Running npm Production..." -pnpm collect +npm run collect echo "Collecting static files..." python3 src/manage.py collectstatic --noinput --clear \ No newline at end of file diff --git a/package.json b/package.json index 931a10f..9ca0b2a 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "django-react", "version": "1.0.0", "scripts": { - "bootstrap": "cd src/ui && pnpm install", - "collect": "cd src/ui && pnpm collect" + "bootstrap": "npm install --prefix src/ui", + "collect": "npm run collect --prefix src/ui" }, "keywords": [], "author": "", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml deleted file mode 100644 index 9b60ae1..0000000 --- a/pnpm-lock.yaml +++ /dev/null @@ -1,9 +0,0 @@ -lockfileVersion: '9.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -importers: - - .: {} diff --git a/pyvenv.cfg b/pyvenv.cfg index 202de59..42427fd 100644 --- a/pyvenv.cfg +++ b/pyvenv.cfg @@ -1,7 +1,7 @@ home = /usr/local/python/3.10.13/bin implementation = CPython version_info = 3.10.13.final.0 -virtualenv = 20.25.1 +virtualenv = 20.26.2 include-system-site-packages = false base-prefix = /usr/local/python/3.10.13 base-exec-prefix = /usr/local/python/3.10.13 diff --git a/src/ui/package.json b/src/ui/package.json index 31f393e..bc00d7d 100644 --- a/src/ui/package.json +++ b/src/ui/package.json @@ -41,15 +41,15 @@ "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "format": "prettier --write .", "preview": "vite preview", - "collect": "pnpm build && pnpm build-rename && pnpm copy-buildfiles", - "build-rename": "pnpm build-rename-js && pnpm build-rename-css", + "collect": "npm run build && npm run build-rename && npm run copy-buildfiles", + "build-rename": "npm run build-rename-js && npm run build-rename-css", "build-rename-js": "renamer --regex --find 'index\\-[^\\.]+\\.js' --replace 'index.min.js' dist/assets/*.js", "build-rename-css": "renamer --regex --find 'index\\-[^\\.]+\\.css' --replace 'index.min.css' dist/assets/*.css", - "copy-buildfiles": "pnpm copy-build-js && pnpm copy-build-css && pnpm copy-build-images", + "copy-buildfiles": "npm run copy-build-js && npm run copy-build-css && npm run copy-build-images", "copy-build-js": "copyfiles -f 'dist/assets/*.js' '../staticfiles/js/'", "copy-build-css": "copyfiles -f 'dist/assets/*.css' '../staticfiles/css/'", "copy-build-images": "copyfiles -f 'dist/*.{svg,png,jpeg}' '../staticfiles/'", - "collectstatic": "pnpm collect && python ../manage.py collectstatic --no-input --clear" + "collectstatic": "npm run collect && python ../manage.py collectstatic --no-input --clear" }, "dependencies": { "react": "^18.2.0", @@ -58,7 +58,8 @@ }, "engines": { "node": ">=18.0.0", - "pnpm": ">=8.0.0" + "pnpm": ">=8.0.0", + "npm": ">=8.0.0" }, "devDependencies": { "@types/node": "^20.11.25",