projen 0.71.15 → 0.71.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.jsii +3 -3
- package/lib/awscdk/auto-discover.js +5 -5
- package/lib/awscdk/awscdk-app-java.js +1 -1
- package/lib/awscdk/awscdk-app-py.js +1 -1
- package/lib/awscdk/awscdk-app-ts.js +1 -1
- package/lib/awscdk/awscdk-construct.js +2 -2
- package/lib/awscdk/awscdk-deps-java.js +1 -1
- package/lib/awscdk/awscdk-deps-js.js +1 -1
- package/lib/awscdk/awscdk-deps-py.js +1 -1
- package/lib/awscdk/awscdk-deps.js +1 -1
- package/lib/awscdk/cdk-config.js +1 -1
- package/lib/awscdk/cdk-tasks.js +1 -1
- package/lib/awscdk/integration-test.js +1 -1
- package/lib/awscdk/lambda-extension.js +1 -1
- package/lib/awscdk/lambda-function.js +2 -2
- package/lib/build/build-workflow.js +1 -1
- package/lib/cdk/auto-discover-base.js +2 -2
- package/lib/cdk/construct-lib.js +1 -1
- package/lib/cdk/integration-test-base.js +1 -1
- package/lib/cdk/jsii-docgen.js +1 -1
- package/lib/cdk/jsii-project.js +1 -1
- package/lib/cdk8s/auto-discover.js +2 -2
- package/lib/cdk8s/cdk8s-app-py.js +1 -1
- package/lib/cdk8s/cdk8s-app-ts.js +1 -1
- package/lib/cdk8s/cdk8s-construct.js +1 -1
- package/lib/cdk8s/cdk8s-deps-py.js +1 -1
- package/lib/cdk8s/cdk8s-deps.js +1 -1
- package/lib/cdk8s/integration-test.js +1 -1
- package/lib/cdktf/cdktf-construct.js +1 -1
- package/lib/circleci/circleci.js +1 -1
- package/lib/component.js +1 -1
- package/lib/dependencies.js +1 -1
- package/lib/dev-env.js +1 -1
- package/lib/docker-compose/docker-compose-service.js +1 -1
- package/lib/docker-compose/docker-compose.js +1 -1
- package/lib/file.js +1 -1
- package/lib/gitattributes.js +1 -1
- package/lib/github/actions-provider.js +1 -1
- package/lib/github/auto-approve.js +1 -1
- package/lib/github/auto-merge.js +1 -1
- package/lib/github/dependabot.js +1 -1
- package/lib/github/github-credentials.js +1 -1
- package/lib/github/github-project.js +1 -1
- package/lib/github/github.js +1 -1
- package/lib/github/mergify.js +1 -1
- package/lib/github/pr-template.js +1 -1
- package/lib/github/pull-request-lint.js +1 -1
- package/lib/github/stale.js +1 -1
- package/lib/github/task-workflow.js +1 -1
- package/lib/github/workflow-actions.js +1 -1
- package/lib/github/workflow-jobs.js +1 -1
- package/lib/github/workflows.js +1 -1
- package/lib/gitlab/configuration.js +1 -1
- package/lib/gitlab/gitlab-configuration.js +1 -1
- package/lib/gitlab/nested-configuration.js +1 -1
- package/lib/gitpod.js +1 -1
- package/lib/ignore-file.js +1 -1
- package/lib/ini.js +1 -1
- package/lib/java/java-project.js +1 -1
- package/lib/java/junit.js +1 -1
- package/lib/java/maven-compile.js +1 -1
- package/lib/java/maven-packaging.js +1 -1
- package/lib/java/maven-sample.js +1 -1
- package/lib/java/pom.js +1 -1
- package/lib/java/projenrc.js +1 -1
- package/lib/javascript/bundler.js +1 -1
- package/lib/javascript/eslint.js +1 -1
- package/lib/javascript/jest.js +4 -4
- package/lib/javascript/node-package.js +1 -1
- package/lib/javascript/node-project.js +1 -1
- package/lib/javascript/npm-config.js +1 -1
- package/lib/javascript/prettier.js +1 -1
- package/lib/javascript/projenrc.js +1 -1
- package/lib/javascript/typescript-config.js +1 -1
- package/lib/javascript/upgrade-dependencies.js +2 -2
- package/lib/json-patch.js +1 -1
- package/lib/json.js +1 -1
- package/lib/license.js +1 -1
- package/lib/logger.js +1 -1
- package/lib/makefile.js +1 -1
- package/lib/object-file.js +1 -1
- package/lib/project-build.js +1 -1
- package/lib/project.js +1 -1
- package/lib/projects.js +1 -1
- package/lib/projenrc-json.js +2 -2
- package/lib/projenrc.js +1 -1
- package/lib/python/pip.js +1 -1
- package/lib/python/poetry.js +2 -2
- package/lib/python/projenrc.js +1 -1
- package/lib/python/pytest-sample.js +1 -1
- package/lib/python/pytest.js +1 -1
- package/lib/python/python-project.js +1 -1
- package/lib/python/python-sample.js +1 -1
- package/lib/python/requirements-file.js +1 -1
- package/lib/python/setuppy.js +1 -1
- package/lib/python/setuptools.js +1 -1
- package/lib/python/venv.js +1 -1
- package/lib/readme.js +1 -1
- package/lib/release/publisher.js +1 -1
- package/lib/release/release-trigger.js +1 -1
- package/lib/release/release.js +1 -1
- package/lib/renovatebot.js +1 -1
- package/lib/sample-file.js +2 -2
- package/lib/semver.js +1 -1
- package/lib/source-code.js +1 -1
- package/lib/task-runtime.js +1 -1
- package/lib/task.js +1 -1
- package/lib/tasks.js +1 -1
- package/lib/testing.js +1 -1
- package/lib/textfile.js +1 -1
- package/lib/toml.js +1 -1
- package/lib/typescript/projenrc-ts.js +1 -1
- package/lib/typescript/projenrc.js +1 -1
- package/lib/typescript/typescript-typedoc.js +1 -1
- package/lib/typescript/typescript.js +3 -3
- package/lib/version.js +1 -1
- package/lib/vscode/devcontainer.js +1 -1
- package/lib/vscode/extensions.js +1 -1
- package/lib/vscode/launch-config.js +1 -1
- package/lib/vscode/settings.js +1 -1
- package/lib/vscode/vscode.js +1 -1
- package/lib/web/next.js +3 -3
- package/lib/web/postcss.js +1 -1
- package/lib/web/react.js +4 -4
- package/lib/web/tailwind.js +1 -1
- package/lib/xmlfile.js +1 -1
- package/lib/yaml.js +1 -1
- package/node_modules/resolve/lib/core.js +1 -3
- package/node_modules/resolve/lib/core.json +1 -4
- package/node_modules/resolve/package.json +2 -2
- package/node_modules/semver/README.md +11 -0
- package/node_modules/semver/bin/semver.js +8 -0
- package/node_modules/semver/classes/semver.js +20 -8
- package/node_modules/semver/functions/diff.js +48 -33
- package/node_modules/semver/functions/parse.js +5 -12
- package/node_modules/semver/package.json +1 -1
- package/package.json +2 -2
|
@@ -1,39 +1,54 @@
|
|
|
1
|
-
const parse = require('./parse')
|
|
2
|
-
const eq = require('./eq')
|
|
1
|
+
const parse = require('./parse.js')
|
|
3
2
|
|
|
4
3
|
const diff = (version1, version2) => {
|
|
5
|
-
const v1 = parse(version1)
|
|
6
|
-
const v2 = parse(version2)
|
|
7
|
-
|
|
4
|
+
const v1 = parse(version1, null, true)
|
|
5
|
+
const v2 = parse(version2, null, true)
|
|
6
|
+
const comparison = v1.compare(v2)
|
|
7
|
+
|
|
8
|
+
if (comparison === 0) {
|
|
8
9
|
return null
|
|
9
|
-
} else {
|
|
10
|
-
const hasPre = v1.prerelease.length || v2.prerelease.length
|
|
11
|
-
const prefix = hasPre ? 'pre' : ''
|
|
12
|
-
const defaultResult = hasPre ? 'prerelease' : ''
|
|
13
|
-
|
|
14
|
-
if (v1.major !== v2.major) {
|
|
15
|
-
return prefix + 'major'
|
|
16
|
-
}
|
|
17
|
-
if (v1.minor !== v2.minor) {
|
|
18
|
-
return prefix + 'minor'
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
if (v1.patch !== v2.patch) {
|
|
22
|
-
return prefix + 'patch'
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
if (!v1.prerelease.length || !v2.prerelease.length) {
|
|
26
|
-
if (v1.patch) {
|
|
27
|
-
return 'patch'
|
|
28
|
-
}
|
|
29
|
-
if (v1.minor) {
|
|
30
|
-
return 'minor'
|
|
31
|
-
}
|
|
32
|
-
if (v1.major) {
|
|
33
|
-
return 'major'
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
return defaultResult // may be undefined
|
|
37
10
|
}
|
|
11
|
+
|
|
12
|
+
const v1Higher = comparison > 0
|
|
13
|
+
const highVersion = v1Higher ? v1 : v2
|
|
14
|
+
const lowVersion = v1Higher ? v2 : v1
|
|
15
|
+
const highHasPre = !!highVersion.prerelease.length
|
|
16
|
+
|
|
17
|
+
// add the `pre` prefix if we are going to a prerelease version
|
|
18
|
+
const prefix = highHasPre ? 'pre' : ''
|
|
19
|
+
|
|
20
|
+
if (v1.major !== v2.major) {
|
|
21
|
+
return prefix + 'major'
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
if (v1.minor !== v2.minor) {
|
|
25
|
+
return prefix + 'minor'
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
if (v1.patch !== v2.patch) {
|
|
29
|
+
return prefix + 'patch'
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
// at this point we know stable versions match but overall versions are not equal,
|
|
33
|
+
// so either they are both prereleases, or the lower version is a prerelease
|
|
34
|
+
|
|
35
|
+
if (highHasPre) {
|
|
36
|
+
// high and low are preleases
|
|
37
|
+
return 'prerelease'
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
if (lowVersion.patch) {
|
|
41
|
+
// anything higher than a patch bump would result in the wrong version
|
|
42
|
+
return 'patch'
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
if (lowVersion.minor) {
|
|
46
|
+
// anything higher than a minor bump would result in the wrong version
|
|
47
|
+
return 'minor'
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
// bumping major/minor/patch all have same result
|
|
51
|
+
return 'major'
|
|
38
52
|
}
|
|
53
|
+
|
|
39
54
|
module.exports = diff
|
|
@@ -1,22 +1,15 @@
|
|
|
1
|
-
const { MAX_LENGTH } = require('../internal/constants')
|
|
2
1
|
const SemVer = require('../classes/semver')
|
|
3
|
-
const parse = (version, options) => {
|
|
2
|
+
const parse = (version, options, throwErrors = false) => {
|
|
4
3
|
if (version instanceof SemVer) {
|
|
5
4
|
return version
|
|
6
5
|
}
|
|
7
|
-
|
|
8
|
-
if (typeof version !== 'string') {
|
|
9
|
-
return null
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
if (version.length > MAX_LENGTH) {
|
|
13
|
-
return null
|
|
14
|
-
}
|
|
15
|
-
|
|
16
6
|
try {
|
|
17
7
|
return new SemVer(version, options)
|
|
18
8
|
} catch (er) {
|
|
19
|
-
|
|
9
|
+
if (!throwErrors) {
|
|
10
|
+
return null
|
|
11
|
+
}
|
|
12
|
+
throw er
|
|
20
13
|
}
|
|
21
14
|
}
|
|
22
15
|
|
package/package.json
CHANGED
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"fast-json-patch": "^3.1.1",
|
|
87
87
|
"glob": "^8",
|
|
88
88
|
"ini": "^2.0.0",
|
|
89
|
-
"semver": "^7.
|
|
89
|
+
"semver": "^7.5.0",
|
|
90
90
|
"shx": "^0.3.4",
|
|
91
91
|
"xmlbuilder2": "^2.4.1",
|
|
92
92
|
"yaml": "2.0.0",
|
|
@@ -120,7 +120,7 @@
|
|
|
120
120
|
},
|
|
121
121
|
"main": "lib/index.js",
|
|
122
122
|
"license": "Apache-2.0",
|
|
123
|
-
"version": "0.71.
|
|
123
|
+
"version": "0.71.16",
|
|
124
124
|
"jest": {
|
|
125
125
|
"maxWorkers": "50%",
|
|
126
126
|
"testMatch": [
|