Merge pull request #269 from robcresswell/chore/yarn-to-npm

chore: yarn -> npm

.circleci/config.yml

@@ -6,33 +6,24 @@ defaults: &defaults
     - image: cimg/node:lts
 commands:
   install_deps:
-    description: Install dependencies (from cache, if possible)
+    description: Install dependencies
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            # when lock file changes, use increasingly general patterns to restore cache
-            - yarn-{{ checksum "yarn.lock" }}
-            - yarn-
-      - run: yarn --frozen-lockfile
-      - save_cache:
-          paths:
-            - ~/.cache/yarn
-          key: yarn-{{ checksum "yarn.lock" }}
+      - run: npm ci
 jobs:
   test:
     <<: *defaults
     steps:
       - install_deps
-      - run: yarn build
+      - run: npm run build
       - run: ./node_modules/.bin/jest --runInBand --ci
       - store_test_results:
           path: reports
   release:
     <<: *defaults
     steps:
       - install_deps
-      - run: yarn build
+      - run: npm run build
       - run: npx semantic-release
 workflows:
   version: 2

.gitignore

@@ -4,6 +4,5 @@ node_modules/
 *.log
 *.tgz
 dist/
-package-lock.json
 coverage/
-reports/
+reports/

.npmrc

@@ -1 +1,2 @@
-package-lock=false
+audit=false
+fund=false

__tests__/icon.js

@@ -20,28 +20,28 @@ describe('Icon', () => {
     icon = mount(WrappedIcon);
   });
 
-  it('accepts a "title" property', () => {
+  it('accepts a "title" property', async () => {
     expect(icon.attributes()['aria-label']).toEqual('Android icon');
 
-    icon.setProps({ title: 'foo' });
+    await icon.setProps({ title: 'foo' });
 
     expect(icon.attributes()['aria-label']).toEqual('foo');
   });
 
-  it('accepts a "decorative" property', () => {
+  it('accepts a "decorative" property', async () => {
     expect(icon.attributes()['aria-hidden']).toBeFalsy();
 
-    icon.setProps({ decorative: true });
+    await icon.setProps({ decorative: true });
 
     expect(icon.attributes()['aria-hidden']).toBeTruthy();
   });
 
-  it('accepts a "fillColor" property', () => {
+  it('accepts a "fillColor" property', async () => {
     const svg = icon.find('.material-design-icon__svg');
 
     expect(svg.attributes()['fill']).toEqual('currentColor');
 
-    icon.setProps({ fillColor: '#FF0000' });
+    await icon.setProps({ fillColor: '#FF0000' });
 
     expect(svg.attributes()['fill']).toEqual('#FF0000');
   });
@@ -50,7 +50,7 @@ describe('Icon', () => {
     expect(icon).toMatchSnapshot();
   });
 
-  it('listens to a click event', () => {
+  it('listens to a click event', async () => {
     const clickListener = jest.fn();
     const iconWithEvent = mount({
       name: 'IconWithEvent',
@@ -65,7 +65,7 @@ describe('Icon', () => {
       },
     });
 
-    iconWithEvent.trigger('click');
+    await iconWithEvent.trigger('click');
     expect(clickListener).toBeCalled();
   });
 });

jest.config.js

@@ -1,13 +1,10 @@
 module.exports = {
   verbose: true,
+  testEnvironment: 'jsdom',
   moduleFileExtensions: ['js', 'vue'],
   transform: {
     '^.+\\.vue$': 'vue-jest',
     '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
   },
   snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
-  reporters: [
-    'default',
-    ['jest-junit', { outputDirectory: '<rootDir>/reports/jest' }],
-  ],
 };