Skip to content

Commit

Permalink
feat: configure engines with node >= 10.0.0
Browse files Browse the repository at this point in the history
As `node 8` is becoming EOL soon, we're upgrading the baseline `node`
version requirement from `>= 8.10.0` to `>= 10.0.0`. At this point, the
code generation is not affected, but this our first signal to consumers
that they need to upgrade their runtimes and/or codebases.

Additionally, normalized the order of fields in the `package.json` files
to make it nicer for people to work in the mono-repo.

Related to #794
  • Loading branch information
RomainMuller committed Sep 18, 2019
1 parent cd23814 commit 0ddd7ab
Show file tree
Hide file tree
Showing 26 changed files with 521 additions and 357 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Due to the polyglot nature of `jsii`, the toolchain requirements are somewhat
more complicated than for most projects. In order to locally develop `jsii`, you
will need the following tools:

- [Node `8.11.0`] or later
- [Node `10.0.0`] or later
- An OpenJDK-8 distribution (e.g: [Oracle's OpenJDK8], [Amazon Corretto 8])
+ [`maven >= 3.0.5`](https://maven.apache.org)
- [.NET Core `2.0`] or later
Expand All @@ -24,7 +24,7 @@ will need the following tools:
- [Ruby `2.4.4p296`] or later
+ [`bundler ~> 1.17.2`](https://bundler.io)

[Node `8.11.0`]: https://nodejs.org/download/release/v8.11.0/
[Node `10.0.0`]: https://nodejs.org/download/release/latest-v10.x/
[Oracle's OpenJDK8]: http://openjdk.java.net/install/
[Amazon Corretto 8]: https://aws.amazon.com/corretto/
[.NET Core `2.0`]: https://www.microsoft.com/net/download
Expand Down
37 changes: 22 additions & 15 deletions packages/codemaker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@
"name": "codemaker",
"version": "0.16.0",
"description": "A tiny utility for generating source code",
"license": "Apache-2.0",
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com"
},
"homepage": "https://github.com/aws/jsii",
"bugs": {
"url": "https://github.com/aws/jsii/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git",
"directory": "packages/codemaker"
},
"engines": {
"node": ">= 10.0.0"
},
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
Expand All @@ -11,6 +28,11 @@
"test": "jest",
"package": "rm -fr dist/js && mkdir -p dist/js && mv $(npm pack) dist/js"
},
"dependencies": {
"camelcase": "^5.3.1",
"decamelize": "^1.2.0",
"fs-extra": "^8.1.0"
},
"devDependencies": {
"@types/decamelize": "^1.2.0",
"@types/fs-extra": "^8.0.0",
Expand All @@ -21,11 +43,6 @@
"jest": "^24.9.0",
"typescript": "~3.6.3"
},
"dependencies": {
"camelcase": "^5.3.1",
"decamelize": "^1.2.0",
"fs-extra": "^8.1.0"
},
"jest": {
"collectCoverage": true,
"collectCoverageFrom": [
Expand All @@ -47,15 +64,5 @@
"testMatch": [
"**/?(*.)+(spec|test).js"
]
},
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com"
},
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git",
"directory": "packages/codemaker"
}
}
28 changes: 18 additions & 10 deletions packages/jsii-build-tools/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
{
"name": "jsii-build-tools",
"version": "0.16.0",
"description": "Internal repository-level tools",
"private": true,
"description": "Internal repository-level tools",
"license": "Apache-2.0",
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com"
},
"homepage": "https://github.com/aws/jsii",
"bugs": {
"url": "https://github.com/aws/jsii/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git",
"directory": "packages/jsii-build-tools"
},
"engines": {
"node": ">= 10.0.0"
},
"bin": {
"diff-test": "bin/diff-test",
"package-js": "bin/package-js",
Expand All @@ -13,14 +30,5 @@
},
"scripts": {
"build": "chmod +x bin/*"
},
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com"
},
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git"
}
}
46 changes: 27 additions & 19 deletions packages/jsii-calc-base-of-base/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,36 @@
{
"name": "@scope/jsii-calc-base-of-base",
"version": "0.16.0",
"private": true,
"description": "An example transitive dependency for jsii-calc.",
"license": "Apache-2.0",
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com",
"organization": true
},
"homepage": "https://github.com/aws/jsii",
"bugs": {
"url": "https://github.com/aws/jsii/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git",
"directory": "packages/jsii-calc-base-of-base"
},
"engines": {
"node": ">= 10.0.0"
},
"main": "lib/index.js",
"types": "lib/index.d.ts",
"private": true,
"scripts": {
"build": "jsii",
"test": "diff-test test/assembly.jsii .jsii"
},
"devDependencies": {
"jsii": "^0.16.0",
"jsii-build-tools": "file:../jsii-build-tools"
},
"jsii": {
"outdir": "dist",
"targets": {
Expand All @@ -26,23 +52,5 @@
"sphinx": {}
},
"versionFormat": "short"
},
"scripts": {
"build": "jsii",
"test": "diff-test test/assembly.jsii .jsii"
},
"devDependencies": {
"jsii": "^0.16.0",
"jsii-build-tools": "file:../jsii-build-tools"
},
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com",
"organization": true
},
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git"
}
}
58 changes: 33 additions & 25 deletions packages/jsii-calc-base/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,42 @@
{
"name": "@scope/jsii-calc-base",
"version": "0.16.0",
"private": true,
"description": "An example direct dependency for jsii-calc.",
"license": "Apache-2.0",
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com",
"organization": true
},
"homepage": "https://github.com/aws/jsii",
"bugs": {
"url": "https://github.com/aws/jsii/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git",
"directory": "packages/jsii-calc-base"
},
"engines": {
"node": ">= 10.0.0"
},
"main": "lib/index.js",
"types": "lib/index.d.ts",
"private": true,
"scripts": {
"build": "jsii",
"test": "diff-test test/assembly.jsii .jsii"
},
"dependencies": {
"@scope/jsii-calc-base-of-base": "file:../jsii-calc-base-of-base"
},
"peerDependencies": {
"@scope/jsii-calc-base-of-base": "file:../jsii-calc-base-of-base"
},
"devDependencies": {
"jsii": "^0.16.0",
"jsii-build-tools": "file:../jsii-build-tools"
},
"jsii": {
"outdir": "dist",
"targets": {
Expand All @@ -26,29 +58,5 @@
"sphinx": {}
},
"versionFormat": "short"
},
"scripts": {
"build": "jsii",
"test": "diff-test test/assembly.jsii .jsii"
},
"devDependencies": {
"jsii": "^0.16.0",
"jsii-build-tools": "file:../jsii-build-tools"
},
"dependencies": {
"@scope/jsii-calc-base-of-base": "file:../jsii-calc-base-of-base"
},
"peerDependencies": {
"@scope/jsii-calc-base-of-base": "file:../jsii-calc-base-of-base"
},
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com",
"organization": true
},
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git"
}
}
16 changes: 12 additions & 4 deletions packages/jsii-calc-bundled/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
{
"name": "jsii-calc-bundled",
"version": "0.16.0",
"main": "index.js",
"private": true,
"license": "Apache-2.0",
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com"
},
"license": "Apache-2.0",
"homepage": "https://github.com/aws/jsii",
"bugs": {
"url": "https://github.com/aws/jsii/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git"
}
"url": "https://github.com/aws/jsii.git",
"directory": "packages/jsii-calc-bundled"
},
"engines": {
"node": ">= 10.0.0"
},
"main": "index.js"
}
60 changes: 34 additions & 26 deletions packages/jsii-calc-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,44 @@
{
"name": "@scope/jsii-calc-lib",
"version": "0.16.0",
"private": true,
"description": "A simple calcuator library built on JSII.",
"stability": "deprecated",
"deprecated": "Really just deprecated for shows...",
"stability": "deprecated",
"license": "Apache-2.0",
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com",
"organization": true
},
"homepage": "https://github.com/aws/jsii",
"bugs": {
"url": "https://github.com/aws/jsii/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git",
"directory": "packages/jsii-calc-lib"
},
"engines": {
"node": ">= 10.0.0"
},
"main": "lib/index.js",
"types": "lib/index.d.ts",
"private": true,
"scripts": {
"build": "jsii",
"test": "diff-test test/assembly.jsii .jsii"
},
"dependencies": {
"@scope/jsii-calc-base": "file:../jsii-calc-base"
},
"peerDependencies": {
"@scope/jsii-calc-base": "file:../jsii-calc-base"
},
"devDependencies": {
"jsii": "^0.16.0",
"jsii-build-tools": "file:../jsii-build-tools"
},
"jsii": {
"outdir": "dist",
"targets": {
Expand All @@ -30,29 +62,5 @@
"sphinx": {}
},
"versionFormat": "short"
},
"scripts": {
"build": "jsii",
"test": "diff-test test/assembly.jsii .jsii"
},
"devDependencies": {
"jsii": "^0.16.0",
"jsii-build-tools": "file:../jsii-build-tools"
},
"dependencies": {
"@scope/jsii-calc-base": "file:../jsii-calc-base"
},
"peerDependencies": {
"@scope/jsii-calc-base": "file:../jsii-calc-base"
},
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com",
"organization": true
},
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "https://github.com/aws/jsii.git"
}
}

0 comments on commit 0ddd7ab

Please sign in to comment.