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.

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

chore: move to pnpm as the package manager #122

Merged
merged 4 commits into from
Jul 30, 2022
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: "14"
node-version: "16.16.0"
- run: make install
- run: make build
- if: failure()
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/prbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: "14"
node-version: "16.16.0"
- run: corepack enable
- run: make install
- run: make build
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
ref: ${{ github.event.inputs.commit_ref }}
- uses: actions/setup-node@v2-beta
with:
node-version: "14"
node-version: "16.16.0"
- run: make install
- run: make build
- if: failure()
Expand Down
28 changes: 0 additions & 28 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

This file was deleted.

631 changes: 0 additions & 631 deletions .yarn/releases/yarn-3.0.0.cjs

This file was deleted.

631 changes: 0 additions & 631 deletions .yarn/releases/yarn-3.0.2.cjs

This file was deleted.

7 changes: 0 additions & 7 deletions .yarnrc.yml

This file was deleted.

13 changes: 5 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,16 @@
ARG VERSION=latest

### Builder Image ###
FROM registry.access.redhat.com/ubi8/nodejs-14-minimal:1-11 as build_base
FROM registry.access.redhat.com/ubi8/nodejs-16-minimal:1-48 as build_base
USER root:root
WORKDIR /app
# install yarn
RUN npm install -g yarn
ENV PATH="${PATH}:${HOME}/.npm-global/bin/"
RUN corepack enable
# install dependencies
COPY .yarn/ .yarn/
COPY package.json yarn.lock .yarnrc.yml ./
RUN yarn install
COPY package.json pnpm-lock.yaml ./
RUN pnpm install
# copy sources and build the project
COPY . .
RUN yarn run build
RUN pnpm run build

### Runner Image ###
FROM quay.io/konveyor/move2kube-api:${VERSION}
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,23 @@ clean:

.PHONY: install
install: ## Install dependencies
@yarn install
@pnpm install

.PHONY: build
build: ## Build application
@yarn run lint && yarn run build
@pnpm run lint && pnpm run build

.PHONY: dev
dev: install ## Start Development server
@yarn run dev
@pnpm run dev

.PHONY: prod
prod: ## Start Production server
@yarn run prod
@pnpm run prod

.PHONY: start
start: install build ## Start server
@yarn run start
@pnpm run start

# -- Container Runtime --

Expand Down
43 changes: 15 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
"version": "0.1.0",
"description": "An UI for Move2Kube.",
"license": "Apache-2.0",
"main": "server.js",
"repository": "https://github.com/konveyor/move2kube-ui.git",
"packageManager": "[email protected]",
"engines": {
"node": "16.16.0"
},
"scripts": {
"start": "move2kube-api --log-level=trace --static-files-dir=dist",
"start:image": "docker run --rm -it -p 8080:8080 quay.io/konveyor/move2kube-ui move2kube-api --port 8080 --log-level trace --static-files-dir dist",
Expand All @@ -17,43 +20,28 @@
"@patternfly/react-core": "4.157.3",
"@patternfly/react-icons": "^4.7.6",
"@patternfly/react-table": "^4.16.20",
"@types/js-yaml": "^4.0.0",
"@types/react-router-dom": "^5.1.7",
"express": "^4.17.1",
"express-session": "^1.17.2",
"http-proxy-middleware": "^1.0.4",
"jose": "^3.14.3",
"js-yaml": "^4.0.0",
"jsonschema": "^1.4.0",
"node-fetch": "^2.6.1",
"passport": "^0.4.1",
"passport-oauth2": "^1.6.0",
"passport-saml": "^3.1.0",
"query-string": "^6.13.7",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-flow-renderer": "^10.2.2",
"react-router-dom": "^5.2.0",
"react-router-last-location": "^2.0.1",
"session-file-store": "^1.5.0",
"tslib": "^2.1.0",
"winston": "^3.3.3",
"yargs": "^17.0.1"
"tslib": "^2.1.0"
},
"devDependencies": {
"@types/node-fetch": "^2.5.11",
"@types/passport-oauth2": "^1.4.11",
"@types/js-yaml": "^4.0.0",
"@types/react": "^17.0.3",
"@types/react-dom": "^17.0.3",
"@typescript-eslint/eslint-plugin": "^4.19.0",
"@typescript-eslint/parser": "^4.19.0",
"@types/react-router-dom": "^5.1.7",
"css-loader": "^4.3.0",
"dotenv-webpack": "^3.0.0",
"eslint": "^7.23.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.23.1",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint": "^8.20.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"@typescript-eslint/parser": "^5.31.0",
"@typescript-eslint/eslint-plugin": "^5.31.0",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^4.5.0",
"mini-css-extract-plugin": "^0.11.2",
Expand All @@ -68,6 +56,5 @@
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^4.1.4"
},
"packageManager": "[email protected]"
}
}
Loading