Skip to content

Commit 13f597b

Browse files
authored
Merge pull request #176 from VirgilSecurity/update/virgil-crypto
Update/virgil crypto
2 parents 0c41a5b + 6e370af commit 13f597b

File tree

7 files changed

+23
-26
lines changed

7 files changed

+23
-26
lines changed

packages/e3kit-base/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@virgilsecurity/e3kit-base",
3-
"version": "3.0.5",
3+
"version": "3.0.7",
44
"description": "End-to-end encryption with multiple device support powered by Virgil Security",
55
"main": "./dist/e3kit-base.cjs.js",
66
"module": "./dist/e3kit-base.es.js",
@@ -32,6 +32,7 @@
3232
"virgil-sdk": "^6.1.2"
3333
},
3434
"devDependencies": {
35+
"@rollup/plugin-typescript": "^11.1.6",
3536
"@types/chai": "^4.3.3",
3637
"@types/chai-as-promised": "^7.1.5",
3738
"@types/memdown": "^3.0.0",
@@ -43,12 +44,11 @@
4344
"rimraf": "^3.0.2",
4445
"rollup": "^3.1.0",
4546
"rollup-plugin-license": "^2.8.1",
46-
"rollup-plugin-typescript2": "^0.34.1",
4747
"sinon": "^14.0.1",
4848
"ts-mocha": "^10.0.0",
4949
"ts-node": "^10.9.1",
50-
"typescript": "^4.8.4",
51-
"virgil-crypto": "^5.1.0"
50+
"typescript": "^5.4.5",
51+
"virgil-crypto": "^5.1.2"
5252
},
5353
"publishConfig": {
5454
"access": "public"

packages/e3kit-base/rollup.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require('path');
22

33
const license = require('rollup-plugin-license');
4-
const typescript = require('rollup-plugin-typescript2');
4+
const typescript = require('@rollup/plugin-typescript');
55

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

@@ -13,15 +13,15 @@ const FORMAT = {
1313
const sourcePath = path.join(__dirname, 'src');
1414
const outputPath = path.join(__dirname, 'dist');
1515

16-
const createEntry = format => ({
16+
const createEntry = (format) => ({
1717
external: Object.keys(packageJson.dependencies),
1818
input: path.join(sourcePath, 'index.ts'),
1919
output: {
2020
format,
2121
file: path.join(outputPath, `e3kit-base.${format}.js`),
2222
},
2323
plugins: [
24-
typescript({ useTsconfigDeclarationDir: true }),
24+
typescript(),
2525
license({
2626
banner: {
2727
content: {

packages/e3kit-browser/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@virgilsecurity/e3kit-browser",
3-
"version": "3.0.5",
3+
"version": "3.0.6",
44
"description": "End-to-end encryption with multiple device support powered by Virgil Security",
55
"main": "./browser.cjs.js",
66
"module": "./browser.es.js",
@@ -25,13 +25,14 @@
2525
"@virgilsecurity/e3kit-base": "^3.0.5",
2626
"@virgilsecurity/pythia-crypto": "^2.1.0",
2727
"level-js": "^5.0.1",
28-
"virgil-crypto": "^5.1.0",
28+
"virgil-crypto": "^5.1.2",
2929
"virgil-sdk": "^6.1.2"
3030
},
3131
"devDependencies": {
3232
"@rollup/plugin-commonjs": "^25.0.7",
3333
"@rollup/plugin-json": "^5.0.0",
3434
"@rollup/plugin-node-resolve": "^15.0.1",
35+
"@rollup/plugin-typescript": "^11.1.1",
3536
"@rollup/plugin-wasm": "^6.0.0",
3637
"cross-env": "^7.0.3",
3738
"rimraf": "^3.0.2",
@@ -42,7 +43,6 @@
4243
"rollup-plugin-node-globals": "^1.4.0",
4344
"rollup-plugin-node-polyfills": "^0.2.1",
4445
"rollup-plugin-re": "^1.0.7",
45-
"@rollup/plugin-typescript": "^11.1.1",
4646
"typescript": "^4.8.4"
4747
},
4848
"publishConfig": {

packages/e3kit-native/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@virgilsecurity/e3kit-native",
3-
"version": "3.0.5",
3+
"version": "3.0.6",
44
"description": "End-to-end encryption with multiple device support powered by Virgil Security",
55
"main": "./dist/e3kit-native.cjs.js",
66
"module": "./dist/e3kit-native.es.js",
@@ -39,7 +39,7 @@
3939
"@rollup/plugin-node-resolve": "^15.0.1",
4040
"@virgilsecurity/key-storage-rn": "^1.0.0",
4141
"react-native-keychain": "^8.1.1",
42-
"react-native-virgil-crypto": "^0.6.3",
42+
"react-native-virgil-crypto": "^0.6.4",
4343
"rimraf": "^3.0.2",
4444
"rollup": "^3.1.0",
4545
"rollup-plugin-license": "^2.8.1",

packages/e3kit-node/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@
2020
"dependencies": {
2121
"@types/leveldown": "^4.0.3",
2222
"@types/mkdirp": "^1.0.2",
23-
"@virgilsecurity/e3kit-base": "^3.0.5",
23+
"@virgilsecurity/e3kit-base": "^3.0.6",
2424
"@virgilsecurity/pythia-crypto": "^2.1.0",
2525
"leveldown": "^6.1.1",
2626
"mkdirp": "^1.0.4",
27-
"virgil-crypto": "^5.1.0",
28-
"virgil-sdk": "^6.1.2"
27+
"virgil-crypto": "^5.1.2",
28+
"virgil-sdk": "^6.2.0"
2929
},
3030
"devDependencies": {
3131
"@rollup/plugin-json": "^5.0.0",
3232
"builtin-modules": "^3.3.0",
3333
"rimraf": "^3.0.2",
34-
"rollup": "^3.1.0",
34+
"rollup": "^3.11.0",
3535
"rollup-plugin-license": "^2.8.1",
3636
"rollup-plugin-re": "^1.0.7",
37-
"rollup-plugin-typescript2": "^0.34.1",
38-
"typescript": "^4.8.4"
37+
"@rollup/plugin-typescript": "^11.1.6",
38+
"typescript": "^5.4.5"
3939
},
4040
"publishConfig": {
4141
"access": "public"

packages/e3kit-node/rollup.config.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ const path = require('path');
33
const builtinModules = require('builtin-modules');
44
const license = require('rollup-plugin-license');
55
const replace = require('rollup-plugin-re');
6-
const typescript = require('rollup-plugin-typescript2');
6+
const typescript = require('@rollup/plugin-typescript');
77
const json = require('@rollup/plugin-json');
88
const { generateCrossPlatformPath } = require('../../utils/build');
99

1010
const packageJson = require('./package.json');
11+
const { includes } = require('builtin-modules');
1112

1213
const FORMAT = {
1314
CJS: 'cjs',
@@ -69,12 +70,7 @@ const createEntry = (cryptoType, format) => {
6970
],
7071
}),
7172
typescript({
72-
useTsconfigDeclarationDir: true,
73-
tsconfigOverride: {
74-
compilerOptions: {
75-
noImplicitAny: false,
76-
},
77-
},
73+
tsconfig: './tsconfig.json',
7874
}),
7975
json(),
8076
license({

packages/e3kit-node/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"compileOnSave": false,
33
"compilerOptions": {
44
"outDir": "./dist",
5+
"noImplicitAny": false,
56
"resolveJsonModule": true,
67
"forceConsistentCasingInFileNames": true,
78
"strict": true,
@@ -17,7 +18,7 @@
1718
"importHelpers": true,
1819
"esModuleInterop": true,
1920
"target": "es2020",
20-
"module": "es2015",
21+
"module": "es2020",
2122
"lib": [
2223
"es2018",
2324
"dom"

0 commit comments

Comments
 (0)