Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/next-13.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vygandas committed Oct 29, 2023
2 parents fba1de7 + 34ab28a commit a510d6e
Show file tree
Hide file tree
Showing 6 changed files with 12,857 additions and 11,645 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/pr_affected_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,16 @@ jobs:

- run: git fetch origin main

- run: yarn install
# - run: yarn install

- uses: pnpm/action-setup@v2
with:
version: 8
run_install: |
- use-beta-cli=true
- recursive: true
args: [--frozen-lockfile, --strict-peer-dependencies]
- args: [--global, gulp, prettier, typescript, eslint]
- name: Run Affected Tests
shell: bash
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ Thumbs.db
.next

documentation

.pnpm-store
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ devinit:
npm:
$(call DOCKER_RUN_CMD) --entrypoint="npm" node-dev-env:latest $(call ARGS, defaultstring)

pnpm:
$(call DOCKER_RUN_CMD) --entrypoint="pnpm" node-dev-env:latest $(call ARGS, defaultstring)

yarn:
$(call DOCKER_RUN_CMD) --entrypoint="yarn" node-dev-env:latest $(call ARGS, defaultstring)

Expand Down
4 changes: 4 additions & 0 deletions docker/utility/node.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ FROM node:lts-alpine as builder

WORKDIR /app

ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable

RUN yarn global add nx@latest

RUN yarn global add nodemon@latest
Expand Down
Loading

0 comments on commit a510d6e

Please sign in to comment.