diff --git a/changelog/pending/20221109--sdkgen-dotnet-nodejs--add-default-dependencies-for-generated-sdks.yaml b/changelog/pending/20221109--sdkgen-dotnet-nodejs--add-default-dependencies-for-generated-sdks.yaml new file mode 100644 index 000000000000..127269d091d0 --- /dev/null +++ b/changelog/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/dotnet/gen.go b/pkg/codegen/dotnet/gen.go index c290ada3fc53..48440503e7f8 100644 --- a/pkg/codegen/dotnet/gen.go +++ b/pkg/codegen/dotnet/gen.go @@ -2190,6 +2190,12 @@ func genProjectFile(pkg *schema.Package, packageReferences map[string]string, projectReferences []string) ([]byte, error) { + if packageReferences == nil { + packageReferences = map[string]string{} + } + if _, ok := packageReferences["Pulumi"]; !ok { + packageReferences["Pulumi"] = "3.*" + } w := &bytes.Buffer{} err := csharpProjectFileTemplate.Execute(w, csharpProjectFileTemplateContext{ XMLDoc: fmt.Sprintf(`.\%s.xml`, assemblyName), diff --git a/pkg/codegen/nodejs/gen.go b/pkg/codegen/nodejs/gen.go index 2abca06948d5..9aa8e95e4422 100644 --- 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 MinimumTypescriptVersion string = "^4.3.5" +const MinimumNodeTypesVersion string = "^14" + type typeDetails struct { outputType bool inputType bool @@ -2190,8 +2195,9 @@ func genNPMPackageMetadata(pkg *schema.Package, info NodePackageInfo) string { if info.TypeScriptVersion != "" { devDependencies["typescript"] = info.TypeScriptVersion } else { - devDependencies["typescript"] = "^4.3.5" + devDependencies["typescript"] = MinimumTypescriptVersion } + devDependencies["@types/node"] = MinimumNodeTypesVersion version := "${VERSION}" versionSet := pkg.Version != nil && info.RespectSchemaVersion @@ -2269,10 +2275,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"] = MinimumValidSDKVersion } // Now write out the serialized form. diff --git a/pkg/codegen/testing/test/testdata/azure-native-nested-types/dotnet/Pulumi.AzureNative.csproj b/pkg/codegen/testing/test/testdata/azure-native-nested-types/dotnet/Pulumi.AzureNative.csproj index fc3018150069..8a2d60cb264f 100644 --- a/pkg/codegen/testing/test/testdata/azure-native-nested-types/dotnet/Pulumi.AzureNative.csproj +++ b/pkg/codegen/testing/test/testdata/azure-native-nested-types/dotnet/Pulumi.AzureNative.csproj @@ -45,6 +45,7 @@ + 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 index 1a2e056ca3ac..16935878dfb3 100644 --- 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": "^14", "typescript": "^4.3.5" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/cyclic-types/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/cyclic-types/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/cyclic-types/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/cyclic-types/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + diff --git a/pkg/codegen/testing/test/testdata/cyclic-types/nodejs/package.json b/pkg/codegen/testing/test/testdata/cyclic-types/nodejs/package.json index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/dash-named-schema/dotnet/Pulumi.FooBar.csproj b/pkg/codegen/testing/test/testdata/dash-named-schema/dotnet/Pulumi.FooBar.csproj index f43e6a3421e0..5b10aee99af5 100644 --- a/pkg/codegen/testing/test/testdata/dash-named-schema/dotnet/Pulumi.FooBar.csproj +++ b/pkg/codegen/testing/test/testdata/dash-named-schema/dotnet/Pulumi.FooBar.csproj @@ -45,6 +45,7 @@ + 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 index b5a2631a1233..100f7b7e0ce4 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/dashed-import-schema/dotnet/Pulumi.Plant.csproj b/pkg/codegen/testing/test/testdata/dashed-import-schema/dotnet/Pulumi.Plant.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/dashed-import-schema/dotnet/Pulumi.Plant.csproj +++ b/pkg/codegen/testing/test/testdata/dashed-import-schema/dotnet/Pulumi.Plant.csproj @@ -45,6 +45,7 @@ + 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 index 67e4c691cb65..05a8df3fb8a7 100644 --- 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": "^14", "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 index 67e4c691cb65..05a8df3fb8a7 100644 --- 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": "^14", "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 index 756188000eff..73c4091e75b4 100644 --- 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": "^14", "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 index 273109d659aa..b441cb4e5218 100644 --- 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": "^14", "typescript": "^4.3.5" }, - "peerDependencies": { - "@pulumi/pulumi": "latest" - }, "pulumi": { "resource": true, "name": "example" diff --git a/pkg/codegen/testing/test/testdata/functions-secrets/dotnet/Pulumi.Mypkg.csproj b/pkg/codegen/testing/test/testdata/functions-secrets/dotnet/Pulumi.Mypkg.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/functions-secrets/dotnet/Pulumi.Mypkg.csproj +++ b/pkg/codegen/testing/test/testdata/functions-secrets/dotnet/Pulumi.Mypkg.csproj @@ -45,6 +45,7 @@ + diff --git a/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/package.json b/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/package.json index 9307ee332062..01067f9227a6 100644 --- 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/dotnet/Pulumi.Registrygeoreplication.csproj b/pkg/codegen/testing/test/testdata/hyphen-url/dotnet/Pulumi.Registrygeoreplication.csproj index 4c9f1846ae17..bdfdcd15d92c 100644 --- a/pkg/codegen/testing/test/testdata/hyphen-url/dotnet/Pulumi.Registrygeoreplication.csproj +++ b/pkg/codegen/testing/test/testdata/hyphen-url/dotnet/Pulumi.Registrygeoreplication.csproj @@ -45,6 +45,7 @@ + diff --git a/pkg/codegen/testing/test/testdata/hyphen-url/nodejs/package.json b/pkg/codegen/testing/test/testdata/hyphen-url/nodejs/package.json index 0d4e989c4466..375d3ed53e3f 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/naming-collisions/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/naming-collisions/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/naming-collisions/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/naming-collisions/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + diff --git a/pkg/codegen/testing/test/testdata/naming-collisions/nodejs/package.json b/pkg/codegen/testing/test/testdata/naming-collisions/nodejs/package.json index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/nested-module-thirdparty/dotnet/Pulumi.FooBar.csproj b/pkg/codegen/testing/test/testdata/nested-module-thirdparty/dotnet/Pulumi.FooBar.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/nested-module-thirdparty/dotnet/Pulumi.FooBar.csproj +++ b/pkg/codegen/testing/test/testdata/nested-module-thirdparty/dotnet/Pulumi.FooBar.csproj @@ -45,6 +45,7 @@ + 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 index b5a2631a1233..100f7b7e0ce4 100644 --- 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": "^14", "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 index 87767057f7bf..751c95e6e0fa 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/dotnet/Pulumi.Myedgeorder.csproj b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/dotnet/Pulumi.Myedgeorder.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/dotnet/Pulumi.Myedgeorder.csproj +++ b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/dotnet/Pulumi.Myedgeorder.csproj @@ -45,6 +45,7 @@ + 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 index 7aaa3cc06d90..8a9b17686235 100644 --- 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/dotnet/Pulumi.Mypkg.csproj b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/dotnet/Pulumi.Mypkg.csproj index ceeb28023321..5eb018749352 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/dotnet/Pulumi.Mypkg.csproj +++ b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/dotnet/Pulumi.Mypkg.csproj @@ -50,6 +50,7 @@ + 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 index 4917a182d07c..08f5577ca21e 100644 --- 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,6 +5,9 @@ "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", @@ -12,9 +15,6 @@ "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/dotnet/Pulumi.Mypkg.csproj b/pkg/codegen/testing/test/testdata/output-funcs/dotnet/Pulumi.Mypkg.csproj index ceeb28023321..5eb018749352 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/dotnet/Pulumi.Mypkg.csproj +++ b/pkg/codegen/testing/test/testdata/output-funcs/dotnet/Pulumi.Mypkg.csproj @@ -50,6 +50,7 @@ + diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/package.json b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/package.json index 4917a182d07c..08f5577ca21e 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/package.json +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/package.json @@ -5,6 +5,9 @@ "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", @@ -12,9 +15,6 @@ "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/dotnet/Pulumi.FooBar.csproj b/pkg/codegen/testing/test/testdata/plain-and-default/dotnet/Pulumi.FooBar.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/plain-and-default/dotnet/Pulumi.FooBar.csproj +++ b/pkg/codegen/testing/test/testdata/plain-and-default/dotnet/Pulumi.FooBar.csproj @@ -45,6 +45,7 @@ + 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 index 28b107ec4fca..22ea9f122b8c 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/plain-object-defaults/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/plain-object-defaults/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/plain-object-defaults/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/plain-object-defaults/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + 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 index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + 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 index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/plain-schema-gh6957/dotnet/Pulumi.Xyz.csproj b/pkg/codegen/testing/test/testdata/plain-schema-gh6957/dotnet/Pulumi.Xyz.csproj index e6ac8bba8089..0da5aa49bc3b 100644 --- a/pkg/codegen/testing/test/testdata/plain-schema-gh6957/dotnet/Pulumi.Xyz.csproj +++ b/pkg/codegen/testing/test/testdata/plain-schema-gh6957/dotnet/Pulumi.Xyz.csproj @@ -45,6 +45,7 @@ + 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 index da954ab3fac1..a7684a41e4cc 100644 --- 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": "^14", "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 index ccb545e3d127..3cc62c9d8a14 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/regress-8403/dotnet/Pulumi.Mongodbatlas.csproj b/pkg/codegen/testing/test/testdata/regress-8403/dotnet/Pulumi.Mongodbatlas.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/regress-8403/dotnet/Pulumi.Mongodbatlas.csproj +++ b/pkg/codegen/testing/test/testdata/regress-8403/dotnet/Pulumi.Mongodbatlas.csproj @@ -45,6 +45,7 @@ + diff --git a/pkg/codegen/testing/test/testdata/regress-8403/nodejs/package.json b/pkg/codegen/testing/test/testdata/regress-8403/nodejs/package.json index d4d8ed4ee510..dd721fee83d4 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/regress-node-8110/dotnet/Pulumi.My8110.csproj b/pkg/codegen/testing/test/testdata/regress-node-8110/dotnet/Pulumi.My8110.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/regress-node-8110/dotnet/Pulumi.My8110.csproj +++ b/pkg/codegen/testing/test/testdata/regress-node-8110/dotnet/Pulumi.My8110.csproj @@ -45,6 +45,7 @@ + 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 index cbafaf322ecd..2e3a0a5226c4 100644 --- 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/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/replace-on-change/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/replace-on-change/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/replace-on-change/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + 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 index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + 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 index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/resource-args-python/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/resource-args-python/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/resource-args-python/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/resource-args-python/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + 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 index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/resource-property-overlap/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/resource-property-overlap/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/resource-property-overlap/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/resource-property-overlap/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + 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 index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/secrets/dotnet/Pulumi.Mypkg.csproj b/pkg/codegen/testing/test/testdata/secrets/dotnet/Pulumi.Mypkg.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/secrets/dotnet/Pulumi.Mypkg.csproj +++ b/pkg/codegen/testing/test/testdata/secrets/dotnet/Pulumi.Mypkg.csproj @@ -45,6 +45,7 @@ + diff --git a/pkg/codegen/testing/test/testdata/secrets/nodejs/package.json b/pkg/codegen/testing/test/testdata/secrets/nodejs/package.json index 9307ee332062..01067f9227a6 100644 --- 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/dotnet/Pulumi.Plant.csproj b/pkg/codegen/testing/test/testdata/simple-enum-schema/dotnet/Pulumi.Plant.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/simple-enum-schema/dotnet/Pulumi.Plant.csproj +++ b/pkg/codegen/testing/test/testdata/simple-enum-schema/dotnet/Pulumi.Plant.csproj @@ -45,6 +45,7 @@ + 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 index ec18c8224664..cddba8c37d9f 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/simple-methods-schema-single-value-returns/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/simple-methods-schema-single-value-returns/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/simple-methods-schema-single-value-returns/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/simple-methods-schema-single-value-returns/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + diff --git a/pkg/codegen/testing/test/testdata/simple-methods-schema-single-value-returns/nodejs/package.json b/pkg/codegen/testing/test/testdata/simple-methods-schema-single-value-returns/nodejs/package.json index 2bfe6f2155bb..1f46b9e86d45 100644 --- a/pkg/codegen/testing/test/testdata/simple-methods-schema-single-value-returns/nodejs/package.json +++ b/pkg/codegen/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/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/simple-methods-schema/dotnet/Pulumi.Example.csproj index dea2cc23b1dc..2b53b9f1ef60 100644 --- a/pkg/codegen/testing/test/testdata/simple-methods-schema/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/simple-methods-schema/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + 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 index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + 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 index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/simple-plain-schema/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/simple-plain-schema/dotnet/Pulumi.Example.csproj index ced8e3baa5db..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/simple-plain-schema/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/simple-plain-schema/dotnet/Pulumi.Example.csproj @@ -45,6 +45,7 @@ + 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 index 39efc71d3569..9e147af2fbbe 100644 --- 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": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/package.json b/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/package.json index 39efc71d3569..9e147af2fbbe 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/package.json +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/package.json @@ -9,6 +9,7 @@ "@pulumi/pulumi": "^3.12" }, "devDependencies": { + "@types/node": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/simple-resource-schema/dotnet/Pulumi.Example.csproj b/pkg/codegen/testing/test/testdata/simple-resource-schema/dotnet/Pulumi.Example.csproj index 9d24aa112245..852b9550bbff 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema/dotnet/Pulumi.Example.csproj +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema/dotnet/Pulumi.Example.csproj @@ -45,7 +45,7 @@ - + diff --git a/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/package.json b/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/package.json index 61a44f63c5ac..a3358e004bd2 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/package.json +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/package.json @@ -9,6 +9,7 @@ "@pulumi/pulumi": "^3.12" }, "devDependencies": { + "@types/node": "^14", "typescript": "^3.7.0" }, "pulumi": { diff --git a/pkg/codegen/testing/test/testdata/simple-resource-schema/schema.json b/pkg/codegen/testing/test/testdata/simple-resource-schema/schema.json index ec3e3d07d02c..05b9b366be94 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema/schema.json +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema/schema.json @@ -255,9 +255,6 @@ "projectReferences": [ "..\\..\\..\\..\\..\\..\\..\\sdk\\dotnet\\Pulumi\\Pulumi.csproj" ], - "packageReferences": { - "Pulumi": "3.13" - }, "respectSchemaVersion": true }, "go": { diff --git a/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/package.json b/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/package.json index 39efc71d3569..9e147af2fbbe 100644 --- a/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/package.json +++ b/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/package.json @@ -9,6 +9,7 @@ "@pulumi/pulumi": "^3.12" }, "devDependencies": { + "@types/node": "^14", "typescript": "^3.7.0" }, "pulumi": {