Merge pull request #1344 from Shopify/bump-sk

Update to latest sewing-kit
Shopify · May 8, 2019 · 4a2a7fe · 4a2a7fe
2 parents 43e1055 + 248306f
commit 4a2a7fe
Show file tree

Hide file tree

Showing 77 changed files with 1,705 additions and 1,468 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -2,7 +2,6 @@
   "extends": [
     "plugin:shopify/typescript",
     "plugin:shopify/react",
-    "plugin:shopify/eslint-comments",
     "plugin:shopify/jest",
     "plugin:shopify/node",
     "plugin:shopify/polaris",
@@ -28,13 +27,16 @@
         "allowBlockStart": false
       }
     ],
+    "babel/no-unused-expressions": "off",
     "import/named": "off",
     "import/no-named-as-default": "off",
     "react/button-has-type": "off",
     "react/no-array-index-key": "off",
     "react/jsx-fragments": ["error", "element"],
     "shopify/jsx-no-complex-expressions": "off",
+    "shopify/jsx-prefer-fragment-wrappers": "off",
     "shopify/no-ancestor-directory-import": "error",
+    "shopify/react-prefer-private-members": "off",
     "jsx-a11y/label-has-for": [
       2,
       {
@@ -46,6 +48,7 @@
     ],
     "jsx-a11y/no-autofocus": "off",
     "jsx-a11y/anchor-has-content": "off",
+    "jsx-a11y/control-has-associated-label": "off",
     "jsx-a11y/role-supports-aria-props": "off",
     "jsx-a11y/mouse-events-have-key-events": "off",
     "jsx-a11y/click-events-have-key-events": "off",
@@ -56,20 +59,24 @@
     {
       "files": ["**/*.test.{ts,tsx}"],
       "rules": {
+        "jest/no-truthy-falsy": "off",
+        "shopify/jsx-no-hardcoded-content": "off",
         "shopify/no-ancestor-directory-import": "off"
       }
     },
     {
       "files": ["examples/**/*.js"],
       "rules": {
         "import/no-extraneous-dependencies": "off",
-        "import/no-unresolved": "off"
+        "import/no-unresolved": "off",
+        "shopify/jsx-no-hardcoded-content": "off"
       }
     },
     {
       "files": ["playground/Playground.tsx"],
       "rules": {
         "react/prefer-stateless-function": "off",
+        "shopify/jsx-no-hardcoded-content": "off",
         "shopify/react-initialize-state": "off"
       }
     }

diff --git a/UNRELEASED.md b/UNRELEASED.md
@@ -60,7 +60,8 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
 - Update most `devDependencies` ([#1327](https://github.com/Shopify/polaris-react/pull/1327))
 - Bump `@shopify/react-utilites` to remove a transitive dependency on `core-js` ([#1343](https://github.com/Shopify/polaris-react/pull/1343))
 - Updated App Bridge to version 1.3.0 ([#1349](https://github.com/Shopify/polaris-react/pull/1349))
-- Updated TypeScript to 3.2.4 ([#1388](https://github.com/Shopify/polaris-react/pull/1388))
+- Updated typescript to 3.2.4 ([#1388](https://github.com/Shopify/polaris-react/pull/1388))
+- Updated sewing-kit to 0.83.1 and babel-preset-shopify to ^18.1.0 ([#1344](https://github.com/Shopify/polaris-react/pull/1344))
 
 ### Code quality
 

diff --git a/babel.config.js b/babel.config.js
@@ -6,7 +6,7 @@ module.exports = function(api) {
   });
 
   const runtimePreset = isWeb
-    ? ['babel-preset-shopify/web', {modules: false}]
+    ? ['babel-preset-shopify/web', {modules: false, useBuiltIns: 'entry'}]
     : ['babel-preset-shopify/node', {modules: 'commonjs'}];
 
   // babel-preset-shopify/react only uses HMR if hot is true and the env is

diff --git a/examples/browserify/src/App.js b/examples/browserify/src/App.js
@@ -36,6 +36,10 @@ class App extends Component {
       {label: 'I consent to receiving emails', value: 'false2'},
     ];
 
+    const accountMarkup = this.state.connected
+      ? this.disconnectAccountMarkup()
+      : this.connectAccountMarkup();
+
     return (
       <AppProvider>
         <Page
@@ -58,7 +62,7 @@ class App extends Component {
               </SettingToggle>
             </Layout.AnnotatedSection>
 
-            {this.renderAccount()}
+            {accountMarkup}
 
             <Layout.AnnotatedSection
               title="Form"
@@ -173,12 +177,6 @@ class App extends Component {
       </Layout.AnnotatedSection>
     );
   }
-
-  renderAccount() {
-    return this.state.connected
-      ? this.disconnectAccountMarkup()
-      : this.connectAccountMarkup();
-  }
 }
 
 export default App;
diff --git a/examples/create-react-app/src/App.js b/examples/create-react-app/src/App.js
@@ -38,6 +38,10 @@ class App extends Component {
       {label: 'I consent to receiving emails', value: 'false2'},
     ];
 
+    const accountMarkup = this.state.connected
+      ? this.disconnectAccountMarkup()
+      : this.connectAccountMarkup();
+
     return (
       <Page
         title="Polaris"
@@ -59,7 +63,7 @@ class App extends Component {
             </SettingToggle>
           </Layout.AnnotatedSection>
 
-          {this.renderAccount()}
+          {accountMarkup}
 
           <Layout.AnnotatedSection
             title="Form"
@@ -173,12 +177,6 @@ class App extends Component {
       </Layout.AnnotatedSection>
     );
   }
-
-  renderAccount() {
-    return this.state.connected
-      ? this.disconnectAccountMarkup()
-      : this.connectAccountMarkup();
-  }
 }
 
 export default App;
diff --git a/examples/webpack/src/App.js b/examples/webpack/src/App.js
@@ -36,6 +36,10 @@ class App extends Component {
       {label: 'I consent to receiving emails', value: 'false2'},
     ];
 
+    const accountMarkup = this.state.connected
+      ? this.disconnectAccountMarkup()
+      : this.connectAccountMarkup();
+
     return (
       <AppProvider>
         <Page
@@ -58,7 +62,7 @@ class App extends Component {
               </SettingToggle>
             </Layout.AnnotatedSection>
 
-            {this.renderAccount()}
+            {accountMarkup}
 
             <Layout.AnnotatedSection
               title="Form"
@@ -173,12 +177,6 @@ class App extends Component {
       </Layout.AnnotatedSection>
     );
   }
-
-  renderAccount() {
-    return this.state.connected
-      ? this.disconnectAccountMarkup()
-      : this.connectAccountMarkup();
-  }
 }
 
 export default App;
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "check:ci": "npm-run-all lint ts test:ci",
     "clean": "rimraf build esnext styles types docs \"build-intermediate\" \"index.*\" \"./src/styles/polaris-tokens\" \"styles.{css,scss}\"",
     "clean:build": "rimraf \"build/!(cache|coverage|storybook)\" esnext styles types docs \"build-intermediate\" \"index.*\" \"./src/styles/polaris-tokens\" \"styles.{css,scss}\"",
-    "optimize": "node ./scripts/optimize.js",
+    "optimize": "sewing-kit optimize",
     "prebuild": "npm-run-all clean:build optimize copy-polaris-tokens",
     "build": "node ./scripts/build.js",
     "prebuild-consumer": "yarn run build",
@@ -91,11 +91,11 @@
     "ios >= 9"
   ],
   "devDependencies": {
-    "@babel/core": "^7.1.6",
+    "@babel/core": "^7.4.3",
     "@percy/storybook": "^3.0.1",
     "@shopify/jest-dom-mocks": "^2.1.1",
     "@shopify/js-uploader": "github:shopify/js-uploader",
-    "@shopify/sewing-kit": "0.69.0",
+    "@shopify/sewing-kit": "0.83.1",
     "@storybook/addon-a11y": "^5.0.6",
     "@storybook/addon-actions": "^5.0.6",
     "@storybook/addon-backgrounds": "^5.0.6",
@@ -112,7 +112,7 @@
     "aws-sdk": "^2.58.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-loader": "^8.0.5",
-    "babel-preset-shopify": "^17.0.1",
+    "babel-preset-shopify": "^18.1.1",
     "chalk": "^2.4.2",
     "change-case": "^3.1.0",
     "codecov": "^3.3.0",

diff --git a/scripts/optimize.js b/scripts/optimize.js
diff --git a/src/components/AppProvider/utilities/Intl/tests/translate.test.ts b/src/components/AppProvider/utilities/Intl/tests/translate.test.ts
@@ -36,7 +36,9 @@ describe('translate()', () => {
     it('throws an error for a missing replacement', () => {
       expect(() =>
         translateWithReplacements('foo {next}', {notNext: 'bar'}),
-      ).toThrow();
+      ).toThrow(
+        `No replacement found for key 'next'. The following replacements were passed: 'notNext'`,
+      );
     });
   });
 });
diff --git a/...ts/AppProvider/utilities/createAppProviderContext/tests/createAppProviderContext.test.tsx b/...ts/AppProvider/utilities/createAppProviderContext/tests/createAppProviderContext.test.tsx
@@ -107,8 +107,8 @@ describe('createAppProviderContext()', () => {
       },
     });
 
-    expect(Intl).toBeCalledWith(i18n);
-    expect(Link).toBeCalledWith(CustomLinkComponent);
+    expect(Intl).toHaveBeenCalledWith(i18n);
+    expect(Link).toHaveBeenCalledWith(CustomLinkComponent);
   });
 
   it('adds an app bridge hook to set clientInterface data', () => {
@@ -130,7 +130,7 @@ describe('createAppProviderContext()', () => {
     const next = jest.fn((args) => args);
     const baseAction = {type: 'actionType'};
 
-    expect(setClientInterfaceHook.call({}, next)(baseAction)).toEqual({
+    expect(setClientInterfaceHook.call({}, next)(baseAction)).toStrictEqual({
       type: 'actionType',
       clientInterface: {
         name: '@shopify/polaris',

diff --git a/...components/AppProvider/utilities/createPolarisContext/tests/createPolarisContext.test.tsx b/...components/AppProvider/utilities/createPolarisContext/tests/createPolarisContext.test.tsx
@@ -101,8 +101,8 @@ describe('createPolarisContext()', () => {
       },
     };
 
-    expect(contextOne).toEqual(mockContext);
-    expect(contextTwo).toEqual(mockContext);
+    expect(contextOne).toStrictEqual(mockContext);
+    expect(contextTwo).toStrictEqual(mockContext);
   });
 
   it('returns the right context with only app provider context being provided', () => {
@@ -140,7 +140,7 @@ describe('createPolarisContext()', () => {
       },
     };
 
-    expect(context).toEqual(mockContext);
+    expect(context).toStrictEqual(mockContext);
   });
 
   it('returns the right context with only theme provider context being provided', () => {

diff --git a/src/components/Autocomplete/components/ComboBox/tests/ComboBox.test.tsx b/src/components/Autocomplete/components/ComboBox/tests/ComboBox.test.tsx
@@ -221,7 +221,7 @@ describe('<ComboBox/>', () => {
       );
 
       comboBox.simulate('click');
-      expect(comboBox.find(OptionList).prop('selected')).toEqual([
+      expect(comboBox.find(OptionList).prop('selected')).toStrictEqual([
         'cheese_pizza',
       ]);
     });

diff --git a/src/components/Autocomplete/tests/Autocomplete.test.tsx b/src/components/Autocomplete/tests/Autocomplete.test.tsx
@@ -72,22 +72,22 @@ describe('<Autocomplete/>', () => {
 
       expect(autocomplete.find(ComboBox).prop('id')).toBe('Autocomplete-ID');
       expect(autocomplete.find(ComboBox).prop('options')).toBe(options);
-      expect(autocomplete.find(ComboBox).prop('selected')).toEqual([
+      expect(autocomplete.find(ComboBox).prop('selected')).toStrictEqual([
         'cheese_pizza',
       ]);
-      expect(autocomplete.find(ComboBox).prop('textField')).toEqual(
+      expect(autocomplete.find(ComboBox).prop('textField')).toStrictEqual(
         renderTextField(),
       );
       expect(autocomplete.find(ComboBox).prop('preferredPosition')).toBe(
         'mostSpace',
       );
       expect(autocomplete.find(ComboBox).prop('listTitle')).toBe('List title');
       expect(autocomplete.find(ComboBox).prop('allowMultiple')).toBe(true);
-      expect(autocomplete.find(ComboBox).prop('actionsBefore')).toEqual(
+      expect(autocomplete.find(ComboBox).prop('actionsBefore')).toStrictEqual(
         actionBefore,
       );
       expect(autocomplete.find(ComboBox).prop('onSelect')).toBe(handleOnSelect);
-      expect(autocomplete.find(ComboBox).prop('emptyState')).toEqual(
+      expect(autocomplete.find(ComboBox).prop('emptyState')).toStrictEqual(
         <EmptyState />,
       );
     });
@@ -104,7 +104,7 @@ describe('<Autocomplete/>', () => {
           loading
         />,
       );
-      expect(autocomplete.find(ComboBox).prop('options')).toEqual([]);
+      expect(autocomplete.find(ComboBox).prop('options')).toStrictEqual([]);
       expect(autocomplete.find(ComboBox).prop('contentAfter')).not.toBeNull();
     });
   });

diff --git a/src/components/CalloutCard/tests/CalloutCard.test.tsx b/src/components/CalloutCard/tests/CalloutCard.test.tsx
@@ -59,6 +59,6 @@ describe('<CalloutCard />', () => {
       .first()
       .simulate('click');
 
-    expect(spy).toBeCalled();
+    expect(spy).toHaveBeenCalled();
   });
 });
diff --git a/src/components/Card/components/Header/tests/Header.test.tsx b/src/components/Card/components/Header/tests/Header.test.tsx
@@ -41,7 +41,10 @@ describe('<Header />', () => {
 
     it('renders buttons for each action', () => {
       mountWithAppProvider(<Header actions={mockActions} />);
-      expect(buttonsFromMock).toBeCalledWith(mockActions, expect.anything());
+      expect(buttonsFromMock).toHaveBeenCalledWith(
+        mockActions,
+        expect.anything(),
+      );
     });
 
     it('does not render a button group when not defined', () => {

diff --git a/src/components/Card/components/Section/tests/Section.test.tsx b/src/components/Card/components/Section/tests/Section.test.tsx
@@ -17,7 +17,7 @@ describe('<Card.Section />', () => {
     const card = mountWithAppProvider(<Section title={titleMarkup} />);
     const headerMarkup = card.find('h2');
 
-    expect(headerMarkup.text().includes(titleString)).toBe(true);
+    expect(headerMarkup.text()).toContain(titleString);
     expect(headerMarkup.find('Badge').text()).toBe(badgeString);
   });
 
@@ -28,6 +28,6 @@ describe('<Card.Section />', () => {
     const headerMarkup = card.find(Subheading);
 
     expect(headerMarkup.exists()).toBeTruthy();
-    expect(headerMarkup.text()).toEqual(titleString);
+    expect(headerMarkup.text()).toStrictEqual(titleString);
   });
 });
diff --git a/src/components/Card/tests/Card.test.tsx b/src/components/Card/tests/Card.test.tsx
@@ -41,7 +41,7 @@ describe('<Card />', () => {
     const card = mountWithAppProvider(<Card title={titleMarkup} />);
     const headerMarkup = card.find('h2');
 
-    expect(headerMarkup.text().includes(titleString)).toBe(true);
+    expect(headerMarkup.text()).toContain(titleString);
     expect(headerMarkup.find('Badge').text()).toBe(badgeString);
   });