From f6578742d6c957cf7e346db82f89171f80bedc3b Mon Sep 17 00:00:00 2001 From: Ruriko Araki Date: Mon, 25 Oct 2021 12:05:52 -0700 Subject: [PATCH] Declare tslib dependency (#1085) Fixes #1025 ### Platforms Impacted - [ ] iOS - [ ] macOS - [ ] win32 (Office) - [ ] windows - [ ] android ### Description of changes Declare tslib dependency where tslib is used and we have importHelpers in tsconfig.ts in our framework package. Version of tslib is ^1.13.0 as that's the latest release that's supported due to our current typescript version (we need 3.9 or above to bump to 2.0 or later) Also took the opportunity to use importHelpers in other packages that could use it, specifically for spreadArray so that is saves on bundle size. But if that change isn't desired, I can undo the last two commits and just fix the existing importHeaders ### Verification Change builds, verifying that the bundle works properly on win32 and windows. | Before | After | |----------------------------------------------|--------------------------------------------| | Screenshot or description before this change | Screenshot or description with this change | ### Pull request checklist This PR has considered (when applicable): - [ ] Automated Tests - [ ] Documentation and examples - [ ] Keyboard Accessibility - [ ] Voiceover - [ ] Internationalization and Right-to-left Layouts --- apps/fluent-tester/package.json | 3 ++- apps/fluent-tester/tsconfig.json | 1 + apps/win32/package.json | 3 ++- apps/win32/tsconfig.json | 1 + apps/windows/package.json | 3 ++- apps/windows/tsconfig.json | 1 + ...-438eabf0-60c7-4c80-b45d-a778adb2a903.json | 7 +++++++ ...-d86df6e8-b2a5-4bcd-a5a2-8050b1c44b8d.json | 7 +++++++ ...-9222a484-d308-4d90-93c1-11aacc7d8ce8.json | 7 +++++++ ...-444730c2-91d8-4f90-986e-50cc2ab36a02.json | 7 +++++++ ...-1712c877-99d5-4813-9f06-8f6e16d89b34.json | 7 +++++++ ...-2accfd74-9041-498d-bf9c-5e7c12458b5f.json | 7 +++++++ ...-967f262b-e010-4ff6-9b0b-8803da3721f8.json | 7 +++++++ ...-d87cedf6-e158-433e-ad6c-35c47706f115.json | 7 +++++++ ...-cce4229f-3cdb-41ca-ae75-4075df8bde79.json | 7 +++++++ ...-0048fae2-4bd8-4c13-8650-45782a059161.json | 7 +++++++ ...-bce61174-8355-4a7b-aba2-7575d8741e97.json | 7 +++++++ ...-d17df320-5d47-4bfb-b8ff-11cd48b2e3b6.json | 7 +++++++ ...-56b83211-31a4-4bd1-91ab-e5fa535266a1.json | 7 +++++++ ...-05d6174f-a198-4809-a4df-7e5c8fbe0830.json | 7 +++++++ ...-b299f74b-8951-47e3-ba0d-f0927ebf4288.json | 7 +++++++ ...-1fd30b9e-5c42-47f4-9955-15fb3c1b0495.json | 7 +++++++ packages/experimental/Button/package.json | 3 ++- packages/experimental/Button/tsconfig.json | 1 + packages/experimental/Checkbox/package.json | 3 ++- packages/experimental/Checkbox/tsconfig.json | 1 + packages/experimental/Stack/package.json | 3 ++- packages/experimental/Stack/tsconfig.json | 1 + packages/experimental/Tabs/package.json | 3 ++- packages/experimental/Tabs/tsconfig.json | 1 + packages/experimental/Text/package.json | 3 ++- packages/experimental/Text/tsconfig.json | 1 + packages/framework/framework/package.json | 3 ++- .../framework/immutable-merge/package.json | 3 +++ .../framework/immutable-merge/tsconfig.json | 1 + packages/framework/memo-cache/package.json | 3 ++- packages/framework/memo-cache/tsconfig.json | 1 + packages/framework/merge-props/package.json | 3 ++- packages/framework/merge-props/tsconfig.json | 1 + packages/framework/use-slot/package.json | 3 ++- packages/framework/use-slot/tsconfig.json | 1 + packages/framework/use-styling/package.json | 3 ++- packages/framework/use-styling/tsconfig.json | 1 + packages/framework/use-tokens/package.json | 3 ++- packages/framework/use-tokens/tsconfig.json | 1 + packages/theming/win32-theme/package.json | 3 ++- packages/theming/win32-theme/tsconfig.json | 1 + packages/utils/interactive-hooks/package.json | 3 ++- .../utils/interactive-hooks/tsconfig.json | 1 + packages/utils/tokens/package.json | 3 ++- packages/utils/tokens/tsconfig.json | 1 + scripts/src/tasks/depcheck.js | 20 +++++++++---------- tsconfig.json | 3 +-- yarn.lock | 5 +++++ 54 files changed, 182 insertions(+), 29 deletions(-) create mode 100644 change/@fluentui-react-native-experimental-button-438eabf0-60c7-4c80-b45d-a778adb2a903.json create mode 100644 change/@fluentui-react-native-experimental-checkbox-d86df6e8-b2a5-4bcd-a5a2-8050b1c44b8d.json create mode 100644 change/@fluentui-react-native-experimental-tabs-9222a484-d308-4d90-93c1-11aacc7d8ce8.json create mode 100644 change/@fluentui-react-native-experimental-text-444730c2-91d8-4f90-986e-50cc2ab36a02.json create mode 100644 change/@fluentui-react-native-framework-1712c877-99d5-4813-9f06-8f6e16d89b34.json create mode 100644 change/@fluentui-react-native-immutable-merge-2accfd74-9041-498d-bf9c-5e7c12458b5f.json create mode 100644 change/@fluentui-react-native-interactive-hooks-967f262b-e010-4ff6-9b0b-8803da3721f8.json create mode 100644 change/@fluentui-react-native-memo-cache-d87cedf6-e158-433e-ad6c-35c47706f115.json create mode 100644 change/@fluentui-react-native-merge-props-cce4229f-3cdb-41ca-ae75-4075df8bde79.json create mode 100644 change/@fluentui-react-native-tester-0048fae2-4bd8-4c13-8650-45782a059161.json create mode 100644 change/@fluentui-react-native-tester-win32-bce61174-8355-4a7b-aba2-7575d8741e97.json create mode 100644 change/@fluentui-react-native-tokens-d17df320-5d47-4bfb-b8ff-11cd48b2e3b6.json create mode 100644 change/@fluentui-react-native-use-slot-56b83211-31a4-4bd1-91ab-e5fa535266a1.json create mode 100644 change/@fluentui-react-native-use-styling-05d6174f-a198-4809-a4df-7e5c8fbe0830.json create mode 100644 change/@fluentui-react-native-use-tokens-b299f74b-8951-47e3-ba0d-f0927ebf4288.json create mode 100644 change/@fluentui-react-native-win32-theme-1fd30b9e-5c42-47f4-9955-15fb3c1b0495.json diff --git a/apps/fluent-tester/package.json b/apps/fluent-tester/package.json index 585a4699e5..81b63075ea 100644 --- a/apps/fluent-tester/package.json +++ b/apps/fluent-tester/package.json @@ -52,7 +52,8 @@ "@fluentui/react-native": ">=0.26.5 <1.0.0", "@react-native-community/slider": "^3.0.3", "@react-native-menu/menu": "^0.1.2", - "@react-native-picker/picker": "^1.16.7" + "@react-native-picker/picker": "^1.16.7", + "tslib": "^1.13.0" }, "devDependencies": { "@rnx-kit/cli": "^0.5.27", diff --git a/apps/fluent-tester/tsconfig.json b/apps/fluent-tester/tsconfig.json index e643b62122..729077a709 100644 --- a/apps/fluent-tester/tsconfig.json +++ b/apps/fluent-tester/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "baseUrl": ".", + "importHelpers": true, "outDir": "lib", "paths": { "*": ["*", "*.win32", "./*"], diff --git a/apps/win32/package.json b/apps/win32/package.json index 4832da143c..7e31a6c8b7 100644 --- a/apps/win32/package.json +++ b/apps/win32/package.json @@ -31,7 +31,8 @@ "@fluentui-react-native/tester": "^0.45.1", "react": "16.13.1", "react-native": "^0.63.2", - "react-native-svg": "^12.1.1" + "react-native-svg": "^12.1.1", + "tslib": "^1.13.0" }, "devDependencies": { "@office-iss/react-native-win32": "^0.63.7", diff --git a/apps/win32/tsconfig.json b/apps/win32/tsconfig.json index 1c6661a56e..0ebe259d62 100644 --- a/apps/win32/tsconfig.json +++ b/apps/win32/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "baseUrl": ".", + "importHelpers": true, "paths": { "*": ["*", "*.win32"], "src/*": ["./src/*"] diff --git a/apps/windows/package.json b/apps/windows/package.json index 8701d9db33..fc5eaa22a6 100644 --- a/apps/windows/package.json +++ b/apps/windows/package.json @@ -21,7 +21,8 @@ "react": "16.13.1", "react-native": "^0.63.2", "react-native-svg": "^12.1.1", - "react-native-windows": "^0.64.0" + "react-native-windows": "^0.64.0", + "tslib": "^1.13.0" }, "devDependencies": { "@babel/core": "^7.6.2", diff --git a/apps/windows/tsconfig.json b/apps/windows/tsconfig.json index 1c6661a56e..0ebe259d62 100644 --- a/apps/windows/tsconfig.json +++ b/apps/windows/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "baseUrl": ".", + "importHelpers": true, "paths": { "*": ["*", "*.win32"], "src/*": ["./src/*"] diff --git a/change/@fluentui-react-native-experimental-button-438eabf0-60c7-4c80-b45d-a778adb2a903.json b/change/@fluentui-react-native-experimental-button-438eabf0-60c7-4c80-b45d-a778adb2a903.json new file mode 100644 index 0000000000..c17d54ba6f --- /dev/null +++ b/change/@fluentui-react-native-experimental-button-438eabf0-60c7-4c80-b45d-a778adb2a903.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/experimental-button", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-experimental-checkbox-d86df6e8-b2a5-4bcd-a5a2-8050b1c44b8d.json b/change/@fluentui-react-native-experimental-checkbox-d86df6e8-b2a5-4bcd-a5a2-8050b1c44b8d.json new file mode 100644 index 0000000000..bdd6fd2da5 --- /dev/null +++ b/change/@fluentui-react-native-experimental-checkbox-d86df6e8-b2a5-4bcd-a5a2-8050b1c44b8d.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/experimental-checkbox", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-experimental-tabs-9222a484-d308-4d90-93c1-11aacc7d8ce8.json b/change/@fluentui-react-native-experimental-tabs-9222a484-d308-4d90-93c1-11aacc7d8ce8.json new file mode 100644 index 0000000000..eabb6456c4 --- /dev/null +++ b/change/@fluentui-react-native-experimental-tabs-9222a484-d308-4d90-93c1-11aacc7d8ce8.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/experimental-tabs", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-experimental-text-444730c2-91d8-4f90-986e-50cc2ab36a02.json b/change/@fluentui-react-native-experimental-text-444730c2-91d8-4f90-986e-50cc2ab36a02.json new file mode 100644 index 0000000000..3b1ddd46fb --- /dev/null +++ b/change/@fluentui-react-native-experimental-text-444730c2-91d8-4f90-986e-50cc2ab36a02.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/experimental-text", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-framework-1712c877-99d5-4813-9f06-8f6e16d89b34.json b/change/@fluentui-react-native-framework-1712c877-99d5-4813-9f06-8f6e16d89b34.json new file mode 100644 index 0000000000..b47569b1cb --- /dev/null +++ b/change/@fluentui-react-native-framework-1712c877-99d5-4813-9f06-8f6e16d89b34.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Fix dependency", + "packageName": "@fluentui-react-native/framework", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-immutable-merge-2accfd74-9041-498d-bf9c-5e7c12458b5f.json b/change/@fluentui-react-native-immutable-merge-2accfd74-9041-498d-bf9c-5e7c12458b5f.json new file mode 100644 index 0000000000..97983a1411 --- /dev/null +++ b/change/@fluentui-react-native-immutable-merge-2accfd74-9041-498d-bf9c-5e7c12458b5f.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/immutable-merge", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-interactive-hooks-967f262b-e010-4ff6-9b0b-8803da3721f8.json b/change/@fluentui-react-native-interactive-hooks-967f262b-e010-4ff6-9b0b-8803da3721f8.json new file mode 100644 index 0000000000..ef46ac384d --- /dev/null +++ b/change/@fluentui-react-native-interactive-hooks-967f262b-e010-4ff6-9b0b-8803da3721f8.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/interactive-hooks", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-memo-cache-d87cedf6-e158-433e-ad6c-35c47706f115.json b/change/@fluentui-react-native-memo-cache-d87cedf6-e158-433e-ad6c-35c47706f115.json new file mode 100644 index 0000000000..1a408d1f10 --- /dev/null +++ b/change/@fluentui-react-native-memo-cache-d87cedf6-e158-433e-ad6c-35c47706f115.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/memo-cache", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-merge-props-cce4229f-3cdb-41ca-ae75-4075df8bde79.json b/change/@fluentui-react-native-merge-props-cce4229f-3cdb-41ca-ae75-4075df8bde79.json new file mode 100644 index 0000000000..f55381f1d1 --- /dev/null +++ b/change/@fluentui-react-native-merge-props-cce4229f-3cdb-41ca-ae75-4075df8bde79.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/merge-props", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-tester-0048fae2-4bd8-4c13-8650-45782a059161.json b/change/@fluentui-react-native-tester-0048fae2-4bd8-4c13-8650-45782a059161.json new file mode 100644 index 0000000000..9b2503accd --- /dev/null +++ b/change/@fluentui-react-native-tester-0048fae2-4bd8-4c13-8650-45782a059161.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/tester", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-tester-win32-bce61174-8355-4a7b-aba2-7575d8741e97.json b/change/@fluentui-react-native-tester-win32-bce61174-8355-4a7b-aba2-7575d8741e97.json new file mode 100644 index 0000000000..f3333009cc --- /dev/null +++ b/change/@fluentui-react-native-tester-win32-bce61174-8355-4a7b-aba2-7575d8741e97.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/tester-win32", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-tokens-d17df320-5d47-4bfb-b8ff-11cd48b2e3b6.json b/change/@fluentui-react-native-tokens-d17df320-5d47-4bfb-b8ff-11cd48b2e3b6.json new file mode 100644 index 0000000000..0b7c33d699 --- /dev/null +++ b/change/@fluentui-react-native-tokens-d17df320-5d47-4bfb-b8ff-11cd48b2e3b6.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/tokens", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-use-slot-56b83211-31a4-4bd1-91ab-e5fa535266a1.json b/change/@fluentui-react-native-use-slot-56b83211-31a4-4bd1-91ab-e5fa535266a1.json new file mode 100644 index 0000000000..a97b8fcb09 --- /dev/null +++ b/change/@fluentui-react-native-use-slot-56b83211-31a4-4bd1-91ab-e5fa535266a1.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/use-slot", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-use-styling-05d6174f-a198-4809-a4df-7e5c8fbe0830.json b/change/@fluentui-react-native-use-styling-05d6174f-a198-4809-a4df-7e5c8fbe0830.json new file mode 100644 index 0000000000..b3631096a9 --- /dev/null +++ b/change/@fluentui-react-native-use-styling-05d6174f-a198-4809-a4df-7e5c8fbe0830.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/use-styling", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-use-tokens-b299f74b-8951-47e3-ba0d-f0927ebf4288.json b/change/@fluentui-react-native-use-tokens-b299f74b-8951-47e3-ba0d-f0927ebf4288.json new file mode 100644 index 0000000000..4fb1419084 --- /dev/null +++ b/change/@fluentui-react-native-use-tokens-b299f74b-8951-47e3-ba0d-f0927ebf4288.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/use-tokens", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-win32-theme-1fd30b9e-5c42-47f4-9955-15fb3c1b0495.json b/change/@fluentui-react-native-win32-theme-1fd30b9e-5c42-47f4-9955-15fb3c1b0495.json new file mode 100644 index 0000000000..7c1b6e73cc --- /dev/null +++ b/change/@fluentui-react-native-win32-theme-1fd30b9e-5c42-47f4-9955-15fb3c1b0495.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use tslib where spreadArray is used", + "packageName": "@fluentui-react-native/win32-theme", + "email": "ruaraki@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/experimental/Button/package.json b/packages/experimental/Button/package.json index 008370e931..d3c5ccb56a 100644 --- a/packages/experimental/Button/package.json +++ b/packages/experimental/Button/package.json @@ -28,7 +28,8 @@ "@fluentui-react-native/use-styling": ">=0.7.1 <1.0.0", "@fluentui-react-native/icon": "0.8.27", "@fluentui-react-native/theme-tokens": ">=0.9.0 <1.0.0", - "@fluentui-react-native/styling-utils": ">=0.2.0 <1.0.0" + "@fluentui-react-native/styling-utils": ">=0.2.0 <1.0.0", + "tslib": "^1.13.0" }, "devDependencies": { "@fluentui-react-native/test-tools": ">=0.1.1 <1.0.0", diff --git a/packages/experimental/Button/tsconfig.json b/packages/experimental/Button/tsconfig.json index 720b1ec20e..2b7a7e4c6c 100644 --- a/packages/experimental/Button/tsconfig.json +++ b/packages/experimental/Button/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib", "types": ["node", "jest"] }, diff --git a/packages/experimental/Checkbox/package.json b/packages/experimental/Checkbox/package.json index 83ca4dd4a3..804f3d1c02 100644 --- a/packages/experimental/Checkbox/package.json +++ b/packages/experimental/Checkbox/package.json @@ -27,7 +27,8 @@ "@fluentui-react-native/tokens": ">=0.10.1 <1.0.0", "@fluentui-react-native/use-styling": ">=0.7.1 <1.0.0", "@fluentui-react-native/adapters": ">=0.7.5 <1.0.0", - "@fluentui-react-native/pressable": ">=0.7.27 <1.0.0" + "@fluentui-react-native/pressable": ">=0.7.27 <1.0.0", + "tslib": "^1.13.0" }, "devDependencies": { "@office-iss/react-native-win32": "^0.63.7", diff --git a/packages/experimental/Checkbox/tsconfig.json b/packages/experimental/Checkbox/tsconfig.json index 720b1ec20e..2b7a7e4c6c 100644 --- a/packages/experimental/Checkbox/tsconfig.json +++ b/packages/experimental/Checkbox/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib", "types": ["node", "jest"] }, diff --git a/packages/experimental/Stack/package.json b/packages/experimental/Stack/package.json index 4d041e11da..e11fec9777 100644 --- a/packages/experimental/Stack/package.json +++ b/packages/experimental/Stack/package.json @@ -32,7 +32,8 @@ "@uifabricshared/build-native": "^0.1.1", "@uifabricshared/eslint-config-rules": "^0.1.1", "react": "16.13.1", - "react-native": "^0.63.4" + "react-native": "^0.63.4", + "tslib": "^1.13.0" }, "peerDependencies": { "react": ">=16.13.1", diff --git a/packages/experimental/Stack/tsconfig.json b/packages/experimental/Stack/tsconfig.json index 720b1ec20e..2b7a7e4c6c 100644 --- a/packages/experimental/Stack/tsconfig.json +++ b/packages/experimental/Stack/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib", "types": ["node", "jest"] }, diff --git a/packages/experimental/Tabs/package.json b/packages/experimental/Tabs/package.json index 80537ee8d6..53716c4f64 100644 --- a/packages/experimental/Tabs/package.json +++ b/packages/experimental/Tabs/package.json @@ -28,7 +28,8 @@ "@fluentui-react-native/tokens": ">=0.10.1 <1.0.0", "@fluentui-react-native/use-styling": ">=0.7.1 <1.0.0", "@fluentui-react-native/icon": "0.8.27", - "@fluentui-react-native/adapters": "0.7.5" + "@fluentui-react-native/adapters": "0.7.5", + "tslib": "^1.13.0" }, "devDependencies": { "@fluentui-react-native/test-tools": ">=0.1.1 <1.0.0", diff --git a/packages/experimental/Tabs/tsconfig.json b/packages/experimental/Tabs/tsconfig.json index 720b1ec20e..2b7a7e4c6c 100644 --- a/packages/experimental/Tabs/tsconfig.json +++ b/packages/experimental/Tabs/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib", "types": ["node", "jest"] }, diff --git a/packages/experimental/Text/package.json b/packages/experimental/Text/package.json index 58d959fa84..28dbb8829a 100644 --- a/packages/experimental/Text/package.json +++ b/packages/experimental/Text/package.json @@ -22,7 +22,8 @@ }, "dependencies": { "@fluentui-react-native/adapters": ">=0.7.5 <1.0.0", - "@fluentui-react-native/framework": "0.6.3" + "@fluentui-react-native/framework": "0.6.3", + "tslib": "^1.13.0" }, "devDependencies": { "@fluentui-react-native/test-tools": ">=0.1.1 <1.0.0", diff --git a/packages/experimental/Text/tsconfig.json b/packages/experimental/Text/tsconfig.json index 720b1ec20e..2b7a7e4c6c 100644 --- a/packages/experimental/Text/tsconfig.json +++ b/packages/experimental/Text/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib", "types": ["node", "jest"] }, diff --git a/packages/framework/framework/package.json b/packages/framework/framework/package.json index 23f66751cd..b6ee098df1 100644 --- a/packages/framework/framework/package.json +++ b/packages/framework/framework/package.json @@ -35,7 +35,8 @@ "@fluentui-react-native/use-slots": ">=0.5.8 <1.0.0", "@fluentui-react-native/use-tokens": ">=0.1.6 <1.0.0", "@fluentui-react-native/memo-cache": "^1.1.4", - "@fluentui-react-native/tokens": ">=0.10.1 <1.0.0" + "@fluentui-react-native/tokens": ">=0.10.1 <1.0.0", + "tslib": "^1.13.0" }, "devDependencies": { "@types/react": ">=16.9.34 < 16.14.0", diff --git a/packages/framework/immutable-merge/package.json b/packages/framework/immutable-merge/package.json index d5a55eb7ee..7946e394e3 100644 --- a/packages/framework/immutable-merge/package.json +++ b/packages/framework/immutable-merge/package.json @@ -31,6 +31,9 @@ "keywords": [], "author": "", "license": "MIT", + "dependencies": { + "tslib": "^1.13.0" + }, "devDependencies": { "@types/jest": "^26.0.0", "@types/node": "^10.3.5", diff --git a/packages/framework/immutable-merge/tsconfig.json b/packages/framework/immutable-merge/tsconfig.json index fd8ecb574e..866df111a0 100644 --- a/packages/framework/immutable-merge/tsconfig.json +++ b/packages/framework/immutable-merge/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib" }, "include": ["src"] diff --git a/packages/framework/memo-cache/package.json b/packages/framework/memo-cache/package.json index 9bd1a08cb5..4e7ef4294e 100644 --- a/packages/framework/memo-cache/package.json +++ b/packages/framework/memo-cache/package.json @@ -35,6 +35,7 @@ "@types/jest": "^26.0.0", "@types/node": "^10.3.5", "@uifabricshared/build-native": "^0.1.1", - "@uifabricshared/eslint-config-rules": "^0.1.1" + "@uifabricshared/eslint-config-rules": "^0.1.1", + "tslib": "^1.13.0" } } diff --git a/packages/framework/memo-cache/tsconfig.json b/packages/framework/memo-cache/tsconfig.json index fd8ecb574e..866df111a0 100644 --- a/packages/framework/memo-cache/tsconfig.json +++ b/packages/framework/memo-cache/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib" }, "include": ["src"] diff --git a/packages/framework/merge-props/package.json b/packages/framework/merge-props/package.json index 22cab7eb86..ffa24d2282 100644 --- a/packages/framework/merge-props/package.json +++ b/packages/framework/merge-props/package.json @@ -33,7 +33,8 @@ "license": "MIT", "dependencies": { "@fluentui-react-native/immutable-merge": "^1.1.3", - "@fluentui-react-native/memo-cache": "^1.1.4" + "@fluentui-react-native/memo-cache": "^1.1.4", + "tslib": "^1.13.0" }, "devDependencies": { "@types/jest": "^26.0.0", diff --git a/packages/framework/merge-props/tsconfig.json b/packages/framework/merge-props/tsconfig.json index fd8ecb574e..866df111a0 100644 --- a/packages/framework/merge-props/tsconfig.json +++ b/packages/framework/merge-props/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib" }, "include": ["src"] diff --git a/packages/framework/use-slot/package.json b/packages/framework/use-slot/package.json index 023c077597..9dd8bbfc29 100644 --- a/packages/framework/use-slot/package.json +++ b/packages/framework/use-slot/package.json @@ -32,7 +32,8 @@ "author": "", "license": "MIT", "dependencies": { - "@fluentui-react-native/merge-props": ">=0.3.4 <1.0.0" + "@fluentui-react-native/merge-props": ">=0.3.4 <1.0.0", + "tslib": "^1.13.0" }, "devDependencies": { "@uifabricshared/build-native": "^0.1.1", diff --git a/packages/framework/use-slot/tsconfig.json b/packages/framework/use-slot/tsconfig.json index 720b1ec20e..2b7a7e4c6c 100644 --- a/packages/framework/use-slot/tsconfig.json +++ b/packages/framework/use-slot/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib", "types": ["node", "jest"] }, diff --git a/packages/framework/use-styling/package.json b/packages/framework/use-styling/package.json index 862f0ebf15..c88eff4d53 100644 --- a/packages/framework/use-styling/package.json +++ b/packages/framework/use-styling/package.json @@ -33,7 +33,8 @@ "license": "MIT", "dependencies": { "@fluentui-react-native/memo-cache": "^1.1.4", - "@fluentui-react-native/use-tokens": "^0.1.6" + "@fluentui-react-native/use-tokens": "^0.1.6", + "tslib": "^1.13.0" }, "devDependencies": { "@types/jest": "^26.0.0", diff --git a/packages/framework/use-styling/tsconfig.json b/packages/framework/use-styling/tsconfig.json index fd8ecb574e..866df111a0 100644 --- a/packages/framework/use-styling/tsconfig.json +++ b/packages/framework/use-styling/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib" }, "include": ["src"] diff --git a/packages/framework/use-tokens/package.json b/packages/framework/use-tokens/package.json index c5fa785ff3..67841619e4 100644 --- a/packages/framework/use-tokens/package.json +++ b/packages/framework/use-tokens/package.json @@ -33,7 +33,8 @@ "license": "MIT", "dependencies": { "@fluentui-react-native/immutable-merge": "^1.1.3", - "@fluentui-react-native/memo-cache": "^1.1.4" + "@fluentui-react-native/memo-cache": "^1.1.4", + "tslib": "^1.13.0" }, "devDependencies": { "@fluentui-react-native/merge-props": "^0.3.4", diff --git a/packages/framework/use-tokens/tsconfig.json b/packages/framework/use-tokens/tsconfig.json index fd8ecb574e..866df111a0 100644 --- a/packages/framework/use-tokens/tsconfig.json +++ b/packages/framework/use-tokens/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib" }, "include": ["src"] diff --git a/packages/theming/win32-theme/package.json b/packages/theming/win32-theme/package.json index 040a059247..7b38b67e5d 100644 --- a/packages/theming/win32-theme/package.json +++ b/packages/theming/win32-theme/package.json @@ -37,7 +37,8 @@ "@fluentui-react-native/theme-tokens": ">=0.9.0 <1.0.0", "@fluentui-react-native/theme-types": ">=0.12.3 <1.0.0", "@fluentui-react-native/theme": ">=0.5.21 <1.0.0", - "@fluentui-react-native/theming-utils": ">=0.7.6 <1.0.0" + "@fluentui-react-native/theming-utils": ">=0.7.6 <1.0.0", + "tslib": "^1.13.0" }, "devDependencies": { "@types/react": ">=16.9.34 < 16.14.0", diff --git a/packages/theming/win32-theme/tsconfig.json b/packages/theming/win32-theme/tsconfig.json index 720b1ec20e..2b7a7e4c6c 100644 --- a/packages/theming/win32-theme/tsconfig.json +++ b/packages/theming/win32-theme/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib", "types": ["node", "jest"] }, diff --git a/packages/utils/interactive-hooks/package.json b/packages/utils/interactive-hooks/package.json index 6585bb679c..831f21565e 100644 --- a/packages/utils/interactive-hooks/package.json +++ b/packages/utils/interactive-hooks/package.json @@ -21,7 +21,8 @@ "prettier-fix": "fluentui-scripts prettier --fix true" }, "dependencies": { - "invariant": "^2.2.0" + "invariant": "^2.2.0", + "tslib": "^1.13.0" }, "devDependencies": { "@office-iss/react-native-win32": "^0.63.7", diff --git a/packages/utils/interactive-hooks/tsconfig.json b/packages/utils/interactive-hooks/tsconfig.json index fd8ecb574e..866df111a0 100644 --- a/packages/utils/interactive-hooks/tsconfig.json +++ b/packages/utils/interactive-hooks/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib" }, "include": ["src"] diff --git a/packages/utils/tokens/package.json b/packages/utils/tokens/package.json index 44c182666d..330d005592 100644 --- a/packages/utils/tokens/package.json +++ b/packages/utils/tokens/package.json @@ -24,7 +24,8 @@ "@fluentui-react-native/adapters": ">=0.7.5 <1.0.0", "@fluentui-react-native/theme-types": ">=0.12.3 <1.0.0", "@uifabricshared/foundation-tokens": ">=0.10.2 <1.0.0", - "@uifabricshared/theming-ramp": ">=0.15.9 <1.0.0" + "@uifabricshared/theming-ramp": ">=0.15.9 <1.0.0", + "tslib": "^1.13.0" }, "devDependencies": { "@types/react-native": "^0.63.0", diff --git a/packages/utils/tokens/tsconfig.json b/packages/utils/tokens/tsconfig.json index fd8ecb574e..866df111a0 100644 --- a/packages/utils/tokens/tsconfig.json +++ b/packages/utils/tokens/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { + "importHelpers": true, "outDir": "lib" }, "include": ["src"] diff --git a/scripts/src/tasks/depcheck.js b/scripts/src/tasks/depcheck.js index 6915344014..69e2d451c9 100644 --- a/scripts/src/tasks/depcheck.js +++ b/scripts/src/tasks/depcheck.js @@ -1,6 +1,6 @@ function mergeOneLevel(a, b = {}) { const result = { ...a, ...b }; - Object.keys(a).forEach(key => { + Object.keys(a).forEach((key) => { if (Array.isArray(b[key]) && Array.isArray(a[key])) { result[key] = [].concat(a[key], b[key]); } @@ -14,7 +14,7 @@ function scriptsDevDeps() { } function depcheckTask() { - return function(done) { + return function (done) { const { logger } = require('just-scripts'); const depcheck = require('depcheck'); const path = require('path'); @@ -22,31 +22,31 @@ function depcheckTask() { const options = mergeOneLevel( { ignorePatterns: ['*eslint*', '/lib/*', '/lib-commonjs/*'], - ignoreMatches: ['@uifabricshared/build-native', '@uifabricshared/eslint-config-rules', ...scriptsDevDeps()], - specials: [depcheck.special.eslint, depcheck.special.webpack, depcheck.special.jest] + ignoreMatches: ['@uifabricshared/build-native', '@uifabricshared/eslint-config-rules', 'tslib', ...scriptsDevDeps()], + specials: [depcheck.special.eslint, depcheck.special.webpack, depcheck.special.jest], }, - config.depcheck + config.depcheck, ); - return depcheck(process.cwd(), options, result => { + return depcheck(process.cwd(), options, (result) => { try { if (result.devDependencies.length > 0) { logger.warn('Unused devDependencies'); - result.devDependencies.forEach(dependency => { + result.devDependencies.forEach((dependency) => { logger.warn(`-- ${dependency}`); }); } if (result.dependencies.length > 0 || Object.keys(result.missing).length > 0) { if (result.dependencies.length > 0) { logger.error('Unused dependencies'); - result.dependencies.forEach(dependency => { + result.dependencies.forEach((dependency) => { logger.error(`-- ${dependency}`); }); } - Object.keys(result.missing).forEach(dependency => { + Object.keys(result.missing).forEach((dependency) => { logger.error(`Missing dependency on ${dependency}`); - result.missing[dependency].forEach(file => { + result.missing[dependency].forEach((file) => { logger.error(`-- ${file}`); }); }); diff --git a/tsconfig.json b/tsconfig.json index fd8ecb574e..55661a5964 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,6 +2,5 @@ "extends": "@uifabricshared/build-native/tsconfig.json", "compilerOptions": { "outDir": "lib" - }, - "include": ["src"] + } } diff --git a/yarn.lock b/yarn.lock index b1254e16d0..15e8ab2362 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17188,6 +17188,11 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== +tslib@^1.13.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + tslib@^2.0.0, tslib@^2.0.1: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"