From e82fb9a38de322c1cf9a6e2de814135fba1b0415 Mon Sep 17 00:00:00 2001 From: Robin Schreiber Date: Fri, 15 Apr 2022 16:31:13 +0200 Subject: [PATCH] packages: update the package.json to be importable as esm from node 17 --- lively-system-interface/package.json | 1 + lively.ast/package.json | 23 +++++++++++++++++------ lively.bindings/package.json | 1 + lively.classes/package.json | 1 + lively.freezer/package.json | 3 ++- lively.lang/package.json | 8 ++++++-- lively.notifications/package.json | 3 ++- lively.resources/package.json | 1 + lively.serializer2/package.json | 2 ++ lively.source-transform/package.json | 14 +++++++++----- lively.storage/package.json | 4 ++-- lively.vm/package.json | 3 ++- 12 files changed, 46 insertions(+), 18 deletions(-) diff --git a/lively-system-interface/package.json b/lively-system-interface/package.json index 7894d4b74a..a81cad1c4a 100644 --- a/lively-system-interface/package.json +++ b/lively-system-interface/package.json @@ -2,6 +2,7 @@ "name": "lively-system-interface", "version": "0.2.1", "repository": "https://github.com/LivelyKernel/lively-system-interface", + "type": "module", "dependencies": { "lively.modules": "*", "lively.resources": "*", diff --git a/lively.ast/package.json b/lively.ast/package.json index 83d54733d2..75a3866f79 100644 --- a/lively.ast/package.json +++ b/lively.ast/package.json @@ -2,7 +2,8 @@ "name": "lively.ast", "version": "0.11.3", "description": "Parsing JS code into ASTs and tools to query and transform these trees.", - "main": "dist/lively.ast.js", + "main": "index.js", + "type": "module", "scripts": { "test": "mocha-es6 tests/*-test.js", "build": "node ./tools/build.js" @@ -26,10 +27,17 @@ }, "homepage": "https://github.com/LivelyKernel/lively.ast", "dependencies": { - "lively.lang": "^1.0.0" + "lively.lang": "^1.0.0", + "esutils": "2.0.3", + "@javascript-obfuscator/estraverse": "5.4.0", + "astq": "2.7.5", + "escodegen": "2.0.0", + "acorn": "8.0.4", + "acorn-walk": "8.2.0", + "acorn-loose": "8.3.0" }, "devDependencies": { - "acorn": "^5.2.1", + "acorn": "8.0.4", "acorn-jsx": "^4.1.0", "acorn-es7-plugin": "^1.1.7", "acorn5-object-spread": "^4.0.0", @@ -47,10 +55,13 @@ "systemjs": { "main": "index.js", "map": { - "escodegen": "https://jspm.dev/escodegen", - "acorn-walk": "https://jspm.dev/acorn-walk", - "acorn-loose": "https://jspm.dev/acorn-loose", + "escodegen": "https://jspm.dev/escodegen@2.0.0", + "acorn-walk": "https://jspm.dev/acorn-walk@8.2.0", + "acorn-loose": "https://jspm.dev/acorn-loose@8.3.0", "acorn": "https://jspm.dev/acorn@8.0.4", + "esutils": "https://jspm.dev/esutils@2.0.3", + "astq": "https://jspm.dev/astq@2.7.5", + "@javascript-obfuscator/estraverse": "https://jspm.dev/@javascript-obfuscator/estraverse@5.4.0", "util": { "node": "@node/util", "~node": "@empty" diff --git a/lively.bindings/package.json b/lively.bindings/package.json index 76aa02fb54..6cd6fcd5c9 100644 --- a/lively.bindings/package.json +++ b/lively.bindings/package.json @@ -1,6 +1,7 @@ { "name": "lively.bindings", "version": "0.1.2", + "type": "module", "dependencies": { "lively.lang": "*" }, diff --git a/lively.classes/package.json b/lively.classes/package.json index 90c062322a..52c0cd9294 100644 --- a/lively.classes/package.json +++ b/lively.classes/package.json @@ -3,6 +3,7 @@ "version": "0.1.20", "description": "EcmaScript 6 classes for live development", "main": "dist/lively.classes.js", + "type": "module", "systemjs": { "main": "index.js" }, diff --git a/lively.freezer/package.json b/lively.freezer/package.json index 372fc3d744..524770fc15 100644 --- a/lively.freezer/package.json +++ b/lively.freezer/package.json @@ -1,6 +1,7 @@ { "name": "lively.freezer", "version": "0.1.0", + "type": "module", "dependencies": { "@babel/core": "^7.12.3", "@babel/cli": "^7.12.1", @@ -36,4 +37,4 @@ ] } } -} \ No newline at end of file +} diff --git a/lively.lang/package.json b/lively.lang/package.json index 560754530e..6498015265 100644 --- a/lively.lang/package.json +++ b/lively.lang/package.json @@ -2,7 +2,8 @@ "name": "lively.lang", "version": "1.0.25", "description": "JavaScript utils providing useful abstractions for working with collections, functions, objects.", - "main": "dist/lively.lang.js", + "main": "./index.js", + "type": "module", "systemjs": { "main": "index.js", "map": { @@ -33,6 +34,9 @@ "articles": "https://jspm.dev/npm:articles@0.2.2" } }, + "dependencies": { + "articles": "^0.2.2" + }, "devDependencies": { "babel-core": "^6.16.0", "babel-plugin-external-helpers": "^6.8.0", @@ -87,4 +91,4 @@ "url": "https://github.com/LivelyKernel/lively.lang/issues" }, "homepage": "https://github.com/LivelyKernel/lively.lang" -} \ No newline at end of file +} diff --git a/lively.notifications/package.json b/lively.notifications/package.json index dcda2e3e12..8d16289742 100644 --- a/lively.notifications/package.json +++ b/lively.notifications/package.json @@ -8,7 +8,8 @@ "url": "https://github.com/LivelyKernel/lively.notifications/issues" }, "homepage": "https://github.com/LivelyKernel/lively.notifications#readme", - "main": "dist/lively.notifications.js", + "main": "index.js", + "type": "module", "systemjs": { "main": "./index.js" }, diff --git a/lively.resources/package.json b/lively.resources/package.json index dc395a4503..337bad5d6a 100644 --- a/lively.resources/package.json +++ b/lively.resources/package.json @@ -3,6 +3,7 @@ "version": "0.1.37", "repository": "https://github.com/LivelyKernel/lively.resources", "main": "dist/lively.resources.js", + "type": "module", "systemjs": { "main": "index.js", "map": { diff --git a/lively.serializer2/package.json b/lively.serializer2/package.json index a4d0c9058a..089348c25f 100644 --- a/lively.serializer2/package.json +++ b/lively.serializer2/package.json @@ -1,6 +1,8 @@ { "name": "lively.serializer2", "version": "0.1.3", + "type": "module", + "main": "index.js", "dependencies": { "lively.lang": "^1.0.5", "semver": "^5.3.0" diff --git a/lively.source-transform/package.json b/lively.source-transform/package.json index 70fe5ce73a..7f31b49c3e 100644 --- a/lively.source-transform/package.json +++ b/lively.source-transform/package.json @@ -3,6 +3,7 @@ "version": "0.1.7", "description": "EcmaScript 6 classes for live development", "main": "dist/lively.source-transform.js", + "type": "module", "scripts": { "test": "mocha-es6 tests/*-test.js", "build": "node tools/build.js" @@ -25,7 +26,10 @@ "dependencies": { "lively.ast": "https://github.com/LivelyKernel/lively.ast", "lively.lang": "https://github.com/LivelyKernel/lively.lang", - "lively.classes": "https://github.com/LivelyKernel/lively.classes" + "lively.classes": "https://github.com/LivelyKernel/lively.classes", + "babel-plugin-transform-jsx": "2.0.0", + "@babel/plugin-proposal-optional-catch-binding": "7.16.7", + "@babel/plugin-syntax-import-meta": "7.10.4" }, "devDependencies": { "lively.vm": "*", @@ -46,14 +50,14 @@ "~node": "https://jspm.dev/babel-plugin-transform-jsx", "node": "@empty" }, - "babel-catch-binding": { + "@babel/plugin-proposal-optional-catch-binding": { "~node": "https://jspm.dev/@babel/plugin-proposal-optional-catch-binding", "node": "@empty" }, - "babel-import-meta": { + "@babel/plugin-syntax-import-meta": { "node": "@empty", - "~node": "https://jspm.dev/@babel/plugin-syntax-import-meta" + "~node": "https://jspm.dev/@babel/plugin-syntax-import-meta" } } } -} +} \ No newline at end of file diff --git a/lively.storage/package.json b/lively.storage/package.json index 775c7ff207..0f84ac8e02 100644 --- a/lively.storage/package.json +++ b/lively.storage/package.json @@ -20,7 +20,7 @@ "dependencies": { "lively.lang": "^1.0.0", "lively.resources": "^0.1.18", - "pouchdb": "7.1.1" + "pouchdb": "7.2.1" }, "devDependencies": { "babel-core": "^6.16.0", @@ -33,7 +33,7 @@ "babel-regenerator-runtime": "^6.5.0", "browserify": "^14.1.0", "mocha-es6": "^0.5", - "pouchdb-adapter-memory": "7.1.1", + "pouchdb-adapter-memory": "7.2.1", "rollup": "^0.36.1", "rollup-plugin-babel": "^2.7.1", "loaderify": "^0.1.5", diff --git a/lively.vm/package.json b/lively.vm/package.json index 1ae63baaa4..4d6df837d0 100644 --- a/lively.vm/package.json +++ b/lively.vm/package.json @@ -2,7 +2,8 @@ "name": "lively.vm", "version": "0.9.18", "description": "Controlled JavaScript code execution and instrumentation.", - "main": "dist/lively.vm.js", + "main": "index.js", + "type": "module", "systemjs": { "main": "index.js" },