postlight · george-haddad · Jan 31, 2019 · Jan 28, 2019 · Jan 28, 2019 · Jan 28, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,46 +1,74 @@
 version: 2
+
+defaults: &defaults
+  working_directory: ~/repo
+  docker:
+    - image: circleci/node:8.10-browsers
+
 jobs:
   test-node:
-    docker:
-      - image: circleci/node:8.10-browsers
+    <<: *defaults
     steps:
       - checkout
       # For some reason phantomjs-prebuild is failing w/yarn, but npm installing works
-      - run: "npm install phantomjs-prebuilt"
-      - run: "yarn install"
-      - run: "yarn lint:ci"
-      - run: "yarn build:ci"
-      - run: "yarn test:node --maxWorkers=4"
-      - run: "./scripts/pr-parser-preview.sh"
-
+      - run: 'npm install phantomjs-prebuilt'
+      - run: 'yarn install'
+      - run: 'yarn lint:ci'
+      - run: 'yarn build:ci'
+      - run: 'yarn test:node --maxWorkers=4'
+      - run: './scripts/pr-parser-preview.sh'
       - store_artifacts:
           path: tmp/artifacts
+      - persist_to_workspace:
+          root: ~/repo
+          paths: .
 
   test-web:
-    docker:
-      - image: circleci/node:8.10-browsers
+    <<: *defaults
     steps:
+      - attach_workspace:
+          at: ~/repo
       - checkout
-      - run: "yarn install"
-      - run: "yarn add karma-cli --dev"
-      - run: "yarn test:web --maxWorkers=4"
-      - run: "yarn build:web:ci --maxWorkers=4"
+      - run: 'yarn install'
+      - run: 'yarn add karma-cli --dev'
+      - run: 'yarn test:web --maxWorkers=4'
+      - run: 'yarn build:web:ci --maxWorkers=4'
+
+  deploy:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/repo
+      - run:
+          name: Authenticate with registry
+          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
+      - run:
+          name: Publish package
+          command: npm publish --access public
 
   update-fixtures:
     docker:
       - image: circleci/node:8.10
     steps:
       - checkout
-      - run: "yarn install"
-      - run: "node ./scripts/update-fixtures.js"
-
+      - run: 'yarn install'
+      - run: 'node ./scripts/update-fixtures.js'
 
 workflows:
   version: 2
   build_and_test:
     jobs:
       - test-node
       - test-web
+      - deploy:
+          requires:
+            - test-node
+            - test-web
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/
   # UNCOMMENT WHEN READY TO AUTOMATE THIS TASK
   # scheduled_tasks:
   #   triggers:

diff --git a/package.json b/package.json
@@ -1,8 +1,24 @@
 {
-  "name": "mercury-parser",
-  "version": "1.0.13",
-  "description": "",
-  "repository": "github:postlight/mercury-parser",
+  "name": "@postlight/mercury-parser",
+  "version": "1.0.20",
+  "description": "Mercury transforms web pages into clean text. Publishers and programmers use it to make the web make sense, and readers use it to read any web article comfortably.",
+  "author": "Postlight <[email protected]>",
+  "homepage": "https://mercury.postlight.com",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/postlight/mercury-parser.git"
+  },
+  "bugs": {
+    "url": "https://github.com/postlight/mercury-parser/issues"
+  },
+  "keywords": [
+    "mercury",
+    "parser",
+    "reader",
+    "web",
+    "content"
+  ],
   "main": "./dist/mercury.js",
   "scripts": {
     "lint": "eslint . --fix",
@@ -25,8 +41,9 @@
     "add-contributor": "all-contributors add",
     "generate-contributors": "all-contributors generate"
   },
-  "author": "Postlight",
-  "license": "ISC",
+  "engines": {
+    "node": ">=8.10"
+  },
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@babel/plugin-external-helpers": "^7.2.0",
@@ -39,7 +56,6 @@
     "@babel/polyfill": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/runtime": "^7.0.0",
-    "@babel/runtime-corejs2": "^7.2.0",
     "@jesses/circle-github-bot": "^2.1.0",
     "@octokit/rest": "^16.9.0",
     "all-contributors-cli": "^5.10.0",
@@ -94,22 +110,27 @@
     "watchify": "^3.11.0"
   },
   "dependencies": {
-    "browser-request": "postlight/browser-request#feat-add-headers-to-response",
+    "browser-request": "github:postlight/browser-request#feat-add-headers-to-response",
     "cheerio": "^0.22.0",
-    "difflib": "postlight/difflib.js",
+    "difflib": "github:postlight/difflib.js",
     "ellipsize": "0.1.0",
     "iconv-lite": "0.4.24",
     "jquery": "^3.3.1",
     "moment": "^2.23.0",
     "moment-parseformat": "3.0.0",
     "moment-timezone": "0.5.23",
-    "request": "czardoz/request",
+    "request": "github:czardoz/request",
     "request-promise": "^4.2.2",
     "string-direction": "^0.1.2",
     "url": "^0.11.0",
     "valid-url": "^1.0.9",
-    "wuzzy": "^0.1.3"
+    "wuzzy": "^0.1.3",
+    "@babel/runtime-corejs2": "^7.2.0"
   },
+  "bundleDependencies": [
+    "jquery",
+    "moment-timezone"
+  ],
   "browser": {
     "main": "./dist/mercury.web.js",
     "cheerio": "./src/shims/cheerio-query",

diff --git a/src/extractors/custom/www.fastcompany.com/index.test.js b/src/extractors/custom/www.fastcompany.com/index.test.js
@@ -15,10 +15,10 @@ describe('WwwFastcompanyComExtractor', () => {
     beforeAll(() => {
       url =
         'https://www.fastcompany.com/3067012/the-only-five-email-folders-your-inbox-will-ever-need';
-      const html =
-        fs.readFileSync('./fixtures/www.fastcompany.com/1547124373499.html');
-      result =
-        Mercury.parse(url, html, { fallback: false });
+      const html = fs.readFileSync(
+        './fixtures/www.fastcompany.com/1547124373499.html'
+      );
+      result = Mercury.parse(url, html, { fallback: false });
     });
 
     it('is selected properly', () => {
@@ -30,53 +30,62 @@ describe('WwwFastcompanyComExtractor', () => {
     });
 
     it('returns the title', async () => {
-    // To pass this test, fill out the title selector
-    // in ./src/extractors/custom/www.fastcompany.com/index.js.
+      // To pass this test, fill out the title selector
+      // in ./src/extractors/custom/www.fastcompany.com/index.js.
       const { title } = await result;
 
-    // Update these values with the expected values from
-    // the article.
-      assert.equal(title, 'The Only Five Email Folders Your Inbox Will Ever Need');
+      // Update these values with the expected values from
+      // the article.
+      assert.equal(
+        title,
+        'The Only Five Email Folders Your Inbox Will Ever Need'
+      );
     });
 
     it('returns the author', async () => {
-    // To pass this test, fill out the author selector
-    // in ./src/extractors/custom/www.fastcompany.com/index.js.
+      // To pass this test, fill out the author selector
+      // in ./src/extractors/custom/www.fastcompany.com/index.js.
       const { author } = await result;
 
-    // Update these values with the expected values from
-    // the article.
+      // Update these values with the expected values from
+      // the article.
       assert.equal(author, 'Zach Hanlon');
     });
 
     it('returns the date_published', async () => {
-    // To pass this test, fill out the date_published selector
-    // in ./src/extractors/custom/www.fastcompany.com/index.js.
+      // To pass this test, fill out the date_published selector
+      // in ./src/extractors/custom/www.fastcompany.com/index.js.
       const { date_published } = await result;
 
-    // Update these values with the expected values from
-    // the article.
-      assert.equal(date_published, '2017-01-09T05:00:00.000Z');
+      // Update these values with the expected values from
+      // the article.
+      assert.equal(date_published.split('T')[0], '2017-01-09');
     });
 
     it('returns the dek', async () => {
-    // To pass this test, fill out the dek selector
-    // in ./src/extractors/custom/www.fastcompany.com/index.js.
+      // To pass this test, fill out the dek selector
+      // in ./src/extractors/custom/www.fastcompany.com/index.js.
       const { dek } = await result;
 
-    // Update these values with the expected values from
-    // the article.
-      assert.equal(dek, 'Stop “organizing” your emails by subject and start thinking of them in terms of deadlines.');
+      // Update these values with the expected values from
+      // the article.
+      assert.equal(
+        dek,
+        'Stop “organizing” your emails by subject and start thinking of them in terms of deadlines.'
+      );
     });
 
     it('returns the lead_image_url', async () => {
-    // To pass this test, fill out the lead_image_url selector
-    // in ./src/extractors/custom/www.fastcompany.com/index.js.
+      // To pass this test, fill out the lead_image_url selector
+      // in ./src/extractors/custom/www.fastcompany.com/index.js.
       const { lead_image_url } = await result;
 
-    // Update these values with the expected values from
-    // the article.
-      assert.equal(lead_image_url, 'https://images.fastcompany.net/image/upload/w_1280,f_auto,q_auto,fl_lossy/fc/3067012-poster-p-1-the-only-five-email-folders-your-inbox-will-ever-need.jpg');
+      // Update these values with the expected values from
+      // the article.
+      assert.equal(
+        lead_image_url,
+        'https://images.fastcompany.net/image/upload/w_1280,f_auto,q_auto,fl_lossy/fc/3067012-poster-p-1-the-only-five-email-folders-your-inbox-will-ever-need.jpg'
+      );
     });
 
     it('returns the content', async () => {
@@ -88,11 +97,19 @@ describe('WwwFastcompanyComExtractor', () => {
 
       const $ = cheerio.load(content || '');
 
-      const first13 = excerptContent($('*').first().text(), 13);
+      const first13 = excerptContent(
+        $('*')
+          .first()
+          .text(),
+        13
+      );
 
       // Update these values with the expected values from
       // the article.
-      assert.equal(first13, 'For years, my approach to email was like slaying a hydra. For every');
+      assert.equal(
+        first13,
+        'For years, my approach to email was like slaying a hydra. For every'
+      );
     });
   });
 });
diff --git a/yarn.lock b/yarn.lock
@@ -1511,7 +1511,7 @@ browser-process-hrtime@^0.1.2:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
 
-browser-request@postlight/browser-request#feat-add-headers-to-response:
+"browser-request@github:postlight/browser-request#feat-add-headers-to-response":
   version "0.3.2"
   resolved "https://codeload.github.com/postlight/browser-request/tar.gz/38faa5b85741aabfca61aa37d1ef044d68969ddf"
   dependencies:
@@ -2549,7 +2549,7 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-difflib@postlight/difflib.js:
+"difflib@github:postlight/difflib.js":
   version "0.2.6"
   resolved "https://codeload.github.com/postlight/difflib.js/tar.gz/32e8e38c7fcd935241b9baab71bb432fd9b166ed"
   dependencies:
@@ -7115,7 +7115,7 @@ request@^2.87.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
-request@czardoz/request:
+"request@github:czardoz/request":
   version "2.74.1"
   resolved "https://codeload.github.com/czardoz/request/tar.gz/6ebb4651b72bee7292e54943adfa6b503465adfb"
   dependencies: