Skip to content
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

Migrate to npm workspaces #640

Merged
merged 2 commits into from
Sep 26, 2023
Merged

Migrate to npm workspaces #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31db1b4
migrate to npm workspaces
NyCodeGHG Aug 4, 2023
fe82446
Fix up workspaces
sbs20 Sep 26, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- run: sudo sed -i 's/policy domain="coder" rights="none" pattern="PDF"/policy domain="coder" rights="read | write" pattern="PDF"'/ /etc/ImageMagick-6/policy.xml

# Install packages and build
- run: npm run install
- run: npm install .
- run: npm run lint
- run: npm run test
- run: npm run build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- run: sudo sed -i 's/policy domain="coder" rights="none" pattern="PDF"/policy domain="coder" rights="read | write" pattern="PDF"'/ /etc/ImageMagick-6/policy.xml

# Install packages and build
- run: npm run install
- run: npm install .
- run: npm run lint
- run: npm run test
- run: npm run build
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY package*.json "$APP_DIR/"
COPY packages/server/package*.json "$APP_DIR/packages/server/"
COPY packages/client/package*.json "$APP_DIR/packages/client/"

RUN npm run install
RUN npm install .

COPY packages/client/ "$APP_DIR/packages/client/"
COPY packages/server/ "$APP_DIR/packages/server/"
Expand Down
5 changes: 3 additions & 2 deletions docs/development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sudo sed -i 's/policy domain="coder" rights="none" pattern="PDF"/policy domain="
git clone https://github.com/sbs20/scanservjs.git

# Install all packages
cd scanservjs && npm run install
cd scanservjs && npm install .

# Run (from the scanservjs directory)
npm run dev
Expand Down Expand Up @@ -101,6 +101,7 @@ docker rm --force scanservjs-container 2> /dev/null

# Different run options
docker run -d -p 8080:8080 --name scanservjs-container --privileged scanservjs-image
docker run -d -p 8080:8080 -e SANED_NET_HOSTS="10.0.100.30" --name scanservjs-container --privileged scanservjs-image
docker run -d -p 8080:8080 -v /var/run/dbus:/var/run/dbus --name scanservjs-container --privileged scanservjs-image
docker run -d -p 8080:8080 -v $HOME/scan-data:/app/data/output --name scanservjs-container --privileged scanservjs-image

Expand Down Expand Up @@ -156,7 +157,7 @@ COPY package*.json /app/
COPY packages/server/package*.json /app/packages/server/
COPY packages/client/package*.json /app/packages/client/

RUN npm run install
RUN npm install .

COPY packages/client/ /app/packages/client/
COPY packages/server/ /app/packages/server/
Expand Down
Loading
Loading