Skip to content

Commit

Permalink
Fixes for latest web
Browse files Browse the repository at this point in the history
vue3 migration
Use Web extension SDK
  • Loading branch information
diocas committed Feb 17, 2023
1 parent 50602f5 commit 3f4b621
Show file tree
Hide file tree
Showing 78 changed files with 18,077 additions and 53,289 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@ jobs:
echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_ENV
- name: Install node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '14'
node-version: 14
- uses: pnpm/action-setup@v2
name: Install pnpm
id: pnpm-install
with:
version: 7

- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion common/fileAccess.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const getHeadersWithAuth = (isPublic, token, publicLinkPassword) => {
}

const webdavPath = (path) => {
const user = window.Vue.$store.state.user.id
const user = window.__$store.state.user.id
return `files/${user}/${path}`
}

Expand Down
48 changes: 0 additions & 48 deletions ifc-js/.eslintrc.js

This file was deleted.

8 changes: 8 additions & 0 deletions ifc-js/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "@ownclouders",
"settings": {
"jest": {
"version": "remove jest rules from @ownclouders/eslint-config and remove this"
}
}
}
4 changes: 2 additions & 2 deletions ifc-js/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ clean:
rm -rf dist release node_modules

dist:
yarn install
yarn build
pnpm install
pnpm build

release/$(NAME).tar.gz: dist
mkdir -p release
Expand Down
72 changes: 23 additions & 49 deletions ifc-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,64 +4,38 @@
"description": "CERNBox web IFC.js integration",
"license": "AGPL-3.0",
"author": "CERNBox",
"type": "module",
"private": true,
"homepage": "https://github.com/cernbox/web-extensions",
"scripts": {
"lint": "eslint 'src/**/*.{js,vue}' --color",
"build": "rollup -c",
"watch": "rollup -c -w",
"serve": "SERVER=true yarn watch"
"lint": "eslint 'src/**/*.{js,ts,vue}' --color",
"build": "pnpm vite build",
"build:w": "pnpm vite build --watch --mode development"
},
"browserslist": [
"last 2 version",
"last 1 year",
"> .2%",
"not dead",
"not IE 11",
"not IE_Mob 11"
"not Explorer > 0",
"not ExplorerMobile > 0",
"not BlackBerry > 0",
"not OperaMini all",
"not OperaMobile > 0"
],
"devDependencies": {
"@babel/core": "^7.12.10",
"@babel/eslint-parser": "^7.16.0",
"@erquhart/rollup-plugin-node-builtins": "^2.1.5",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-json": "^4.1.0",
"@types/jest": "^26.0.23",
"@types/jest-axe": "^3.5.3",
"@typescript-eslint/eslint-plugin": "^5.2.0",
"babel-jest": "^27.0.6",
"eslint": "^7.30.0",
"eslint-config-prettier": "^6.10.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-jest": "^24.1.3",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-vue": "^7.13.0",
"eslint-plugin-vuejs-accessibility": "^0.7.1",
"jest": "^26.6.3",
"jest-axe": "^4.1.0",
"jest-fetch-mock": "^3.0.3",
"jest-mock-axios": "^4.4.0",
"jest-serializer-vue": "^2.0.2",
"jest-svg-transformer": "^1.0.0",
"rollup": "^2.52.7",
"rollup-plugin-babel": "^4.4.0",
"rollup-plugin-copy-watch": "^0.0.1",
"rollup-plugin-embed-css": "^1.0.21",
"rollup-plugin-gzip": "^2.5.0",
"rollup-plugin-livereload": "^2.0.5",
"rollup-plugin-node-globals": "^1.4.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-serve": "^1.1.0",
"rollup-plugin-svg": "^2.0.0",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-vue": "^5.1.4",
"ts-jest": "^27.0.7",
"typescript": "^4.4.4",
"vue-jest": "^3.0.7",
"vue-template-compiler": "^2.6.12",
"vuex": "^3.6.2"
"@ownclouders/eslint-config": "0.0.1",
"@ownclouders/extension-sdk": "file:../../web/packages/extension-sdk",
"@ownclouders/prettier-config": "0.0.1",
"@ownclouders/tsconfig": "0.0.4",
"@vitejs/plugin-vue": "4.0.0",
"eslint": "8.31.0",
"js-base64": "^3.7.5",
"prettier": "2.6.2",
"sass": "1.58.0",
"typescript": "~4.9.5",
"vite": "4.1.1",
"vite-plugin-static-copy": "^0.13.0",
"vue": "3.2.47"
},
"dependencies": {
"three": "^0.134.0",
Expand Down
Loading

0 comments on commit 3f4b621

Please sign in to comment.