Skip to content

Updates to recipes in light of package.json being moved #374

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions docs/recipes/build/docker-image.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ RUN apt-get update && apt-get install nodejs -y

WORKDIR /workspace
COPY . .

# Install npm dependencies
WORKDIR /workspace/src/Client
RUN npm ci

# Restore tools and build
WORKDIR /workspace
RUN dotnet tool restore
RUN dotnet run Bundle

Expand Down Expand Up @@ -118,8 +125,8 @@ COPY src/Server src/Server
RUN cd src/Server && dotnet publish -c release -o ../../deploy

FROM build as client-build
COPY package.json package-lock.json ./
RUN npm install
COPY src/Client/package.json src/Client/package-lock.json src/Client/
RUN cd src/Client && npm install
COPY src/Shared src/Shared
COPY src/Client src/Client
# tailwind.config.js needs to be in the dir where the
Expand Down
1 change: 1 addition & 0 deletions docs/recipes/upgrading/v4-to-v5.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
1. `dotnet paket add <package> --keep-minor`. This will download the latest version of the package you required *but will not update any associated dependencies outside of their existing major version*.

### Javascript tools and dependencies
1. **Move package.json & package-lock.json to `src/Client`**
1. **Update all dependencies.**
1. Replace `package.json` with [this file](https://raw.githubusercontent.com/SAFE-Stack/SAFE-template/master/Content/default/package.json).
1. Replace `package-lock.json` with [this file](https://raw.githubusercontent.com/SAFE-Stack/SAFE-template/master/Content/default/package-lock.json).
Expand Down