fix lerna canary support

Author: ds300

integration-tests/lerna-canary/__snapshots__/lerna-canary.test.ts.snap

@@ -0,0 +1,37 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test lerna-canary: making patch 1`] = `
+"SNAPSHOT: making patch
+patch-package 0.0.0
+• Creating temporary folder
+• Installing @parcel/[email protected] with yarn
+• Diffing your files with clean files
+✔ Created file patches/@parcel+codeframe+2.0.0-nightly.137.patch
+END SNAPSHOT"
+`;
+
+exports[`Test lerna-canary: the patch applies 1`] = `
+"SNAPSHOT: the patch applies
+patch-package 0.0.0
+Applying patches...
+@parcel/[email protected] ✔
+END SNAPSHOT"
+`;
+
+exports[`Test lerna-canary: the patch looks like this 1`] = `
+"SNAPSHOT: the patch looks like this
+diff --git a/node_modules/@parcel/codeframe/src/codeframe.js b/node_modules/@parcel/codeframe/src/codeframe.js
+index 2bf2c1c..ef0695b 100644
+--- a/node_modules/@parcel/codeframe/src/codeframe.js
++++ b/node_modules/@parcel/codeframe/src/codeframe.js
+@@ -41,7 +41,7 @@ const highlightSyntax = (txt: string, lang?: string): string => {
+   return emphasize.highlightAuto(txt).value;
+ };
+ 
+-export default function codeFrame(
++export default function patch-package(
+   code: string,
+   highlights: Array<DiagnosticCodeHighlight>,
+   // $FlowFixMe
+END SNAPSHOT"
+`;

integration-tests/lerna-canary/lerna-canary.sh

@@ -3,19 +3,21 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
+# this test makes sure that we can patch packages with build metadata in their version strings e.g. 4.5.6+commitsha
 echo "Add @parcel/codeframe"
 yarn add @parcel/[email protected]
 
 echo "replace codeframe with yarn in @parcel/codefram/src/codeframe.js"
-npx replace codeframe yarn node_modules/@parcel/codeframe/src/codeframe.js
+npx replace codeFrame patch-package node_modules/@parcel/codeframe/src/codeframe.js
 
 echo "SNAPSHOT: making patch"
-npx patch-package @parcel/codeframe
+patch-package @parcel/codeframe
 echo "END SNAPSHOT"
 
 echo "SNAPSHOT: the patch looks like this"
-cat patches/@parcel/codeframe+2.0.0-nightly.137.patch
+cat patches/@parcel+codeframe+2.0.0-nightly.137.patch
 echo "END SNAPSHOT"
 
 echo "reinstall node_modules"
@@ -27,12 +29,10 @@ if grep yarn node_modules/@parcel/codeframe/src/codeframe.js ; then
   exit 1
 fi
 
-echo "add patch-package to postinstall hook"
-node ./add-postinstall.js
-
 echo "reinstall node_modules"
 npx rimraf node_modules
 yarn
 
-echo "patch-package did run"
-grep yarn node_modules/@parcel/codeframe/src/codeframe.js
+echo "SNAPSHOT: the patch applies"
+patch-package
+echo "END SNAPSHOT"

integration-tests/lerna-canary/lerna-canary.test.ts

@@ -1,2 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
-runIntegrationTest({projectName: "lerna-canary", shouldProduceSnapshots: false})
+runIntegrationTest({
+  projectName: "lerna-canary",
+  shouldProduceSnapshots: true,
+})

package.json

@@ -13,7 +13,6 @@
     "patch-package": "./index.js"
   },
   "scripts": {
-    "precommit": "tsc --noEmit && lint-staged",
     "prepublishOnly": "yarn run clean && yarn run build",
     "build": "tsc --project tsconfig.build.json",
     "new-integration-test": "ts-node integration-tests/newIntegrationTest.ts",
@@ -22,6 +21,11 @@
     "prepack": "rimraf dist/**/*.test.js",
     "test": "./run-tests.sh --runInBand"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "tsc --noEmit && lint-staged"
+    }
+  },
   "lint-staged": {
     "*.ts": [
       "tslint -c tslint.json -p tsconfig.json",
@@ -59,7 +63,7 @@
     "jest": "^24.5.0",
     "lint-staged": "^8.1.5",
     "np": "^6.2.0",
-    "prettier": "^1.18.2",
+    "prettier": "^2.2.1",
     "randomstring": "^1.1.5",
     "ts-jest": "^24.0.0",
     "ts-node": "8.0.3",

src/getPackageResolution.ts

@@ -4,6 +4,7 @@ import { PackageManager, detectPackageManager } from "./detectPackageManager"
 import { readFileSync, existsSync } from "fs-extra"
 import { parse as parseYarnLockFile } from "@yarnpkg/lockfile"
 import findWorkspaceRoot from "find-yarn-workspace-root"
+import { getPackageVersion } from "./getPackageVersion"
 
 export function getPackageResolution({
   packageDetails,
@@ -31,12 +32,9 @@ export function getPackageResolution({
       throw new Error("Can't parse lock file")
     }
 
-    const installedVersionLong = require(join(
-      resolve(appPath, packageDetails.path),
-      "package.json",
-    )).version as string
-    const indexOfPlus = installedVersionLong.indexOf('+');
-    const installedVersion = indexOfPlus === -1 ? installedVersionLong : installedVersionLong.substring(0, indexOfPlus)
+    const installedVersion = getPackageVersion(
+      join(resolve(appPath, packageDetails.path), "package.json"),
+    )
 
     const entries = Object.entries(appLockFile.object).filter(
       ([k, v]) =>
@@ -89,7 +87,8 @@ export function getPackageResolution({
     }
     lockFileStack.reverse()
     const relevantStackEntry = lockFileStack.find(
-      entry => entry.dependencies && packageDetails.name in entry.dependencies,
+      (entry) =>
+        entry.dependencies && packageDetails.name in entry.dependencies,
     )
     const pkg = relevantStackEntry.dependencies[packageDetails.name]
     return pkg.resolved || pkg.from || pkg.version

src/getPackageVersion.ts

@@ -0,0 +1,4 @@
+export function getPackageVersion(packageJsonPath: string): string {
+  // remove build metadata
+  return require(packageJsonPath).version.replace(/\+.*$/, "")
+}

src/makePatch.ts

@@ -22,6 +22,7 @@ import { resolveRelativeFileDependencies } from "./resolveRelativeFileDependenci
 import { getPackageResolution } from "./getPackageResolution"
 import { parsePatchFile } from "./patch/parse"
 import { gzipSync } from "zlib"
+import { getPackageVersion } from "./getPackageVersion"
 
 function printNoPackageFoundError(
   packageName: string,
@@ -97,13 +98,13 @@ export function makePatch({
       }),
     )
 
-    const packageVersion = require(join(
-      resolve(packageDetails.path),
-      "package.json",
-    )).version as string
+    const packageVersion = getPackageVersion(
+      join(resolve(packageDetails.path), "package.json"),
+    )
 
     // copy .npmrc/.yarnrc in case packages are hosted in private registry
-    [".npmrc", ".yarnrc"].forEach(rcFile => {
+    // tslint:disable-next-line:align
+    ;[".npmrc", ".yarnrc"].forEach((rcFile) => {
       const rcPath = join(appPath, rcFile)
       if (existsSync(rcPath)) {
         copySync(rcPath, join(tmpRepo.name, rcFile))
@@ -264,11 +265,11 @@ export function makePatch({
     }
 
     const packageNames = packageDetails.packageNames
-      .map(name => name.replace(/\//g, "+"))
+      .map((name) => name.replace(/\//g, "+"))
       .join("++")
 
     // maybe delete existing
-    getPatchFiles(patchDir).forEach(filename => {
+    getPatchFiles(patchDir).forEach((filename) => {
       const deets = getPackageDetailsFromPatchFilename(filename)
       if (deets && deets.path === packageDetails.path) {
         unlinkSync(join(patchDir, filename))

yarn.lock

@@ -4042,10 +4042,10 @@ prepend-http@^2.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
-prettier@^1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
-  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
+prettier@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
 pretty-format@^24.5.0:
   version "24.5.0"