Merge branch 'rework/yarn' into 'main'

Rework/yarn

See merge request neshura-websites/readyornot!2
This commit is contained in:
Neshura 2022-12-03 22:24:42 +00:00
commit 2ef16d79f8
5 changed files with 16 additions and 8141 deletions

3
.gitignore vendored
View file

@ -15,4 +15,5 @@ yarn-error.log*
# production # production
/build /build
/data /data
/confs /confs
*.lock

View file

@ -11,7 +11,7 @@ stages:
variables: variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest IMAGE_LATEST: $CI_REGISTRY_IMAGE:develop
.node: .node:
@ -20,6 +20,11 @@ variables:
.docker: .docker:
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:20 image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:20
rules:
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TAG
variables:
IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
linter: linter:
@ -44,8 +49,8 @@ build:
expire_in: 30 mins expire_in: 30 mins
paths: paths:
- docker.tar - docker.tar
only: rules:
- tags - !reference [.docker, rules]
push: push:
@ -61,5 +66,5 @@ push:
- docker tag $IMAGE_TAG $IMAGE_LATEST - docker tag $IMAGE_TAG $IMAGE_LATEST
- docker push $IMAGE_TAG - docker push $IMAGE_TAG
- docker push $IMAGE_LATEST - docker push $IMAGE_LATEST
only: rules:
- tags - !reference [.docker, rules]

5908
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{ {
"name": "www", "name": "readyornot",
"version": "0.2.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev:debug": "NODE_OPTIONS='--inspect' next dev -p 4042", "dev:debug": "NODE_OPTIONS='--inspect' next dev -p 4042",
@ -10,22 +10,17 @@
"lint": "next lint" "lint": "next lint"
}, },
"dependencies": { "dependencies": {
"@types/dockerode": "^3.3.14",
"@types/next": "^9.0.0", "@types/next": "^9.0.0",
"dockerode": "^3.3.4",
"next": "^12.3.0", "next": "^12.3.0",
"node": "^18.9.0",
"node-html-parser": "^5.3.3",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"sharp": "^0.31.2", "sharp": "^0.31.2",
"swr": "^1.3.0" "swr": "^1.3.0"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^18.7.18",
"@types/react": "^18.0.14",
"eslint": "^8.23.1", "eslint": "^8.23.1",
"eslint-config-next": "12.2.0", "eslint-config-next": "12.2.0",
"typescript": "^4.7.4" "@types/react": "^18.0.14",
"typescript": "4.9.3"
} }
} }

2218
yarn.lock

File diff suppressed because it is too large Load diff