Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,361 changes: 705 additions & 656 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions packages/decap-cms-backend-azure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
},
"dependencies": {
"js-base64": "^3.0.0",
"path-browserify": "^1.0.1",
"semaphore": "^1.1.0"
},
"peerDependencies": {
Expand All @@ -33,5 +34,8 @@
"lodash": "^4.17.11",
"prop-types": "^15.7.2",
"react": "^19.1.0"
},
"browser": {
"path": "path-browserify"
}
}
5 changes: 5 additions & 0 deletions packages/decap-cms-backend-bitbucket/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
"dependencies": {
"common-tags": "^1.8.0",
"js-base64": "^3.0.0",
"minimatch": "^7.0.0",
"path-browserify": "^1.0.1",
"semaphore": "^1.1.0",
"what-the-diff": "^0.6.0"
},
Expand All @@ -34,5 +36,8 @@
"lodash": "^4.17.11",
"prop-types": "^15.7.2",
"react": "^19.1.0"
},
"browser": {
"path": "path-browserify"
}
}
5 changes: 1 addition & 4 deletions packages/decap-cms-backend-git-gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"gotrue-js": "^0.9.24",
"ini": "^2.0.0",
"jwt-decode": "^3.0.0",
"minimatch": "^3.0.4"
"minimatch": "^7.0.0"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
Expand All @@ -37,8 +37,5 @@
"lodash": "^4.17.11",
"prop-types": "^15.7.2",
"react": "^19.1.0"
},
"devDependencies": {
"@types/minimatch": "^5.1.2"
}
}
4 changes: 4 additions & 0 deletions packages/decap-cms-backend-github/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"graphql": "^15.0.0",
"graphql-tag": "^2.10.1",
"js-base64": "^3.0.0",
"path-browserify": "^1.0.1",
"semaphore": "^1.1.0"
},
"peerDependencies": {
Expand All @@ -39,5 +40,8 @@
"lodash": "^4.17.11",
"prop-types": "^15.7.2",
"react": "^19.1.0"
},
"browser": {
"path": "path-browserify"
}
}
4 changes: 4 additions & 0 deletions packages/decap-cms-backend-gitlab/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"apollo-link-context": "^1.0.18",
"apollo-link-http": "^1.5.15",
"js-base64": "^3.0.0",
"path-browserify": "^1.0.1",
"semaphore": "^1.1.0"
},
"peerDependencies": {
Expand All @@ -36,5 +37,8 @@
"lodash": "^4.17.11",
"prop-types": "^15.7.2",
"react": "^19.1.0"
},
"browser": {
"path": "path-browserify"
}
}
6 changes: 6 additions & 0 deletions packages/decap-cms-backend-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"build": "cross-env NODE_ENV=production webpack",
"build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore \"**/__tests__\" --root-mode upward --extensions \".js,.jsx,.ts,.tsx\""
},
"dependencies": {
"path-browserify": "^1.0.1"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
Expand All @@ -26,5 +29,8 @@
"prop-types": "^15.7.2",
"react": "^19.1.0",
"uuid": "^8.3.2"
},
"browser": {
"path": "path-browserify"
}
}
6 changes: 6 additions & 0 deletions packages/decap-cms-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"@iarna/toml": "2.2.5",
"@reduxjs/toolkit": "^1.9.1",
"@vercel/stega": "^0.1.2",
"buffer": "^6.0.3",
"clean-stack": "^5.2.0",
"copy-text-to-clipboard": "^3.0.0",
"dayjs": "^1.11.10",
Expand All @@ -40,6 +41,7 @@
"js-base64": "^3.0.0",
"jwt-decode": "^3.0.0",
"node-polyglot": "^2.3.0",
"path-browserify": "^1.0.1",
"prop-types": "^15.7.2",
"react": "^19.1.0",
"react-dnd": "^14.0.0",
Expand Down Expand Up @@ -90,8 +92,12 @@
},
"devDependencies": {
"@types/history": "^4.7.8",
"@types/iarna__toml": "^2.0.5",
"@types/redux-mock-store": "^1.0.2",
"@types/url-join": "^4.0.0",
"redux-mock-store": "^1.5.3"
},
"browser": {
"path": "path-browserify"
}
}
1 change: 1 addition & 0 deletions packages/decap-cms-core/src/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import './lib/polyfill';
import React from 'react';
import { createRoot } from 'react-dom/client';
import { Provider, connect } from 'react-redux';
Expand Down
4 changes: 2 additions & 2 deletions packages/decap-cms-core/src/formats/toml.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import toml from '@iarna/toml';
import parseToml from '@iarna/toml/parse-string';
import tomlify from 'tomlify-j0.4';
import dayjs from 'dayjs';

Expand All @@ -24,7 +24,7 @@ function outputReplacer(_key: string, value: unknown) {

export default {
fromFile(content: string) {
return toml.parse(content);
return parseToml(content);
},

toFile(data: object, sortedKeys: string[] = []) {
Expand Down
9 changes: 9 additions & 0 deletions packages/decap-cms-core/src/lib/polyfill.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Buffer } from 'buffer';

if (typeof window !== 'undefined') {
// Polyfill global for packages like @iarna/toml
window.global = window;

// Polyfill Buffer for packages like gray-matter
window.Buffer = Buffer;
}
6 changes: 5 additions & 1 deletion packages/decap-cms-lib-widgets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@
"build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore \"**/__tests__\" --root-mode upward --extensions \".js,.jsx,.ts,.tsx\""
},
"dependencies": {
"dayjs": "^1.11.10"
"dayjs": "^1.11.10",
"path-browserify": "^1.0.1"
},
"peerDependencies": {
"immutable": "^3.7.6",
"lodash": "^4.17.11"
},
"browser": {
"path": "path-browserify"
}
}
4 changes: 3 additions & 1 deletion packages/decap-cms-widget-markdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore \"**/__tests__\" --root-mode upward"
},
"dependencies": {
"detab": "^2.0.4",
"dompurify": "^2.2.6",
"is-hotkey": "^0.2.0",
"is-url": "^1.2.4",
Expand All @@ -43,7 +44,8 @@
"slate-soft-break": "^0.9.0",
"unified": "^9.2.0",
"unist-builder": "^1.0.3",
"unist-util-visit-parents": "^2.0.1"
"unist-util-visit-parents": "^2.0.1",
"vfile-location": "^2.0.6"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
Expand Down
5 changes: 0 additions & 5 deletions scripts/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,6 @@ function baseConfig({ target = isProduction ? 'umd' : 'umddir' } = {}) {
},
resolve: {
extensions: ['.ts', '.tsx', '.js', '.json'],
fallback: {
path: require.resolve('path-browserify'),
stream: require.resolve('stream-browserify'),
buffer: require.resolve('buffer'),
},
},
plugins: Object.values(plugins()).map(plugin => plugin()),
devtool: isTest ? '' : 'source-map',
Expand Down
Loading