Skip to content

Commit

Permalink
feat: upgrading rollup to latest version [TOL-2097] (#559)
Browse files Browse the repository at this point in the history 
* chore: upgrading rollup to latest version []

* chore: remove unsupported sourcemaps package

* chore: update jest & snapshots to fix tests

* chore: undo lerna upgrade for later PR

* chore: fix tests
  • Loading branch information
@2wce
2wce authored May 22, 2024
1 parent e525b69 commit f14d197
Show file tree
Hide file tree
Showing 14 changed files with 3,885 additions and 4,276 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@

# test reports
reports

# nx specific
.nx/
14 changes: 8 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,30 +43,32 @@
"trailingComma": "all"
},
"devDependencies": {
"@types/rollup-plugin-json": "^3.0.7",
"@commitlint/cli": "19.0.3",
"@commitlint/config-conventional": "17.4.2",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "15.2.3",
"@types/benchmark": "^2.1.4",
"@types/faker": "^4.1.12",
"@types/jest": "^27.0.1",
"benchmark": "^2.1.4",
"commitizen": "4.3.0",
"git-cz": "^4.9.0",
"husky": "^8.0.0",
"jest": "29.7.0",
"lerna": "^6.0.3",
"lint-staged": "13.0.3",
"prettier": "^2.7.1",
"rollup": "^1.32.1",
"rollup-plugin-commonjs": "^9.3.4",
"rollup": "^3.2.5",
"rollup-plugin-copy": "3.5.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^4.2.4",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-typescript2": "^0.36.0",
"ts-jest": "^29.1.2",
"ts-node": "^8.10.2",
"ts-node": "10.9.2",
"tslint-config-prettier": "^1.18.0",
"tslint-config-standard": "^8.0.1",
"typescript": "^5.3.2",
"jest-junit": "15.0.0"
"jest-junit": "16.0.0"
},
"dependencies": {}
}
14 changes: 2 additions & 12 deletions packages/contentful-slatejs-adapter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"scripts": {
"lint": "tslint -t codeFrame 'src/**/*.ts' 'test/**/*.ts'",
"prebuild": "rimraf dist",
"build": "tsc && rollup -c rollup.config.ts",
"start": "rollup -c rollup.config.ts -w",
"build": "tsc && rollup -c --bundleConfigAsCjs rollup.config.ts",
"start": "rollup -c --bundleConfigAsCjs rollup.config.ts -w",
"test": "jest",
"test:watch": "jest --watch",
"test:prod": "yarn test -- --coverage --no-cache",
Expand All @@ -33,25 +33,15 @@
"devDependencies": {
"@types/jest": "^27.0.1",
"@types/node": "^10.0.3",
"@types/rollup-plugin-json": "^3.0.3",
"colors": "^1.1.2",
"coveralls": "^3.0.0",
"cross-env": "^5.0.1",
"cz-conventional-changelog": "^2.0.0",
"faker": "^4.1.0",
"husky": "^2.7.0",
"jest": "^27.1.0",
"lodash.camelcase": "^4.3.0",
"prompt": "^1.0.0",
"rimraf": "^2.6.1",
"rollup": "^2.79.0",
"rollup-plugin-commonjs": "^9.0.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^4.2.4",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-typescript2": "^0.36.0",
"ts-jest": "^29.1.2",
"ts-node": "^6.0.0",
"typescript": "^5.3.2"
},
"publishConfig": {
Expand Down
10 changes: 3 additions & 7 deletions packages/contentful-slatejs-adapter/rollup.config.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import sourceMaps from 'rollup-plugin-sourcemaps';
import typescript from 'rollup-plugin-typescript2';
import commonjs from '@rollup/plugin-commonjs';
import resolve from '@rollup/plugin-node-resolve';
import json from 'rollup-plugin-json';
import typescript from 'rollup-plugin-typescript2';

const pkg = require('./package.json');

Expand All @@ -25,9 +24,6 @@ const options = {
// which external modules to include in the bundle
// https://github.com/rollup/rollup-plugin-node-resolve#usage
resolve(),

// Resolve source maps to the original source
sourceMaps(),
],
};

Expand Down
11 changes: 2 additions & 9 deletions packages/rich-text-from-markdown/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
},
"scripts": {
"prebuild": "rimraf dist",
"build": "tsc --module commonjs && rollup -c rollup.config.js",
"start": "tsc && rollup -c rollup.config.js -w",
"build": "tsc --module commonjs && rollup -c --bundleConfigAsCjs rollup.config.js",
"start": "tsc && rollup -c --bundleConfigAsCjs rollup.config.js -w",
"lint": "tslint -t codeFrame '@(src|bin)/*.ts'",
"test": "jest"
},
Expand All @@ -44,14 +44,7 @@
"devDependencies": {
"@types/lodash": "^4.14.172",
"faker": "^4.1.0",
"jest": "^27.1.0",
"rimraf": "^2.6.3",
"rollup": "^1.32.1",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^4.2.4",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-typescript2": "^0.36.0",
"ts-jest": "^29.1.2",
"tslint": "^6.1.3",
"typescript": "^5.3.2"
Expand Down
11 changes: 2 additions & 9 deletions packages/rich-text-html-renderer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"scripts": {
"prebuild": "rimraf dist",
"build": "tsc --module commonjs && rollup -c rollup.config.js",
"start": "tsc && rollup -c rollup.config.js -w",
"build": "tsc --module commonjs && rollup -c --bundleConfigAsCjs rollup.config.js",
"start": "tsc && rollup -c --bundleConfigAsCjs rollup.config.js -w",
"lint": "tslint -t codeFrame '@(src|bin)/*.ts'",
"test": "jest"
},
Expand All @@ -32,15 +32,8 @@
"devDependencies": {
"@types/escape-html": "^0.0.20",
"@types/lodash.clonedeep": "^4.5.6",
"jest": "^27.1.0",
"lodash.clonedeep": "^4.5.0",
"rimraf": "^2.6.3",
"rollup": "^1.32.1",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^4.2.3",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-typescript2": "^0.36.0",
"ts-jest": "^29.1.2",
"tslint": "^6.1.3",
"typescript": "^5.3.2"
Expand Down
11 changes: 2 additions & 9 deletions packages/rich-text-links/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,17 @@
"registry": "https://npm.pkg.github.com/"
},
"scripts": {
"build": "tsc --module commonjs && rollup -c rollup.config.js",
"build": "tsc --module commonjs && rollup -c --bundleConfigAsCjs rollup.config.js",
"prebuild": "rimraf dist",
"start": "tsc && rollup -c rollup.config.js -w",
"start": "tsc && rollup -c --bundleConfigAsCjs rollup.config.js -w",
"lint": "tslint -t codeFrame '@(src|bin)/*.ts'",
"test": "jest"
},
"dependencies": {
"@contentful/rich-text-types": "^16.3.5"
},
"devDependencies": {
"jest": "^27.1.0",
"rimraf": "^2.6.3",
"rollup": "^1.32.1",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^4.2.4",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-typescript2": "^0.36.0",
"ts-jest": "^29.1.2",
"tslint": "^6.1.3",
"typescript": "^5.3.2"
Expand Down
11 changes: 2 additions & 9 deletions packages/rich-text-plain-text-renderer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,17 @@
"registry": "https://npm.pkg.github.com/"
},
"scripts": {
"build": "tsc --module commonjs && rollup -c rollup.config.js",
"build": "tsc --module commonjs && rollup -c --bundleConfigAsCjs rollup.config.js",
"prebuild": "rimraf dist",
"start": "tsc && rollup -c rollup.config.js -w",
"start": "tsc && rollup -c --bundleConfigAsCjs rollup.config.js -w",
"lint": "tslint -t codeFrame '@(src|bin)/*.ts'",
"test": "jest"
},
"dependencies": {
"@contentful/rich-text-types": "^16.3.5"
},
"devDependencies": {
"jest": "^27.1.0",
"rimraf": "^2.6.3",
"rollup": "^1.32.1",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^4.2.4",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-typescript2": "^0.36.0",
"ts-jest": "^29.1.2",
"tslint": "^6.1.3",
"typescript": "^5.3.2"
Expand Down
11 changes: 2 additions & 9 deletions packages/rich-text-react-renderer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"scripts": {
"prebuild": "rimraf dist",
"build": "tsc --module commonjs && rollup -c rollup.config.js",
"start": "tsc && rollup -c rollup.config.js -w",
"build": "tsc --module commonjs && rollup -c --bundleConfigAsCjs rollup.config.js",
"start": "tsc && rollup -c --bundleConfigAsCjs rollup.config.js -w",
"lint": "tslint -t codeFrame '@(src|bin)/*.ts'",
"test": "jest"
},
Expand All @@ -35,16 +35,9 @@
"devDependencies": {
"@types/react": "^16.8.15",
"@types/react-dom": "^16.8.4",
"jest": "^27.1.0",
"react": "^16.4.1",
"react-dom": "^16.4.1",
"rimraf": "^2.6.3",
"rollup": "^1.32.1",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^4.2.4",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-typescript2": "^0.36.0",
"ts-jest": "^29.1.2",
"tslint": "^6.1.3",
"typescript": "^5.3.2"
Expand Down
Loading

0 comments on commit f14d197

Please sign in to comment.