Skip to content
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

ESM support for util and rlp #1948

Closed
wants to merge 5 commits into from
Closed

ESM support for util and rlp #1948

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
a8fc32a
migrate rlp/util to esm
acolytec3 Jun 9, 2022
73f5b47
Fix karma
acolytec3 Jun 9, 2022
a6f739b
Adjust tsconfig and add rollup build for util and rlp
acolytec3 Jun 9, 2022
2f34d8c
Tell ts-node to use CommonJS
acolytec3 Jun 9, 2022
d34ba0a
Tell eslint to ignore rollup config
acolytec3 Jun 9, 2022
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 change: 1 addition & 0 deletions config/eslint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module.exports = {
'prettier.config.js',
'typedoc.js',
'karma.conf.js',
'rollup.config.js'
],
extends: ['typestrict', 'eslint:recommended'],
rules: {
Expand Down
111 changes: 111 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions packages/rlp/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ module.exports = function (config) {
entrypoints: /\.spec\.ts$/,
},
tsconfig: './tsconfig.json',
compilerOptions: {
module: 'commonjs'
}
},
colors: true,
reporters: ['progress', 'karma-typescript'],
Expand Down
6 changes: 4 additions & 2 deletions packages/rlp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"src"
],
"main": "dist/index.js",
"types": "dist/index.d.ts",
"module": "dist/index.es.js",
"bin": {
"rlp": "bin/rlp"
},
"scripts": {
"build": "../../config/cli/ts-build.sh node",
"build": "rollup -c",
"prepublishOnly": "../../config/cli/prepublish.sh",
"clean": "../../config/cli/clean-package.sh",
"coverage": "../../config/cli/coverage.sh",
Expand All @@ -40,6 +40,8 @@
"karma-typescript": "^5.5.3",
"nyc": "^15.1.0",
"prettier": "^2.4.1",
"rollup": "^2.75.6",
"rollup-plugin-typescript2": "^0.32.1",
"tape": "^5.3.1",
"ts-node": "^10.2.1",
"typescript": "^4.4.2"
Expand Down
30 changes: 30 additions & 0 deletions packages/rlp/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import typescript from 'rollup-plugin-typescript2';

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

const globals = {
...packageJson.devDependencies,
...packageJson.dependencies
};

export default {
input: 'src/index.ts',
output: [
{
file: packageJson.main,
format: 'cjs', // commonJS
sourcemap: true,
},
{
file: packageJson.module,
format: 'esm', // ES Modules
sourcemap: true,
},
],
plugins: [
typescript({
useTsconfigDeclarationDir: true,
}),
],
external: Object.keys(globals),
};
7 changes: 6 additions & 1 deletion packages/rlp/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"extends": "../../config/tsconfig.json",
"include": ["src/**/*.ts", "test/**/*.ts"],
"compilerOptions": {
"target": "es2020"
"module": "ESNext"
},
"ts-node": {
"compilerOptions": {
"module": "CommonJS"
}
}
}
4 changes: 2 additions & 2 deletions packages/rlp/tsconfig.prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"extends": "../../config/tsconfig.prod.json",
"compilerOptions": {
"target": "es2020",
"rootDir": "./src",
"outDir": "./dist",
"composite": true
"composite": true,
"module": "ESNext"
},
"include": ["src/*.ts"]
}
5 changes: 4 additions & 1 deletion packages/util/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ module.exports = function(config) {
bundlerOptions: {
entrypoints: /\.spec\.ts$/
},
tsconfig: './tsconfig.json'
tsconfig: './tsconfig.json' ,
compilerOptions: {
module: 'commonjs'
}
},
colors: true,
reporters: ['progress', 'karma-typescript'],
Expand Down
7 changes: 4 additions & 3 deletions packages/util/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
"src"
],
"main": "dist/index.js",
"types": "dist/index.d.ts",
"browser": "dist.browser/index.js",
"module": "dist/index.es.js",
"scripts": {
"build": "npm run build:node && npm run build:browser",
"build": "rollup -c",
"build:node": "../../config/cli/ts-build.sh node",
"build:browser": "../../config/cli/ts-build.sh browser",
"prepublishOnly": "../../config/cli/prepublish.sh",
Expand All @@ -41,6 +40,8 @@
"rlp": "^3.0.0"
},
"devDependencies": {
"rollup": "^2.75.6",
"rollup-plugin-typescript2": "^0.32.1",
"@types/bn.js": "^5.1.0",
"@types/node": "^16.11.7",
"@types/secp256k1": "^4.0.1",
Expand Down
30 changes: 30 additions & 0 deletions packages/util/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import typescript from 'rollup-plugin-typescript2';

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

const externals = {
...packageJson.devDependencies,
...packageJson.dependencies
};

export default {
input: 'src/index.ts',
output: [
{
file: packageJson.main,
format: 'cjs', // commonJS
sourcemap: true,
},
{
file: packageJson.module,
format: 'esm', // ES Modules
sourcemap: true,
},
],
plugins: [
typescript({
useTsconfigDeclarationDir: true,
}),
],
external: [...Object.keys(externals), 'buffer', 'ethereum-cryptography/secp256k1', 'ethereum-cryptography/keccak', 'ethereum-cryptography/utils']
};
8 changes: 0 additions & 8 deletions packages/util/tsconfig.browser.json
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions packages/util/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"extends": "../../config/tsconfig.json",
"include": ["src/**/*.ts", "test/**/*.ts"],
"compilerOptions": {
"module":"ESNext"
},
"ts-node": {
"compilerOptions": {
"module": "CommonJS"
}
}
}
1 change: 1 addition & 0 deletions packages/util/tsconfig.prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"rootDir": "./src",
"outDir": "./dist",
"composite": true,
"module":"ESNext"
},
"include": ["src/**/*.ts"],
"references": [
Expand Down