Add default dependencies for nodejs

pulumi · Nov 9, 2022 · 4988626 · 4988626
1 parent 0ab7555
commit 4988626
Show file tree

Hide file tree

Showing 37 changed files with 66 additions and 32 deletions.
diff --git a/.../pending/20221109--sdkgen-dotnet-nodejs--add-default-dependencies-for-generated-sdks.yaml b/.../pending/20221109--sdkgen-dotnet-nodejs--add-default-dependencies-for-generated-sdks.yaml
@@ -0,0 +1,4 @@
+changes:
+- type: feat
+  scope: sdkgen/dotnet,nodejs
+  description: Add default dependencies for generated SDKs.
diff --git a/pkg/codegen/nodejs/gen.go b/pkg/codegen/nodejs/gen.go
@@ -42,6 +42,11 @@ import (
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 )
 
+// The minimum version of @pulumi/pulumi compatible with the generated SDK.
+const MinimumValidSDKVersion string = "^3.42.0"
+const MinumumTypescriptVersion string = "^4.3.5"
+const MinumumNodeTypesVersion string = "^18.11.9"
+
 type typeDetails struct {
 	outputType bool
 	inputType  bool
@@ -2198,8 +2203,9 @@ func genNPMPackageMetadata(pkg *schema.Package, info NodePackageInfo) string {
 	if info.TypeScriptVersion != "" {
 		devDependencies["typescript"] = info.TypeScriptVersion
 	} else {
-		devDependencies["typescript"] = "^4.3.5"
+		devDependencies["typescript"] = MinumumTypescriptVersion
 	}
+	devDependencies["@types/node"] = MinumumNodeTypesVersion
 
 	version := "${VERSION}"
 	versionSet := pkg.Version != nil && info.RespectSchemaVersion
@@ -2277,10 +2283,10 @@ func genNPMPackageMetadata(pkg *schema.Package, info NodePackageInfo) string {
 	if npminfo.Dependencies[sdkPack] == "" &&
 		npminfo.DevDependencies[sdkPack] == "" &&
 		npminfo.PeerDependencies[sdkPack] == "" {
-		if npminfo.PeerDependencies == nil {
-			npminfo.PeerDependencies = make(map[string]string)
+		if npminfo.Dependencies == nil {
+			npminfo.Dependencies = make(map[string]string)
 		}
-		npminfo.PeerDependencies["@pulumi/pulumi"] = "latest"
+		npminfo.Dependencies["@pulumi/pulumi"] = MinimumValidSDK
 	}
 
 	// Now write out the serialized form.

diff --git a/pkg/codegen/testing/test/testdata/azure-native-nested-types/nodejs/package.json b/pkg/codegen/testing/test/testdata/azure-native-nested-types/nodejs/package.json
@@ -19,6 +19,7 @@
         "@pulumi/pulumi": "^3.0.0"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^4.3.5"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/cyclic-types/nodejs/package.json b/pkg/codegen/testing/test/testdata/cyclic-types/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/dash-named-schema/nodejs/package.json b/pkg/codegen/testing/test/testdata/dash-named-schema/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/dashed-import-schema/nodejs/package.json b/pkg/codegen/testing/test/testdata/dashed-import-schema/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/different-enum/nodejs/package.json b/pkg/codegen/testing/test/testdata/different-enum/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/external-node-compatibility/nodejs/package.json b/pkg/codegen/testing/test/testdata/external-node-compatibility/nodejs/package.json
@@ -6,14 +6,13 @@
         "install": "node scripts/install-pulumi-plugin.js resource example ${VERSION}"
     },
     "dependencies": {
-        "@pulumi/google-native": "^0.11.0"
+        "@pulumi/google-native": "^0.11.0",
+        "@pulumi/pulumi": "^3.42.0"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^4.3.5"
     },
-    "peerDependencies": {
-        "@pulumi/pulumi": "latest"
-    },
     "pulumi": {
         "resource": true,
         "name": "example"

diff --git a/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/package.json b/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/package.json
@@ -8,14 +8,13 @@
     "dependencies": {
         "@pulumi/aws": "^4.19.0",
         "@pulumi/kubernetes": "^3.7.0",
+        "@pulumi/pulumi": "^3.42.0",
         "@pulumi/random": "^4.2.0"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^4.3.5"
     },
-    "peerDependencies": {
-        "@pulumi/pulumi": "latest"
-    },
     "pulumi": {
         "resource": true,
         "name": "example"

diff --git a/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/package.json b/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/package.json
@@ -5,13 +5,13 @@
         "build": "tsc",
         "install": "node scripts/install-pulumi-plugin.js resource mypkg ${VERSION}"
     },
+    "dependencies": {
+        "@pulumi/pulumi": "^3.42.0"
+    },
     "devDependencies": {
         "@types/node": "latest",
         "typescript": "^4.3.5"
     },
-    "peerDependencies": {
-        "@pulumi/pulumi": "latest"
-    },
     "pulumi": {
         "resource": true,
         "name": "mypkg"

diff --git a/pkg/codegen/testing/test/testdata/hyphen-url/nodejs/package.json b/pkg/codegen/testing/test/testdata/hyphen-url/nodejs/package.json
@@ -10,6 +10,7 @@
         "@pulumi/pulumi": "^3.7.0"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/naming-collisions/nodejs/package.json b/pkg/codegen/testing/test/testdata/naming-collisions/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/nested-module-thirdparty/nodejs/package.json b/pkg/codegen/testing/test/testdata/nested-module-thirdparty/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/nested-module/nodejs/package.json b/pkg/codegen/testing/test/testdata/nested-module/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/package.json b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/package.json
@@ -5,14 +5,14 @@
         "build": "tsc",
         "install": "node scripts/install-pulumi-plugin.js resource myedgeorder ${VERSION}"
     },
+    "dependencies": {
+        "@pulumi/pulumi": "^3.42.0"
+    },
     "devDependencies": {
         "@types/node": "latest",
         "ts-node": "latest",
         "typescript": "^4.3.5"
     },
-    "peerDependencies": {
-        "@pulumi/pulumi": "latest"
-    },
     "pulumi": {
         "resource": true,
         "name": "myedgeorder"

diff --git a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/package.json b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/package.json
@@ -5,16 +5,16 @@
         "build": "tsc",
         "install": "node scripts/install-pulumi-plugin.js resource mypkg ${VERSION}"
     },
+    "dependencies": {
+        "@pulumi/pulumi": "^3.42.0"
+    },
     "devDependencies": {
         "@types/mocha": "latest",
         "@types/node": "latest",
         "mocha": "latest",
         "ts-node": "latest",
         "typescript": "^4.3.5"
     },
-    "peerDependencies": {
-        "@pulumi/pulumi": "latest"
-    },
     "pulumi": {
         "resource": true,
         "name": "mypkg"

diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/package.json b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/package.json
@@ -5,16 +5,16 @@
         "build": "tsc",
         "install": "node scripts/install-pulumi-plugin.js resource mypkg ${VERSION}"
     },
+    "dependencies": {
+        "@pulumi/pulumi": "^3.42.0"
+    },
     "devDependencies": {
         "@types/mocha": "latest",
         "@types/node": "latest",
         "mocha": "latest",
         "ts-node": "latest",
         "typescript": "^4.3.5"
     },
-    "peerDependencies": {
-        "@pulumi/pulumi": "latest"
-    },
     "pulumi": {
         "resource": true,
         "name": "mypkg"

diff --git a/pkg/codegen/testing/test/testdata/plain-and-default/nodejs/package.json b/pkg/codegen/testing/test/testdata/plain-and-default/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/package.json b/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/package.json b/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/plain-schema-gh6957/nodejs/package.json b/pkg/codegen/testing/test/testdata/plain-schema-gh6957/nodejs/package.json
@@ -10,6 +10,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/package.json b/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/regress-8403/nodejs/package.json b/pkg/codegen/testing/test/testdata/regress-8403/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/regress-node-8110/nodejs/package.json b/pkg/codegen/testing/test/testdata/regress-node-8110/nodejs/package.json
@@ -5,14 +5,14 @@
         "build": "tsc",
         "install": "node scripts/install-pulumi-plugin.js resource my8110 ${VERSION}"
     },
+    "dependencies": {
+        "@pulumi/pulumi": "^3.42.0"
+    },
     "devDependencies": {
         "@types/node": "latest",
         "ts-node": "latest",
         "typescript": "^4.3.5"
     },
-    "peerDependencies": {
-        "@pulumi/pulumi": "latest"
-    },
     "pulumi": {
         "resource": true,
         "name": "my8110"

diff --git a/pkg/codegen/testing/test/testdata/replace-on-change/nodejs/package.json b/pkg/codegen/testing/test/testdata/replace-on-change/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/nodejs/package.json b/pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/resource-args-python/nodejs/package.json b/pkg/codegen/testing/test/testdata/resource-args-python/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/resource-property-overlap/nodejs/package.json b/pkg/codegen/testing/test/testdata/resource-property-overlap/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/secrets/nodejs/package.json b/pkg/codegen/testing/test/testdata/secrets/nodejs/package.json
@@ -5,13 +5,13 @@
         "build": "tsc",
         "install": "node scripts/install-pulumi-plugin.js resource mypkg ${VERSION}"
     },
+    "dependencies": {
+        "@pulumi/pulumi": "^3.42.0"
+    },
     "devDependencies": {
         "@types/node": "latest",
         "typescript": "^4.3.5"
     },
-    "peerDependencies": {
-        "@pulumi/pulumi": "latest"
-    },
     "pulumi": {
         "resource": true,
         "name": "mypkg"

diff --git a/pkg/codegen/testing/test/testdata/simple-enum-schema/nodejs/package.json b/pkg/codegen/testing/test/testdata/simple-enum-schema/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/...egen/testing/test/testdata/simple-methods-schema-single-value-returns/nodejs/package.json b/...egen/testing/test/testdata/simple-methods-schema-single-value-returns/nodejs/package.json
@@ -5,13 +5,13 @@
         "build": "tsc",
         "install": "node scripts/install-pulumi-plugin.js resource example ${VERSION}"
     },
+    "dependencies": {
+        "@pulumi/pulumi": "^3.42.0"
+    },
     "devDependencies": {
         "@types/node": "latest",
         "typescript": "^4.3.5"
     },
-    "peerDependencies": {
-        "@pulumi/pulumi": "latest"
-    },
     "pulumi": {
         "resource": true,
         "name": "example"

diff --git a/pkg/codegen/testing/test/testdata/simple-methods-schema/nodejs/package.json b/pkg/codegen/testing/test/testdata/simple-methods-schema/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/nodejs/package.json b/pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/pkg/codegen/testing/test/testdata/simple-plain-schema/nodejs/package.json b/pkg/codegen/testing/test/testdata/simple-plain-schema/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {

diff --git a/...en/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/package.json b/...en/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/package.json
@@ -9,6 +9,7 @@
         "@pulumi/pulumi": "^3.12"
     },
     "devDependencies": {
+        "@types/node": "^18.11.9",
         "typescript": "^3.7.0"
     },
     "pulumi": {