Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
jdeepee committed Jan 24, 2022
2 parents 0e2419d + 3dbe432 commit 0a6f5da
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
pkgver=$(node ./scripts/get-pkg-version.js)
echo ::set-output name=version::$pkgver
- name: Install deps
run: npm i
run: npm i --legacy-peer-deps
- name: Build languages
run: npm run get-languages
- name: Build app
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
# id: ref
# run: echo "::set-output name=version::$(node ./scripts/get-pkg-version.js)"
# - name: Install deps
# run: npm i
# run: npm i --legacy-peer-deps
# - name: Build languages
# run: npm run get-languages
# - name: Build app
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
pkgver=$(node ./scripts/get-pkg-version.js)
echo ::set-output name=version::$pkgver
- name: Install deps
run: npm i
run: npm i --legacy-peer-deps
- name: Build languages
run: npm run get-languages
- name: Build app
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
- name: Install Node.js, NPM & Yarn
uses: actions/setup-node@v2
with:
node-version: 14.17.0
node-version: 16.13.0
- name: Install modules
run: npm i
run: npm i --legacy-peer-deps
- name: Run lint
run: npm run lint
- name: Run tests
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,15 @@
"patch-package": "^6.4.7",
"pinia": "^2.0.2",
"register-service-worker": "^1.7.1",
"sass": "^1.49.0",
"subscriptions-transport-ws": "^0.9.19",
"uuid": "^8.3.2",
"vue": "^3.0.0",
"vue-advanced-cropper": "^2.3.1",
"vue-datocms": "^1.0.3",
"vue-router": "^4.0.0-0",
"vue-virtual-scroller": "^2.0.0-alpha.1"
"vue-virtual-scroller": "^2.0.0-alpha.1",
"fs-extra": "^10.0.0"
},
"devDependencies": {
"@babel/plugin-transform-runtime": "^7.14.5",
Expand Down Expand Up @@ -84,10 +86,9 @@
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-vue": "^7.12.1",
"esm": "^3.2.25",
"fs-extra": "^10.0.0",
"jest": "^26.0.0",
"jest-transform-stub": "^2.0.0",
"node-sass": "^4.12.0",
"node-sass": "^6.0.0",
"node-wget-js": "^1.0.1",
"prettier": "^2.3.2",
"react": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/components/avatar-upload/AvatarUpload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export default defineComponent({
}
/* Deep selector inside scoped styles */
.cropper /deep/ .vue-simple-handler {
.cropper >>> .vue-simple-handler {
background: var(--j-color-primary-500) !important;
}
</style>

0 comments on commit 0a6f5da

Please sign in to comment.