pushing port:sample changes into an internal branch instead of extern…

…al (#4361) * pushing port:sample changes into an internal branch instead of external * forgot the gitignore file and properly merged in pnpmlock file * Change files
Azure · Apr 10, 2024 · 89da811 · 89da811
1 parent 76a858a
commit 89da811
Show file tree

Hide file tree

Showing 49 changed files with 183 additions and 174 deletions.
diff --git a/.gitignore b/.gitignore
@@ -114,3 +114,8 @@ apis/
 
 # To avoid accidental checkin of connection string secrets
 samples/Server/appsettings.json
+
+samples/Server/sample-dist/
+samples/Calling/sample-dist/
+samples/CallWithChat/sample-dist/
+samples/Chat/sample-dist/
diff --git a/change/@azure-communication-react-ff7297f2-35c6-4cf4-a173-032a0c41a9ba.json b/change/@azure-communication-react-ff7297f2-35c6-4cf4-a173-032a0c41a9ba.json
@@ -0,0 +1,9 @@
+{
+  "type": "none",
+  "area": "improvement",
+  "workstream": "Release Driving Improvements",
+  "comment": "pushing port:sample changes into an internal branch instead of external",
+  "packageName": "@azure/communication-react",
+  "email": "[email protected]",
+  "dependentChangeType": "none"
+}
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/variants/stable/pnpm-lock.yaml b/common/config/rush/variants/stable/pnpm-lock.yaml
diff --git a/docs/releases/hero-samples.md b/docs/releases/hero-samples.md
@@ -56,13 +56,15 @@ This section uses [an update to the chat hero sample](https://github.com/Azure-S
   - In this monorepository,
     ```
     cd samples/Chat
-    rushx preprocess:stable-flavor
+    rushx port-sample
     ```
-  - This will generate a `samples/Chat/preprocessed` directory which contains the sources from `samples/Chat/src`, but conditionally compiled for the `stable` build flavor and prettified.
+- This will generate a `samples/Chat/sample-dist` directory which contains the updates to src, Media, public directories in `samples/Chat/`, but conditionally compiled for the `stable` build flavor and prettified.
 
 - Replace the hero sample sources.
   - Create a new branch in the chat hero sample repo.
-  - Replace `Chat/src` with the generated `samples/Chat/preprocessed` from the last step.
+  - Replace `Chat/src` with the generated `samples/Chat/sample-dist/src` from the directory we generated in the previous step.
+  - Replace `Chat/Media` with the generated `samples/Chat/sample-dist/Media` from the directory we generated in the previous step.
+  - Replace `Chat/public` with the generated `samples/Chat/sample-dist/public` from the directory we generated in the previous step.
   - Create a draft Pull Request against `main`.
     - Link to the source git commit in upstream that you generated the sources from. [Example PR description](https://github.com/Azure-Samples/communication-services-web-chat-hero/pull/69).
 

diff --git a/packages/react-components/src/localization/locales/ar-SA/strings.json b/packages/react-components/src/localization/locales/ar-SA/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "الصفحة السابقة",
     "rightNavButtonAriaLabel": "الصفحة التالية"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/cs-CZ/strings.json b/packages/react-components/src/localization/locales/cs-CZ/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "předchozí stránka",
     "rightNavButtonAriaLabel": "další stránka"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/de-DE/strings.json b/packages/react-components/src/localization/locales/de-DE/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "Vorherige Seite",
     "rightNavButtonAriaLabel": "Nächste Seite"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/en-GB/strings.json b/packages/react-components/src/localization/locales/en-GB/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "previous page",
     "rightNavButtonAriaLabel": "next page"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/es-ES/strings.json b/packages/react-components/src/localization/locales/es-ES/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "página anterior",
     "rightNavButtonAriaLabel": "página siguiente"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/fi-FI/strings.json b/packages/react-components/src/localization/locales/fi-FI/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "edellinen sivu",
     "rightNavButtonAriaLabel": "seuraava sivu"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/fr-FR/strings.json b/packages/react-components/src/localization/locales/fr-FR/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "page précédente",
     "rightNavButtonAriaLabel": "page suivante"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/he-IL/strings.json b/packages/react-components/src/localization/locales/he-IL/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "הדף הקודם",
     "rightNavButtonAriaLabel": "הדף הבא"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/it-IT/strings.json b/packages/react-components/src/localization/locales/it-IT/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "Pagina precedente",
     "rightNavButtonAriaLabel": "Pagina successiva"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/ja-JP/strings.json b/packages/react-components/src/localization/locales/ja-JP/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "前のページ",
     "rightNavButtonAriaLabel": "次のページ"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/ko-KR/strings.json b/packages/react-components/src/localization/locales/ko-KR/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "이전 페이지",
     "rightNavButtonAriaLabel": "다음 페이지"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/nb-NO/strings.json b/packages/react-components/src/localization/locales/nb-NO/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "forrige side",
     "rightNavButtonAriaLabel": "neste side"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/nl-NL/strings.json b/packages/react-components/src/localization/locales/nl-NL/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "vorige pagina",
     "rightNavButtonAriaLabel": "volgende pagina"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/pl-PL/strings.json b/packages/react-components/src/localization/locales/pl-PL/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "poprzednia strona",
     "rightNavButtonAriaLabel": "następna strona"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/pt-BR/strings.json b/packages/react-components/src/localization/locales/pt-BR/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "página anterior",
     "rightNavButtonAriaLabel": "próxima página"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/ru-RU/strings.json b/packages/react-components/src/localization/locales/ru-RU/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "предыдущая страница",
     "rightNavButtonAriaLabel": "следующая страница"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/sv-SE/strings.json b/packages/react-components/src/localization/locales/sv-SE/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "föregående sida",
     "rightNavButtonAriaLabel": "nästa sida"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/tr-TR/strings.json b/packages/react-components/src/localization/locales/tr-TR/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "önceki sayfa",
     "rightNavButtonAriaLabel": "sonraki sayfa"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/zh-CN/strings.json b/packages/react-components/src/localization/locales/zh-CN/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "上一页",
     "rightNavButtonAriaLabel": "下一页"
   }
-}
+}
diff --git a/packages/react-components/src/localization/locales/zh-TW/strings.json b/packages/react-components/src/localization/locales/zh-TW/strings.json
@@ -393,4 +393,4 @@
     "leftNavButtonAriaLabel": "上一頁",
     "rightNavButtonAriaLabel": "下一頁"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/ar-SA/strings.json b/packages/react-composites/src/composites/localization/locales/ar-SA/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "عرض لوحة الطلب",
     "dtmfDialpadPlaceholderText": "أدخل عدداً"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/cs-CZ/strings.json b/packages/react-composites/src/composites/localization/locales/cs-CZ/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Zobrazit číselník",
     "dtmfDialpadPlaceholderText": "Zadejte číslo"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/de-DE/strings.json b/packages/react-composites/src/composites/localization/locales/de-DE/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Wähltastatur anzeigen",
     "dtmfDialpadPlaceholderText": "Nummer eingeben"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/en-GB/strings.json b/packages/react-composites/src/composites/localization/locales/en-GB/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Show dialpad",
     "dtmfDialpadPlaceholderText": "Enter number"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/es-ES/strings.json b/packages/react-composites/src/composites/localization/locales/es-ES/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Mostrar teclado de marcado",
     "dtmfDialpadPlaceholderText": "Introducir número"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/fi-FI/strings.json b/packages/react-composites/src/composites/localization/locales/fi-FI/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Näytä valintapaneeli",
     "dtmfDialpadPlaceholderText": "Syötä numero"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/fr-FR/strings.json b/packages/react-composites/src/composites/localization/locales/fr-FR/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Afficher le pavé numérique",
     "dtmfDialpadPlaceholderText": "Saisir un numéro"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/he-IL/strings.json b/packages/react-composites/src/composites/localization/locales/he-IL/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "הצג לוח חיוג",
     "dtmfDialpadPlaceholderText": "הזן מספר"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/it-IT/strings.json b/packages/react-composites/src/composites/localization/locales/it-IT/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Mostra tastiera",
     "dtmfDialpadPlaceholderText": "Immetti il numero"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/ja-JP/strings.json b/packages/react-composites/src/composites/localization/locales/ja-JP/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "ダイヤルパッドを表示",
     "dtmfDialpadPlaceholderText": "番号を入力してください"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/ko-KR/strings.json b/packages/react-composites/src/composites/localization/locales/ko-KR/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "다이얼패드 표시",
     "dtmfDialpadPlaceholderText": "번호 입력"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/nb-NO/strings.json b/packages/react-composites/src/composites/localization/locales/nb-NO/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Vis numerisk tastatur",
     "dtmfDialpadPlaceholderText": "Skriv inn nummer"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/nl-NL/strings.json b/packages/react-composites/src/composites/localization/locales/nl-NL/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Toetsenblok weergeven",
     "dtmfDialpadPlaceholderText": "Nummer invoeren"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/pl-PL/strings.json b/packages/react-composites/src/composites/localization/locales/pl-PL/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Pokaż klawiaturę numeryczną",
     "dtmfDialpadPlaceholderText": "Wprowadź numer"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/pt-BR/strings.json b/packages/react-composites/src/composites/localization/locales/pt-BR/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Mostrar teclado de discagem",
     "dtmfDialpadPlaceholderText": "Digite o número"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/ru-RU/strings.json b/packages/react-composites/src/composites/localization/locales/ru-RU/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Показать панель набора номера",
     "dtmfDialpadPlaceholderText": "Введите номер"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/sv-SE/strings.json b/packages/react-composites/src/composites/localization/locales/sv-SE/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Visa knappsats",
     "dtmfDialpadPlaceholderText": "Ange nummer"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/tr-TR/strings.json b/packages/react-composites/src/composites/localization/locales/tr-TR/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "Tuş takımını göster",
     "dtmfDialpadPlaceholderText": "Numara girin"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/zh-CN/strings.json b/packages/react-composites/src/composites/localization/locales/zh-CN/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "显示拨号盘",
     "dtmfDialpadPlaceholderText": "输入号码"
   }
-}
+}
diff --git a/packages/react-composites/src/composites/localization/locales/zh-TW/strings.json b/packages/react-composites/src/composites/localization/locales/zh-TW/strings.json
@@ -375,4 +375,4 @@
     "openDtmfDialpadLabel": "顯示撥號盤",
     "dtmfDialpadPlaceholderText": "輸入號碼"
   }
-}
+}
diff --git a/samples/CallWithChat/package.json b/samples/CallWithChat/package.json
@@ -15,6 +15,7 @@
     "test": "",
     "test:ci-coverage": "echo skip",
     "test:stable": "echo skip",
+    "port:sample": "rushx preprocess:stable-flavor && cpx \"./preprocessed/**\" sample-dist/src && cpx \"./Media/**\" sample-dist/Media && cpx \"./public/**\" sample-dist/public",
     "preprocess": "cpx \"./src/**\" ./preprocessed && babel ./src --out-dir ../preprocessed --extensions \".ts,.tsx\" --keep-file-extension --config-file ./.babelrc.js --relative",
     "preprocess:stable-flavor": "rushx _stable-flavor \"rushx preprocess && rushx lint:fix && rushx prettier\"",
     "prettier": "prettier --no-error-on-unmatched-pattern --write --config ../../.prettierrc --ignore-path=../../.prettierignore \"**/*.js\" \"**/*.jsx\" \"**/*.ts\" \"**/*.tsx\"",
@@ -73,6 +74,7 @@
     "babel-loader": "8.1.0",
     "concurrently": "^5.3.0",
     "copyfiles": "^2.4.1",
+    "cpx": "^1.5.0",
     "cross-env": "^7.0.3",
     "css-loader": "^4.3.0",
     "env-cmd": "^10.1.0",
@@ -103,7 +105,6 @@
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "4.15.1",
     "webpack-bundle-analyzer": "^4.5.0",
-    "cpx": "^1.5.0",
     "@babel/cli": "^7.23.9"
   }
 }
diff --git a/samples/Calling/package.json b/samples/Calling/package.json
@@ -13,6 +13,7 @@
     "start:prod": "node dist/server.js",
     "test": "",
     "test:ci-coverage": "echo skip",
+    "port:sample": "rushx preprocess:stable-flavor && cpx \"./preprocessed/**\" sample-dist/src && cpx \"./Media/**\" sample-dist/Media && cpx \"./public/**\" sample-dist/public",
     "preprocess": "cpx \"./src/**\" ./preprocessed && babel ./src --out-dir ../preprocessed --extensions \".ts,.tsx\" --keep-file-extension --config-file ./.babelrc.js --relative",
     "preprocess:stable-flavor": "rushx _stable-flavor \"rushx preprocess && rushx lint:fix && rushx prettier\"",
     "prettier": "prettier --no-error-on-unmatched-pattern --write --config ../../.prettierrc --ignore-path=../../.prettierignore \"**/*.js\" \"**/*.jsx\" \"**/*.ts\" \"**/*.tsx\"",
@@ -74,6 +75,7 @@
     "babel-loader": "8.1.0",
     "concurrently": "^5.3.0",
     "copyfiles": "^2.4.1",
+    "cpx": "^1.5.0",
     "css-loader": "^4.3.0",
     "env-cmd": "^10.1.0",
     "eslint-config-prettier": "^6.12.0",
@@ -102,7 +104,6 @@
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "4.15.1",
     "webpack": "5.89.0",
-    "webpack-bundle-analyzer": "^4.5.0",
-    "cpx": "^1.5.0"
+    "webpack-bundle-analyzer": "^4.5.0"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -393,4 +393,4 @@ @@
         "leftNavButtonAriaLabel": "الصفحة السابقة",
         "rightNavButtonAriaLabel": "الصفحة التالية"
       }
-    }
+    }