Skip to content

feat: update rollup to v4, use esbuild to minify instead of terser #1631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 21, 2024
Merged

feat: update rollup to v4, use esbuild to minify instead of terser #1631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c013a17
feat: update rollup to v4, use esbuild to minify instead of terser
dziraf Feb 20, 2024
2e92ca1
chore: use node v20 in GH actions
dziraf Feb 20, 2024
a8ecbaf
chore: use tsx instead of ts-node for mocha
dziraf Feb 20, 2024
4cd6dad
chore: downgrade gh actions to node v18
dziraf Feb 20, 2024
db7e740
chore: use @babel/plugin-syntax-import-assertions
dziraf Feb 20, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '18.17'
Copy link
Contributor Author

@dziraf dziraf Feb 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mocha fails with random error on higher node versions

cache: 'yarn'
- name: Install
run: yarn install --frozen-lockfile
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Setup
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '18.17'
cache: 'yarn'
- name: Install
run: yarn install
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Setup
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '18.17'
cache: 'yarn'
- name: Install
run: yarn install
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
- name: Setup
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '18.17'
cache: 'yarn'
- name: Install
run: yarn install
Expand Down
3 changes: 3 additions & 0 deletions bin/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import bundler from '../lib/backend/bundler/app.bundler.js'

await bundler.build()
72 changes: 0 additions & 72 deletions bin/bundle-globals.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions bin/globals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import bundler from '../lib/backend/bundler/globals.bundler.js'

await bundler.build()
36 changes: 0 additions & 36 deletions bin/watch-dev.js
View file
Open in desktop

This file was deleted.

61 changes: 29 additions & 32 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"import": "./index.js",
"require": "./index.js"
},
"./bundler": {
"import": "./lib/backend/bundler/config.js"
}
"./bundler": "./lib/backend/bundler/index.js"
},
"scripts": {
"test": "mocha --loader=ts-node/esm ./spec/index.js",
Expand All @@ -21,11 +19,11 @@
"lint": "eslint './spec/**/*' './src/**/*' './cy/**/*' './*'",
"cover": "NODE_ENV=test nyc --reporter=lcov --reporter=text-lcov npm test",
"codecov": "NODE_ENV=test nyc --reporter=text-lcov npm test | codecov --pipe",
"bundle": "node bin/watch-dev.js",
"bundle:globals": "node bin/bundle-globals.js",
"bundle": "node bin/app.js",
"bundle:globals": "node bin/globals.js",
"cspell": "cspell src/**/*.ts src/**/*.js src/**/*.tsx src/**/*.jsx",
"check:all": "yarn types && yarn cspell && yarn lint && yarn test && ONCE=true yarn bundle && ONCE=true NODE_ENV=production yarn bundle",
"dev": "yarn build && yarn types && yarn bundle:globals && ONCE=true yarn bundle",
"check:all": "yarn types && yarn cspell && yarn lint && yarn test && yarn bundle && NODE_ENV=production yarn bundle",
"dev": "yarn build && yarn types && yarn bundle:globals && yarn bundle && NODE_ENV=production yarn bundle:globals && NODE_ENV=production yarn bundle",
"release": "semantic-release"
},
"bin": {
Expand Down Expand Up @@ -87,23 +85,22 @@
},
"homepage": "https://github.com/SoftwareBrothers/adminjs#readme",
"dependencies": {
"@adminjs/design-system": "^4.0.0",
"@babel/core": "^7.21.0",
"@babel/parser": "^7.21.0",
"@babel/plugin-syntax-import-assertions": "^7.20.0",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.0",
"@babel/register": "^7.21.0",
"@adminjs/design-system": "^4.0.3",
"@babel/core": "^7.23.9",
"@babel/parser": "^7.23.9",
"@babel/plugin-syntax-import-assertions": "^7.23.3",
"@babel/plugin-transform-runtime": "^7.23.9",
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@babel/register": "^7.23.7",
"@hello-pangea/dnd": "^16.2.0",
"@redux-devtools/extension": "^3.2.5",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-commonjs": "^24.0.1",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-replace": "^5.0.2",
"@rollup/plugin-terser": "^0.4.0",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.5",
"axios": "^1.3.4",
"commander": "^10.0.0",
"flat": "^5.0.2",
Expand All @@ -124,26 +121,28 @@
"react-router": "^6.9.0",
"react-router-dom": "^6.9.0",
"redux": "^4.2.1",
"rollup": "^3.15.0",
"rollup-plugin-polyfill-node": "^0.12.0",
"regenerator-runtime": "^0.14.1",
"rollup": "^4.11.0",
"rollup-plugin-esbuild-minify": "^1.1.1",
"rollup-plugin-polyfill-node": "^0.13.0",
"slash": "^5.0.0",
"uuid": "^9.0.0",
"xss": "^1.0.14"
},
"devDependencies": {
"@babel/cli": "^7.21.0",
"@babel/cli": "^7.23.9",
"@commitlint/cli": "^17.5.0",
"@commitlint/config-conventional": "^17.4.4",
"@semantic-release/git": "^10.0.1",
"@testing-library/react": "^14.0.0",
"@types/babel-core": "^6.25.7",
"@types/babel-core": "^6.25.10",
"@types/chai": "^4.3.4",
"@types/chai-as-promised": "^7.1.5",
"@types/factory-girl": "^5.0.8",
"@types/flat": "^5.0.2",
"@types/lodash": "^4.14.194",
"@types/mocha": "^10.0.1",
"@types/node": "^18.15.11",
"@types/node": "^20.6.0",
"@types/qs": "^6.9.7",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
Expand All @@ -155,7 +154,7 @@
"chai": "^4.3.7",
"chai-as-promised": "^7.1.1",
"chai-change": "^2.1.2",
"core-js": "^3.29.1",
"core-js": "^3.36.0",
"cspell": "^6.30.2",
"eslint": "^8.36.0",
"eslint-config-airbnb": "^19.0.4",
Expand All @@ -166,21 +165,19 @@
"eslint-plugin-react-hooks": "^4.6.0",
"factory-girl": "^5.0.4",
"husky": "^8.0.3",
"istanbul": "^0.4.5",
"jsdom": "^21.1.1",
"jsdom-global": "^3.0.2",
"mocha": "^10.2.0",
"node-esm-import-all": "^1.0.0",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"semantic-release": "^20.1.3",
"semantic-release-slack-bot": "^4.0.0",
"sinon": "^15.0.2",
"sinon-chai": "^3.7.0",
"typescript": "^5.0.2"
"ts-node": "10.8.1",
"typescript": "^5.3.3"
},
"resolutions": {
"@babel/core": "7.21.0",
"react-redux": "8.0.5",
"redux": "4.2.1"
}
Expand Down
Loading