Skip to content

Commit

Permalink
feat: update packages to esm (#135)
Browse files Browse the repository at this point in the history
* feat: esm ssi-snap-types

* feat: esm connector

* fix: add readme to output

* chore: update connector deps

* chore: lintstaged.cjs

* chore: more lintstaged.cjs

* chore: connector lintstaged.cjs

* feat: esm vcmanager and update configs

* feat: esm utils

* feat: update tests

* chore: deps

* fix: build dapp

* fix: docs

* fix: fixes config issues

* fix: fixes config issues

* fix: resolve last issues
  • Loading branch information
martines3000 authored and pseudobun committed Apr 6, 2023
1 parent 10dd843 commit fb7f759
Show file tree
Hide file tree
Showing 71 changed files with 1,020 additions and 1,537 deletions.
34 changes: 29 additions & 5 deletions .eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,36 @@ module.exports = {
extends: [
'airbnb-base',
'airbnb-typescript/base',
'plugin:jest/recommended',
'plugin:jest/style',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'plugin:prettier/recommended',
],
plugins: ['@typescript-eslint/eslint-plugin', 'unused-imports'],
overrides: [
{
files: [
'**/*.spec.ts',
'**/*.e2e-spec.ts',
'**/test/**',
'**/tests/**',
'**/__tests__/**',
'**/*.spec.ts',
],
plugins: ['jest'],
extends: ['plugin:jest/recommended', 'plugin:jest/style'],
rules: {
'jest/prefer-expect-assertions': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
},
env: { jest: true },
},
],
plugins: [
'@typescript-eslint/eslint-plugin',
'unused-imports',
'jest-extended',
],
parser: '@typescript-eslint/parser',
rules: {
// other rules
Expand Down Expand Up @@ -41,17 +64,18 @@ module.exports = {
'**/*.spec.ts',
'**/*.e2e-spec.ts',
'**/webpack.config.ts',
'tsup.config.ts',
'**/tsup.config.ts',
'**/jest.d.ts',
],
},
],

// for prettier
'prettier/prettier': ['error', { singleQuote: true }],
},
ignorePatterns: [
'**/node_modules/**',
'**/dist/**',
'**/!.eslintrc.js',
'**/!.eslintrc.cjs',
'**/coverage/**',
'**/build/**',
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ CHANGELOG.md
pnpm-lock.yaml
pnpm-workspace.yaml
out
.next
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/vcmanager/.eslintrc.js → libs/utils/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = {
root: true,
extends: ['../../.eslintrc.js'],
extends: ['../../.eslintrc.cjs'],
parserOptions: {
tsconfigRootDir: __dirname,
project: './tsconfig.eslint.json',
sourceType: 'module',
tsconfigRootDir: __dirname,
},
};
File renamed without changes.
16 changes: 9 additions & 7 deletions libs/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@
"email": "[email protected]",
"url": "https://blockchain-lab.um.si"
},
"main": "dist/index.js",
"module": "dist/index.js",
"types": "dist/index.d.ts",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
"source": "./src/index.ts",
"types": "./dist/index.d.ts",
"files": [
"dist/",
"package.json",
"dist/**",
"README.md",
"LICENSE"
"package.json"
],
"scripts": {
"build": "pnpm clean && pnpm compile",
Expand All @@ -32,7 +33,8 @@
"lint:prettier": "prettier . --check"
},
"devDependencies": {
"rimraf": "^3.0.2",
"rimraf": "^4.4.0",
"tsup": "^6.6.3",
"typescript": "^4.9.5"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion libs/utils/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './result';
export * from './result.js';
7 changes: 1 addition & 6 deletions libs/utils/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"extends": "./tsconfig.json",
"exclude": [
// Exclude all test files
"tests/**/*",
"*.spec.ts"
]
"extends": "./tsconfig.json"
}
2 changes: 1 addition & 1 deletion libs/utils/tsconfig.eslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "./tsconfig.json",
"include": ["**/*", ".eslintrc.js"]
"include": ["**/*", ".eslintrc.cjs"]
}
14 changes: 9 additions & 5 deletions libs/utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"experimentalDecorators": true,
"target": "ES2020",
"module": "ES2020",
"moduleResolution": "nodenext",

"outDir": "./dist",
"baseUrl": ".",
"typeRoots": ["./node_modules/@types", "../../node_modules/@types"],

"declaration": true,
"inlineSourceMap": true
"inlineSourceMap": true,
"incremental": false,
"removeComments": true
},
"files": [],
"include": ["src/**/*", "tests/**/*"]
"include": ["src/**/*.ts"]
}
14 changes: 14 additions & 0 deletions libs/utils/tsup.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Options, defineConfig } from 'tsup';

export default defineConfig((options: Options) => ({
target: 'es2020',
treeshake: true,
splitting: true,
tsconfig: './tsconfig.build.json',
entry: ['src/**/*.ts'],
format: 'esm',
dts: true,
minify: false,
clean: true,
...options,
}));
21 changes: 9 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
"@commitlint/cli": "^17.4.4",
"@commitlint/config-conventional": "^17.4.4",
"@ianvs/prettier-plugin-sort-imports": "^3.7.1",
"@nrwl/devkit": "15.8.3",
"@nrwl/jest": "15.8.3",
"@nrwl/devkit": "15.8.7",
"@nrwl/jest": "15.8.7",
"@nrwl/nx-cloud": "^15.2.3",
"@types/eslint": "^8.21.3",
"@types/eslint": "^8.21.2",
"@types/jest": "^29.5.0",
"@types/node": "^18.15.3",
"@typescript-eslint/eslint-plugin": "^5.55.0",
Expand All @@ -70,18 +70,17 @@
"eslint-config-prettier": "^8.7.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-jest-extended": "^2.0.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-webpack-plugin": "^4.0.0",
"husky": "^8.0.3",
"is-ci": "^3.0.1",
"jest": "^29.5.0",
"lint-staged": "^13.2.0",
"nx": "15.7.2",
"prettier": "^2.8.5",
"nx": "15.8.7",
"prettier": "^2.8.4",
"prettier-plugin-packagejson": "^2.4.3",
"ts-node": "^10.9.1",
"typescript": "^4.9.5",
"webpack": "^5.76.2"
"typescript": "^4.9.5"
},
"packageManager": "[email protected]",
"engines": {
Expand All @@ -93,9 +92,7 @@
},
"pnpm": {
"patchedDependencies": {
"[email protected]": "patches/[email protected]",
"@veramo/[email protected]": "patches/@[email protected]"
},
"allowNonAppliedPatches": true
"[email protected]": "patches/[email protected]"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
root: true,
extends: ['../../.eslintrc.js'],
extends: ['../../.eslintrc.cjs'],
parserOptions: {
project: './tsconfig.eslint.json',
sourceType: 'module',
Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions packages/connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
"email": "[email protected]",
"url": "https://blockchain-lab.um.si"
},
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.mjs",
"module": "./dist/index.js",
"source": "./src/index.ts",
"types": "./dist/index.d.ts",
"files": [
"dist/",
"dist/**",
"README.md",
"package.json",
"LICENSE"
"package.json"
],
"scripts": {
"build": "pnpm clean && pnpm compile",
Expand All @@ -42,11 +42,11 @@
"@blockchain-lab-um/ssi-snap-types": "*",
"@blockchain-lab-um/utils": "*",
"@metamask/detect-provider": "^2.0.0",
"@veramo/core": "^5.0.0"
"@veramo/core": "^5.1.2"
},
"devDependencies": {
"@ianvs/prettier-plugin-sort-imports": "^3.7.1",
"@types/rimraf": "^3.0.2",
"@types/rimraf": "^4.0.5",
"@typescript-eslint/eslint-plugin": "^5.53.0",
"@typescript-eslint/parser": "^5.53.0",
"eslint": "^8.34.0",
Expand All @@ -56,7 +56,7 @@
"eslint-plugin-unused-imports": "^2.0.0",
"prettier": "^2.8.4",
"prettier-plugin-packagejson": "^2.4.3",
"rimraf": "^3.0.2",
"rimraf": "^4.4.0",
"tsup": "^6.6.3",
"typescript": "^4.9.5"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/connector/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import {
import { Result, ResultObject, isError } from '@blockchain-lab-um/utils';
import detectEthereumProvider from '@metamask/detect-provider';

import { MetaMaskSSISnap } from './snap';
import { MetaMaskSSISnap } from './snap.js';

export { MetaMaskSSISnap } from './snap';
export { isSnapInstalled } from './utils';
export { MetaMaskSSISnap } from './snap.js';
export { isSnapInstalled } from './utils.js';

export type SnapInstallationParams = {
snapId?: string;
Expand Down
11 changes: 1 addition & 10 deletions packages/connector/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"incremental": false,
"removeComments": true,
"module": "ES2020"
},

"exclude": [
// Exclude all test files
]
"extends": "./tsconfig.json"
}
2 changes: 1 addition & 1 deletion packages/connector/tsconfig.eslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "./tsconfig.json",
"include": ["**/*", ".eslintrc.js"]
"include": ["**/*", ".eslintrc.cjs"]
}
25 changes: 6 additions & 19 deletions packages/connector/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,17 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"target": "ES2020",
"module": "ES2020",
"moduleResolution": "nodenext",

"outDir": "./dist",
"baseUrl": ".",

"declaration": true,
"inlineSourceMap": true,
"allowJs": true,

/* Additional Checks */
"noUnusedLocals": true /* Report errors on unused locals. */,
"noUnusedParameters": true /* Report errors on unused parameters. */,
"noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
"noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */,

/* Debugging Options */
"traceResolution": false /* Report module resolution log messages. */,
"listEmittedFiles": false /* Print names of generated files part of the compilation. */,
"listFiles": false /* Print names of files part of the compilation. */,

"lib": ["es6", "dom", "es2020"],
"typeRoots": [
"./node_modules/@types",
"../../node_modules/@types",
"globals.d.ts"
]
"incremental": false,
"removeComments": true
},
"include": ["src/**/*.ts", "globals.d.ts"]
}
2 changes: 1 addition & 1 deletion packages/connector/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default defineConfig((options: Options) => ({
splitting: true,
tsconfig: './tsconfig.build.json',
entry: ['src/**/*.ts'],
format: ['esm', 'cjs'],
format: 'esm',
dts: true,
minify: false,
clean: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/dapp/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
root: true,
extends: ['next/core-web-vitals', '../../.eslintrc.js'],
extends: ['next/core-web-vitals', '../../.eslintrc.cjs'],
parserOptions: {
tsconfigRootDir: __dirname,
project: './tsconfig.eslint.json',
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"dependencies": {
"@next/font": "13.1.6",
"@types/node": "18.14.1",
"@types/node": "18.15.3",
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"clsx": "^1.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/.eslintrc.js → packages/docs/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
root: true,
extends: ['../../.eslintrc.js'],
extends: ['../../.eslintrc.cjs'],
plugins: ['import'],
parserOptions: {
tsconfigRootDir: __dirname,
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"precompress": "^9.1.1",
"prettier": "^2.8.4",
"prettier-plugin-packagejson": "^2.4.3",
"rimraf": "^3.0.2",
"rimraf": "^4.4.0",
"stylelint": "^14.16.1",
"stylelint-config-css-modules": "^4.1.0",
"stylelint-config-prettier": "^9.0.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/tsconfig.eslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "./tsconfig.json",
"include": ["**/*", ".eslintrc.js"]
"include": ["**/*", ".eslintrc.cjs"]
}
10 changes: 10 additions & 0 deletions packages/snap/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
root: true,
extends: ['../../.eslintrc.cjs'],
parserOptions: {
tsconfigRootDir: __dirname,
project: './tsconfig.eslint.json',
sourceType: 'module',
},
ignorePatterns: ['src/post-process/post-process.js'],
};
Loading

0 comments on commit fb7f759

Please sign in to comment.