Skip to content

Commit

Permalink
pnpm.
Browse files Browse the repository at this point in the history
  • Loading branch information
b4rtaz committed Oct 14, 2023
1 parent d4de296 commit a7f4020
Show file tree
Hide file tree
Showing 11 changed files with 6,511 additions and 5,715 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: main
on:
push:
branches:
- main
jobs:
build:
name: Build
runs-on: ${{matrix.os}}
strategy:
matrix:
os: [ubuntu-latest]
steps:
- name: Checkout Repo
uses: actions/checkout@v2
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: 18
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8
run_install: false
- name: Install
run: pnpm install
- name: Build
run: pnpm build
- name: Prettier
run: pnpm prettier
- name: Eslint
run: pnpm eslint
11 changes: 6 additions & 5 deletions canvas/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
},
"scripts": {
"clean": "rm -rf lib && rm -rf node_modules/.cache/rollup-plugin-typescript2",
"build": "yarn clean && rollup -c",
"start": "yarn clean && rollup -c --watch",
"build": "pnpm clean && rollup -c",
"start": "pnpm clean && rollup -c --watch",
"eslint": "eslint ./src --ext .ts",
"prettier": "prettier --check ./src",
"prettier:fix": "prettier --write ./src"
Expand All @@ -56,14 +56,15 @@
"fabric": "6.0.0-beta13"
},
"devDependencies": {
"tslib": "^2.6.2",
"typescript": "^5.2.2",
"rollup": "^4.0.2",
"rollup-plugin-dts": "^6.1.0",
"rollup-plugin-typescript2": "^0.36.0",
"@rollup/plugin-replace": "^5.0.3",
"prettier": "^3.0.3",
"@typescript-eslint/eslint-plugin": "^5.47.0",
"@typescript-eslint/parser": "^5.47.0",
"eslint": "^8.30.0"
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"eslint": "^8.51.0"
}
}
1 change: 1 addition & 0 deletions canvas/src/shapes/mce-path.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export class McePath extends Path {
// This override is needed to silent "Setting type has no effect" log.
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
public constructor(path: any, options: TOptions<McePathProps>) {
super(path, {
label: 'Path',
Expand Down
2 changes: 1 addition & 1 deletion demos/svelte-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"svelte": "^4.0.5",
"svelte-check": "^3.4.3",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"typescript": "^5.2.2",
"vite": "^4.4.2",
"prettier": "^3.0.3"
},
Expand Down
13 changes: 7 additions & 6 deletions demos/webpack-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,26 @@
"scripts": {
"clean": "rm -rf public/build",
"start": "webpack --mode development --watch",
"build": "yarn clean && webpack --mode production",
"build": "pnpm clean && webpack --mode production",
"eslint": "eslint ./src --ext .ts",
"test:single": "echo \"No tests yet\"",
"prettier": "prettier --check ./src",
"prettier:fix": "prettier --write ./src"
},
"dependencies": {
"mini-canvas-editor": "^0.0.1"
"mini-canvas-editor": "^0.0.1",
"mini-canvas-editor-canvas": "^0.0.1"
},
"devDependencies": {
"ts-loader": "^9.4.2",
"style-loader": "^3.3.1",
"css-loader": "^6.7.3",
"typescript": "^4.9.4",
"typescript": "^5.2.2",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1",
"prettier": "^2.8.7",
"@typescript-eslint/eslint-plugin": "^5.47.0",
"@typescript-eslint/parser": "^5.47.0",
"eslint": "^8.30.0"
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"eslint": "^8.51.0"
}
}
10 changes: 5 additions & 5 deletions editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
"scripts": {
"clean": "rm -rf lib && rm -rf build && rm -rf dist && rm -rf node_modules/.cache/rollup-plugin-typescript2",
"start": "rollup -c --watch",
"start:clean": "yarn clean && npm run start",
"build": "yarn clean && rollup -c",
"build": "pnpm clean && rollup -c",
"eslint": "eslint ./src --ext .ts",
"test": "karma start karma.conf.cjs",
"test:single": "karma start karma.conf.cjs --single-run",
Expand All @@ -48,15 +47,16 @@
"mini-canvas-editor-canvas": "^0.0.1"
},
"devDependencies": {
"tslib": "^2.6.2",
"rollup": "^4.0.2",
"rollup-plugin-dts": "^6.1.0",
"rollup-plugin-typescript2": "^0.36.0",
"@rollup/plugin-node-resolve": "^15.2.2",
"typescript": "^5.2.2",
"prettier": "^3.0.3",
"@typescript-eslint/eslint-plugin": "^5.47.0",
"@typescript-eslint/parser": "^5.47.0",
"eslint": "^8.30.0",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"eslint": "^8.51.0",
"karma": "^6.4.2",
"karma-chrome-launcher": "^3.2.0",
"karma-jasmine": "^5.1.0",
Expand Down
2 changes: 1 addition & 1 deletion editor/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"declarationDir": "./build/",
"moduleResolution": "node",
"lib": [
"es2015",
"es2017",
"dom"
]
}
Expand Down
16 changes: 5 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
{
"private": true,
"scripts": {
"build": "yarn workspaces run build",
"test:single": "yarn workspaces run test:single",
"eslint": "yarn workspaces run eslint",
"prettier": "yarn workspaces run prettier",
"prettier:fix": "yarn workspaces run prettier:fix",
"build": "pnpm run -r build",
"prettier": "pnpm run -r prettier",
"prettier:fix": "pnpm run -r prettier:fix",
"eslint": "pnpm run -r eslint",
"test:single": "pnpm run -r test:single",
"serve": "http-server -c-1 -p 4333 ./"
},
"workspaces": [
"canvas",
"editor",
"demos/svelte-app",
"demos/webpack-app"
],
"devDependencies": {
"http-server": "^14.1.1"
}
Expand Down
Loading

0 comments on commit a7f4020

Please sign in to comment.