Skip to content

Commit

Permalink
feat: use yarn v3 (#136)
Browse files Browse the repository at this point in the history
* feat: use yarn v3

* chore: bump yarn to 3.2.1
  • Loading branch information
Jonathan authored Jun 6, 2022
1 parent 74f3b3f commit 73eff05
Show file tree
Hide file tree
Showing 8 changed files with 8,821 additions and 5,593 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ node_modules/
.next/
uploads/
.git/
.yarn/*
!.yarn/releases
!.yarn/plugins
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
/.pnp
.pnp.js

# yarn
.yarn/*
!.yarn/releases
!.yarn/plugins

# testing
/coverage

Expand Down
786 changes: 786 additions & 0 deletions .yarn/releases/yarn-3.2.1.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.1.cjs
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
FROM node:16-alpine AS deps
WORKDIR /build

COPY package.json yarn.lock ./
COPY .yarn .yarn
COPY package.json yarn.lock .yarnrc.yml ./

RUN apk add --no-cache libc6-compat
RUN yarn install --frozen-lockfile
RUN yarn install --immutable

FROM node:16-alpine AS builder
WORKDIR /build
Expand All @@ -13,7 +14,8 @@ COPY --from=deps /build/node_modules ./node_modules
COPY src ./src
COPY scripts ./scripts
COPY prisma ./prisma
COPY package.json yarn.lock esbuild.config.js next.config.js next-env.d.ts zip-env.d.ts tsconfig.json ./
COPY .yarn .yarn
COPY package.json yarn.lock .yarnrc.yml esbuild.config.js next.config.js next-env.d.ts zip-env.d.ts tsconfig.json ./

ENV ZIPLINE_DOCKER_BUILD 1
ENV NEXT_TELEMETRY_DISABLED 1
Expand Down
8 changes: 5 additions & 3 deletions Dockerfile-arm
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM node:16 AS deps
WORKDIR /build

COPY package.json yarn.lock ./
COPY .yarn .yarn
COPY package.json yarn.lock .yarnrc.yml ./

RUN yarn install --frozen-lockfile
RUN yarn install --immutable

FROM node:16 AS builder
WORKDIR /build
Expand All @@ -12,7 +13,8 @@ COPY --from=deps /build/node_modules ./node_modules
COPY src ./src
COPY scripts ./scripts
COPY prisma ./prisma
COPY package.json yarn.lock esbuild.config.js next.config.js next-env.d.ts zip-env.d.ts tsconfig.json ./
COPY .yarn .yarn
COPY package.json yarn.lock .yarnrc.yml esbuild.config.js next.config.js next-env.d.ts zip-env.d.ts tsconfig.json ./

ENV ZIPLINE_DOCKER_BUILD 1
ENV NEXT_TELEMETRY_DISABLED 1
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,6 @@
"repository": {
"type": "git",
"url": "https://github.com/diced/zipline.git"
}
}
},
"packageManager": "yarn@3.2.1"
}
Loading

0 comments on commit 73eff05

Please sign in to comment.