From a8a9ccfb84cf1aad6c17368af6a72ad3c32b1811 Mon Sep 17 00:00:00 2001 From: Martien Oranje Date: Thu, 4 Oct 2018 21:47:29 +0200 Subject: [PATCH] fix(workflow): invalid reference to package.json --- package-lock.json | 118 +++++++++++++++++++++++++++++++-------- package.json | 13 +++-- src/typings.d.ts | 1 + src/workflow/workflow.ts | 12 ++-- 4 files changed, 112 insertions(+), 32 deletions(-) create mode 100644 src/typings.d.ts diff --git a/package-lock.json b/package-lock.json index d08b49cd..98df1915 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2166,12 +2166,6 @@ "defer-to-connect": "^1.0.1" } }, - "@types/app-root-path": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/app-root-path/-/app-root-path-1.2.4.tgz", - "integrity": "sha1-p4twMoKzKsVN52j1US7MNWmRncc=", - "dev": true - }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -2312,8 +2306,15 @@ "@types/node": { "version": "10.10.2", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.10.2.tgz", - "integrity": "sha512-yg1zoc4aUbsVyKg2eMpmNthOI+Edn2ntiLRxHjhGeFtTwg3CORdqkY0tBZh+TNPnTTtf4iyU5TVxbHVdEjrDTQ==", - "dev": true + "integrity": "sha512-yg1zoc4aUbsVyKg2eMpmNthOI+Edn2ntiLRxHjhGeFtTwg3CORdqkY0tBZh+TNPnTTtf4iyU5TVxbHVdEjrDTQ==" + }, + "@types/node-notifier": { + "version": "0.0.28", + "resolved": "https://registry.npmjs.org/@types/node-notifier/-/node-notifier-0.0.28.tgz", + "integrity": "sha1-hro9OqjZGDUswxkdiN4yiyDck8E=", + "requires": { + "@types/node": "*" + } }, "@types/os-name": { "version": "2.0.0", @@ -2324,6 +2325,16 @@ "@types/node": "*" } }, + "@types/plist": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.0.tgz", + "integrity": "sha512-HpXnA28tnZz/Ju6HADvj6FSbCVTzJPZ1Kugq3reeFIe9dQJq2HehL8dhsNnGpt7A6PbAP3/xIaszJ8q1xGxLbg==", + "dev": true, + "requires": { + "@types/node": "*", + "@types/xmlbuilder": "*" + } + }, "@types/rx": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/@types/rx/-/rx-4.1.1.tgz", @@ -2475,6 +2486,12 @@ "@types/node": "*" } }, + "@types/xmlbuilder": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/xmlbuilder/-/xmlbuilder-0.0.34.tgz", + "integrity": "sha512-yVsHfYqJblSEg3DvUhGndpCZBZz2GiGVmqMa04fbGro2xzxRj85Q7MQ4os+MaXmKcpCDD42MXuxUWfoUKTuVdQ==", + "dev": true + }, "JSONStream": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.4.tgz", @@ -2926,11 +2943,6 @@ } } }, - "app-root-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz", - "integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=" - }, "append-transform": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", @@ -3420,8 +3432,7 @@ "base64-js": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", - "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", - "dev": true + "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==" }, "bcrypt-pbkdf": { "version": "1.0.1", @@ -5345,6 +5356,32 @@ } } }, + "eslint-config-prettier": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-3.1.0.tgz", + "integrity": "sha512-QYGfmzuc4q4J6XIhlp8vRKdI/fI0tQfQPy1dME3UOLprE+v4ssH/3W9LM2Q7h5qBcy5m0ehCrBDU2YF8q6OY8w==", + "dev": true, + "requires": { + "get-stdin": "^6.0.0" + }, + "dependencies": { + "get-stdin": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", + "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", + "dev": true + } + } + }, + "eslint-plugin-prettier": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.0.0.tgz", + "integrity": "sha512-4g11opzhqq/8+AMmo5Vc2Gn7z9alZ4JqrbZ+D4i8KlSyxeQhZHlmIrY8U9Akf514MoEhogPa87Jgkq87aZ2Ohw==", + "dev": true, + "requires": { + "prettier-linter-helpers": "^1.0.0" + } + }, "esprima": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", @@ -5538,6 +5575,12 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, + "fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", + "dev": true + }, "fast-glob": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz", @@ -5875,6 +5918,11 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, + "fast-plist": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.2.tgz", + "integrity": "sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg=" + }, "fb-watchman": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz", @@ -7017,8 +7065,7 @@ "growly": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", - "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", - "dev": true + "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=" }, "handlebars": { "version": "4.0.11", @@ -7909,8 +7956,7 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "isobject": { "version": "2.1.0", @@ -10452,7 +10498,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz", "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==", - "dev": true, "requires": { "growly": "^1.3.0", "semver": "^5.4.1", @@ -14320,6 +14365,16 @@ "semver-compare": "^1.0.0" } }, + "plist": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", + "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", + "requires": { + "base64-js": "^1.2.3", + "xmlbuilder": "^9.0.7", + "xmldom": "0.1.x" + } + }, "pn": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", @@ -14355,6 +14410,15 @@ "integrity": "sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==", "dev": true }, + "prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "requires": { + "fast-diff": "^1.1.2" + } + }, "pretty-format": { "version": "23.6.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz", @@ -16180,8 +16244,7 @@ "shellwords": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", - "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", - "dev": true + "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==" }, "signal-exit": { "version": "3.0.2", @@ -17850,7 +17913,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, "requires": { "isexe": "^2.0.0" } @@ -18012,6 +18074,16 @@ "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", "dev": true }, + "xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" + }, + "xmldom": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", + "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" + }, "xregexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", diff --git a/package.json b/package.json index f12d50a4..bf133012 100644 --- a/package.json +++ b/package.json @@ -119,11 +119,10 @@ ] }, "dependencies": { - "@types/lru-cache": "4.1.1", "ajv": "6.5.3", - "app-root-path": "2.1.0", "babel-polyfill": "6.26.0", "date-fns": "2.0.0-alpha.18", + "fast-plist": "0.1.2", "fuzzaldrin": "2.1.0", "got": "9.2.2", "jsonfile": "5.0.0", @@ -133,6 +132,7 @@ "mkdirp": "0.5.1", "moo": "github:no-context/moo#master", "nearley": "2.15.1", + "node-notifier": "5.2.1", "os-name": "2.0.1", "stampit": "4.2.0" }, @@ -143,17 +143,18 @@ "@semantic-release/changelog": "3.0.0", "@semantic-release/exec": "3.1.3", "@semantic-release/git": "7.0.4", - "@types/app-root-path": "1.2.4", "@types/fuzzaldrin": "2.1.0", "@types/got": "8.3.3", "@types/inquirer": "0.0.43", "@types/jest": "23.3.2", "@types/jsonfile": "4.0.1", "@types/lodash": "4.14.116", + "@types/lru-cache": "4.1.1", "@types/md5": "2.1.33", "@types/mkdirp": "0.5.1", "@types/moo": "0.4.1", "@types/nearley": "2.11.0", + "@types/node-notifier": "0.0.28", "@types/node": "*", "@types/os-name": "2.0.0", "@types/shelljs": "0.8.0", @@ -164,6 +165,8 @@ "coveralls": "3.0.2", "cross-env": "5.2.0", "cz-conventional-changelog": "^2.0.0", + "eslint-config-prettier": "3.1.0", + "eslint-plugin-prettier": "3.0.0", "husky": "^0.14.0", "inquirer": "6.2.0", "jest": "^23.6.0", @@ -172,21 +175,21 @@ "prettier": "^1.14.3", "prompt": "^1.0.0", "replace-in-file": "3.4.2", - "rollup": "^0.66.2", "rollup-plugin-commonjs": "9.1.8", "rollup-plugin-json": "3.1.0", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-node-resolve": "3.4.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-typescript2": "^0.17.0", + "rollup": "^0.66.2", "semantic-release": "^15.9.16", "shelljs": "0.8.2", "travis-deploy-once": "^5.0.9", "ts-jest": "*", "ts-node": "7.0.1", - "tslint": "^5.11.0", "tslint-config-prettier": "1.15.0", "tslint-config-standard": "7.1.0", + "tslint": "^5.11.0", "typedoc": "^0.12.0", "typescript": "3.0.3" } diff --git a/src/typings.d.ts b/src/typings.d.ts new file mode 100644 index 00000000..55dbe19e --- /dev/null +++ b/src/typings.d.ts @@ -0,0 +1 @@ +declare module 'fast-plist' diff --git a/src/workflow/workflow.ts b/src/workflow/workflow.ts index be77f1bb..b7ecd78b 100644 --- a/src/workflow/workflow.ts +++ b/src/workflow/workflow.ts @@ -1,8 +1,13 @@ +import plist from 'fast-plist' +import { readFileSync } from 'fs' import md5 from 'md5' import osName from 'os-name' import compose from 'stampit' -const pkg = require('../../package.json') +const infoPlist: any = plist.parse(readFileSync(`${process.cwd()}/info.plist`, 'utf8')) +const alfredPlist: any = plist.parse( + readFileSync('/Applications/Alfred 3.app/Contents/Info.plist', 'utf8') +) export interface Writable { write: (...params: any[]) => void @@ -66,7 +71,8 @@ export const Writable = compose({ `os: ${osName()}`, `query: ${err.query}`, `node.js: ${process.version}`, - `workflow: ${pkg.version}`, + `alfred: ${alfredPlist.CFBundleShortVersionString}`, + `workflow: ${infoPlist.version}`, `Stack: ${err.stack}` ].join('\n') } @@ -176,5 +182,3 @@ export const Query = compose({ methods: {} }) - -export const Notification = compose(Writable)