Skip to content

Commit 85de82c

Browse files
committed
fix: fix display of replaced items
1 parent ba0b79b commit 85de82c

24 files changed

+6163
-412
lines changed

.babelrc.js

-14
This file was deleted.

.browserslistrc

+4-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
defaults
1+
Chrome >=87
2+
Firefox >=78
3+
Safari >=14
4+
Edge >=88

.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ end_of_line = lf
88
charset = utf-8
99
trim_trailing_whitespace = true
1010
insert_final_newline = true
11+
quote_type = single
1112

1213
[*.md]
1314
trim_trailing_whitespace = false

.eslintrc.cjs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
root: true,
3+
extends: [require.resolve('@gera2ld/plaid-common-ts/eslint')],
4+
parserOptions: {
5+
project: './tsconfig.json',
6+
},
7+
};

.eslintrc.js

-10
This file was deleted.

.github/workflows/main.yml

+19-17
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,25 @@ on:
77

88
jobs:
99
build:
10-
1110
runs-on: ubuntu-latest
1211

1312
steps:
14-
- uses: actions/checkout@v2
15-
with:
16-
persist-credentials: false
17-
- uses: actions/setup-node@v2
18-
with:
19-
node-version: '16'
20-
- name: Build
21-
run: yarn && yarn build:demo
22-
- name: Deploy to GitHub Pages
23-
uses: JamesIves/github-pages-deploy-action@releases/v3
24-
with:
25-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26-
BASE_BRANCH: main
27-
BRANCH: gh-pages
28-
FOLDER: dist/demo
29-
SINGLE_COMMIT: true
13+
- uses: actions/checkout@v2
14+
with:
15+
persist-credentials: false
16+
- uses: actions/setup-node@v3
17+
with:
18+
node-version: '16'
19+
- uses: pnpm/action-setup@v2
20+
with:
21+
version: 8
22+
- name: Build
23+
run: pnpm i && pnpm demo
24+
- name: Deploy to GitHub Pages
25+
uses: JamesIves/github-pages-deploy-action@releases/v3
26+
with:
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
BASE_BRANCH: main
29+
BRANCH: gh-pages
30+
FOLDER: dist/demo
31+
SINGLE_COMMIT: true

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
node_modules
22
*.log
3-
*.lock
43
/.idea
54
/dist
65
/.nyc_output
76
/coverage
87
/types
9-
/pnpm-lock.yaml

.npmrc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
shamefully-hoist = true
2+
strict-peer-dependencies = false

.postcssrc.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import config from '@gera2ld/plaid/config/postcssrc.js';
2+
3+
export default config;

README.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ $ yarn add react-deep-diff
2222
import { DeepDiff } from 'react-deep-diff';
2323

2424
function App() {
25-
return (
26-
<DeepDiff
27-
className="my-diff"
28-
obj1={obj1}
29-
obj2={obj2}
30-
/>
31-
);
25+
return <DeepDiff className="my-diff" obj1={obj1} obj2={obj2} />;
3226
}
3327
```

gulpfile.js

-55
This file was deleted.

package.json

+26-28
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@
66
"license": "MIT",
77
"scripts": {
88
"prepare": "husky install",
9-
"dev": "gulp dev",
10-
"build:demo": "cross-env NODE_ENV=production gulp build",
11-
"clean": "del-cli dist types",
12-
"build:js": "cross-env NODE_ENV=production rollup -c rollup.conf.js",
13-
"prebuild": "run-s ci clean",
14-
"build": "run-s ci clean build:types build:js",
9+
"dev": "vite dev",
10+
"build:types": "tsc -p tsconfig.prod.json",
11+
"build:js": "vite build",
12+
"build": "run-s build:*",
1513
"prepublishOnly": "run-s build",
16-
"ci": "run-s lint",
17-
"lint": "eslint --ext .ts,tsx src",
18-
"build:types": "tsc -p tsconfig.prod.json"
14+
"prettier": "prettier --ignore-path .eslintignore --plugin-search-dir=.",
15+
"format": "run-s 'prettier -- --write .'",
16+
"lint:format": "run-s 'prettier -- --check .'",
17+
"lint:js": "eslint --ext .ts,tsx src",
18+
"lint": "run-s lint:*"
1919
},
20-
"main": "dist/index.common.js",
21-
"module": "dist/index.esm.js",
20+
"type": "module",
21+
"main": "dist/react-deep-diff.js",
22+
"module": "dist/react-deep-diff.js",
2223
"files": [
2324
"dist",
2425
"types"
@@ -34,26 +35,23 @@
3435
},
3536
"typings": "types/index.d.ts",
3637
"dependencies": {
37-
"@babel/runtime": "^7.15.3",
38+
"@babel/runtime": "^7.21.5",
3839
"@gera2ld/deepdiff": "^0.2.2",
39-
"@gera2ld/format-json": "^0.2.3",
40-
"prismjs": "^1.24.1"
40+
"@gera2ld/format-json": "^0.3.0",
41+
"prismjs": "^1.29.0"
4142
},
4243
"devDependencies": {
43-
"@gera2ld/plaid": "~2.4.0",
44-
"@gera2ld/plaid-common-react": "~2.4.0",
45-
"@gera2ld/plaid-common-ts": "~2.4.0",
46-
"@gera2ld/plaid-rollup": "~2.4.0",
47-
"@types/react": "^17.0.19",
48-
"@types/react-dom": "^17.0.9",
49-
"del-cli": "^4.0.1",
50-
"fancy-log": "^1.3.3",
51-
"gulp": "^4.0.2",
52-
"gulp-replace": "^1.1.3",
53-
"husky": "^7.0.2",
54-
"react": "^17.0.2",
55-
"react-dom": "^17.0.2",
56-
"rollup-plugin-browsersync": "^1.3.3"
44+
"@gera2ld/plaid": "~2.5.9",
45+
"@gera2ld/plaid-common-react": "~2.5.9",
46+
"@gera2ld/plaid-common-ts": "~2.5.9",
47+
"@gera2ld/plaid-rollup": "~2.5.9",
48+
"@types/react": "^18.2.6",
49+
"@types/react-dom": "^18.2.4",
50+
"@vitejs/plugin-react": "^4.0.0",
51+
"husky": "^8.0.3",
52+
"react": "^18.2.0",
53+
"react-dom": "^18.2.0",
54+
"vite": "^4.3.8"
5755
},
5856
"peerDependencies": {
5957
"react": "*"

0 commit comments

Comments
 (0)