|
9 | 9 | "main": "./lib/index.js", |
10 | 10 | "scripts": { |
11 | 11 | "build": "node build.mjs", |
| 12 | +<<<<<<< before updating |
12 | 13 | "clean": "rimraf dist", |
13 | 14 | "lint": "prettier --check \"src/**/*.js\" \"src/**/*.jsx\" \"src/style/*.css\" \"src/html/*.html\" \"*.mjs\" \"*.json\"", |
14 | 15 | "fix": "prettier --write \"src/**/*.js\" \"src/**/*.jsx\" \"src/style/*.css\" \"src/html/*.html\" \"*.mjs\" \"*.json\"", |
|
29 | 30 | "react-dom": "^19.2.4", |
30 | 31 | "react-icons": "^5.6.0", |
31 | 32 | "react-modern-drawer": "^1.4.0" |
| 33 | +======= |
| 34 | + "clean": "rm -rf dist playwright-report ../csp_gateway/extension", |
| 35 | + "dev": "npm-run-all -p start watch", |
| 36 | + "lint": "prettier --check \"src/**/*.{js,ts,jsx,tsx,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"", |
| 37 | + "fix": "prettier --write \"src/**/*.{js,ts,jsx,tsx,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"", |
| 38 | + "preinstall": "npx only-allow pnpm", |
| 39 | + "prepack": "npm run build", |
| 40 | + "start": "http-server -p 3000 -o examples/", |
| 41 | + "start:tests": "http-server -p 3000 ", |
| 42 | + "test": "TZ=UTC playwright test", |
| 43 | + "watch": "nodemon --watch src -e ts,css,html --exec \"pnpm build:debug\"" |
| 44 | +>>>>>>> after updating |
32 | 45 | }, |
33 | 46 | "devDependencies": { |
| 47 | +<<<<<<< before updating |
34 | 48 | "@finos/perspective-esbuild-plugin": "3.2.1", |
35 | 49 | "@prospective.co/procss": "^0.1.18", |
36 | 50 | "cpy": "^13.2.1", |
37 | 51 | "esbuild": "^0.27.3", |
38 | 52 | "npm-run-all": "^4.1.5", |
39 | 53 | "prettier": "^3.8.1" |
| 54 | +======= |
| 55 | + "@playwright/test": "^1.59.1", |
| 56 | + "cpy": "^13.2.1", |
| 57 | + "esbuild": "^0.27.4", |
| 58 | + "lightningcss": "^1.29.3", |
| 59 | + "http-server": "^14.1.1", |
| 60 | + "nodemon": "^3.1.10", |
| 61 | + "npm-run-all": "^4.1.5", |
| 62 | + "prettier": "^3.8.1", |
| 63 | + "typescript": "^6.0.2" |
| 64 | +>>>>>>> after updating |
40 | 65 | } |
41 | 66 | } |
0 commit comments