Backport PR jupyterlab#7013: Do not fail on deduplicate and ignore op…

…tional
meeseeksmachine · Aug 16, 2019 · ea8811b · ea8811b
1 parent 00ca5ea
commit ea8811b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/buildutils/src/update-core-mode.ts b/buildutils/src/update-core-mode.ts
@@ -36,7 +36,7 @@ utils.writePackageData(path.join(staging, 'package.json'), data);
 fs.removeSync(path.join(staging, 'yarn.lock'));
 utils.run('jlpm', { cwd: staging });
 try {
-  utils.run('jlpm yarn-deduplicate -s fewer --fail', { cwd: staging });
+  utils.run('jlpm yarn-deduplicate -s fewer', { cwd: staging });
 } catch {
   // re-run install if we deduped packages!
   utils.run('jlpm', { cwd: staging });

diff --git a/jupyterlab/commands.py b/jupyterlab/commands.py
@@ -163,7 +163,7 @@ def dedupe_yarn(path, logger=None):
         pins above, for example, known-bad versions
     """
     had_dupes = ProgressProcess(
-        ['node', YARN_PATH, 'yarn-deduplicate', '-s', 'fewer', '--fail'],
+        ['node', YARN_PATH, 'yarn-deduplicate', '-s', 'fewer'],
         cwd=path, logger=logger
     ).wait() != 0
 

diff --git a/jupyterlab/staging/.yarnrc b/jupyterlab/staging/.yarnrc
@@ -1 +1,2 @@
 yarn-path "./yarn.js"
+ignore-optional true
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "create:package": "node buildutils/lib/create-package.js",
     "create:test": "node buildutils/lib/create-test-package.js",
     "create:theme": "node buildutils/lib/create-theme.js",
-    "deduplicate": "jlpm yarn-deduplicate -s fewer --fail",
+    "deduplicate": "jlpm yarn-deduplicate -s fewer",
     "docs": "lerna run docs",
     "eslint": "eslint --fix .",
     "eslint:check": "eslint .",