diff --git a/samples/react-birthdays/.devcontainer/devcontainer.json b/samples/react-birthdays/.devcontainer/devcontainer.json index 003ac4b58..896564300 100644 --- a/samples/react-birthdays/.devcontainer/devcontainer.json +++ b/samples/react-birthdays/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // For more information on how to run this SPFx project in a VS Code Remote Container, please visit https://aka.ms/spfx-devcontainer { - "name": "SPFx 1.8.2", - "image": "docker.io/m365pnp/spfx:1.8.2", + "name": "SPFx 1.14.0", + "image": "docker.io/m365pnp/spfx:1.14.0", // Set *default* container specific settings.json values on container create. "settings": {}, // Add the IDs of extensions you want installed when the container is created. @@ -12,8 +12,7 @@ // Use 'forwardPorts' to make a list of ports inside the container available locally. "forwardPorts": [ 4321, - 35729, - 5432 + 35729 ], "portsAttributes": { "4321": { @@ -22,11 +21,12 @@ "onAutoForward": "silent", "requireLocalPort": true }, - "5432": { - "protocol": "https", - "label": "Workbench", - "onAutoForward": "silent" - }, + // Not needed for SPFx>= 1.12.1 + // "5432": { + // "protocol": "https", + // "label": "Workbench", + // "onAutoForward": "silent" + // }, "35729": { "protocol": "https", "label": "LiveReload", @@ -36,4 +36,4 @@ }, "postCreateCommand": "bash .devcontainer/spfx-startup.sh", "remoteUser": "node" -} \ No newline at end of file +} diff --git a/samples/react-birthdays/.devcontainer/spfx-startup.sh b/samples/react-birthdays/.devcontainer/spfx-startup.sh index ca531bdf2..456d6aea8 100644 --- a/samples/react-birthdays/.devcontainer/spfx-startup.sh +++ b/samples/react-birthdays/.devcontainer/spfx-startup.sh @@ -7,9 +7,11 @@ echo echo -e "\e[1;94mGenerating dev certificate\e[0m" gulp trust-dev-cert +# Convert the generated PEM certificate to a CER certificate +openssl x509 -inform PEM -in ~/.rushstack/rushstack-serve.pem -outform DER -out ./spfx-dev-cert.cer -cp ~/.gcb-serve-data/gcb-serve.cer ./spfx-dev-cert.cer -cp ~/.gcb-serve-data/gcb-serve.cer ./spfx-dev-cert.pem +# Copy the PEM ecrtificate for non-Windows hosts +cp ~/.rushstack/rushstack-serve.pem ./spfx-dev-cert.pem ## add *.cer to .gitignore to prevent certificates from being saved in repo if ! grep -Fxq '*.cer' ./.gitignore diff --git a/samples/react-birthdays/.gitignore b/samples/react-birthdays/.gitignore index 0e655ce79..9d22b0f94 100644 --- a/samples/react-birthdays/.gitignore +++ b/samples/react-birthdays/.gitignore @@ -31,3 +31,7 @@ obj # Styles Generated Code *.scss.ts +# .CER Certificates +*.cer +# .PEM Certificates +*.pem diff --git a/samples/react-birthdays/assets/sample.json b/samples/react-birthdays/assets/sample.json index 5109e3b87..3248b4bf5 100644 --- a/samples/react-birthdays/assets/sample.json +++ b/samples/react-birthdays/assets/sample.json @@ -9,7 +9,7 @@ "The Web Part Birthdays shows the upcoming birthdays in the company, the web part reads birthdays from a list located on the tenant\u0027s root site with title \u0022Birthdays.\u0022" ], "creationDateTime": "2019-07-23", - "updateDateTime": "2021-06-16", + "updateDateTime": "2022-04-07", "products": [ "SharePoint" ], @@ -20,7 +20,7 @@ }, { "key": "SPFX-VERSION", - "value": "1.12.1" + "value": "1.14.0" }, { "key": "SPFX-TEAMSTAB",