Adds versioning to the cache path

yarnpkg · Feb 23, 2017 · d40264d · d40264d
1 parent 7aaee9b
commit d40264d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/cli/commands/cache.js b/src/cli/commands/cache.js
@@ -60,10 +60,9 @@ export const {run, setFlags} = buildSubCommands('cache', {
     flags: Object,
     args: Array<string>,
   ): Promise<void> {
-    const cacheFolder = config.cacheFolder;
-    if (cacheFolder) {
-      await fs.unlink(cacheFolder);
-      await fs.mkdirp(cacheFolder);
+    if (config.cacheFolder) {
+      await fs.unlink(config.cacheRootFolder);
+      await fs.mkdirp(config.cacheFolder);
       reporter.success(reporter.lang('clearedCache'));
     }
   },

diff --git a/src/config.js b/src/config.js
@@ -21,6 +21,7 @@ const path = require('path');
 
 export type ConfigOptions = {
   cwd?: ?string,
+  cacheRootFolder?: ?string,
   cacheFolder?: ?string,
   tempFolder?: ?string,
   modulesFolder?: ?string,
@@ -109,6 +110,9 @@ export default class Config {
   //
   modulesFolder: ?string;
 
+  //
+  cacheRootFolder: string;
+
   //
   cacheFolder: string;
 
@@ -229,8 +233,14 @@ export default class Config {
       networkConcurrency: this.networkConcurrency,
     });
 
+    this.cacheRootFolder = String(
+      opts.cacheFolder ||
+      this.getOption('cache-folder') ||
+      constants.MODULE_CACHE_DIRECTORY
+    );
+
     //init & create cacheFolder, tempFolder
-    this.cacheFolder = String(opts.cacheFolder || this.getOption('cache-folder') || constants.MODULE_CACHE_DIRECTORY);
+    this.cacheFolder = path.join(this.cacheRootFolder, 'v' + String(constants.CACHE_VERSION));
     this.tempFolder = opts.tempFolder || path.join(this.cacheFolder, '.tmp');
     await fs.mkdirp(this.cacheFolder);
     await fs.mkdirp(this.tempFolder);

diff --git a/src/constants.js b/src/constants.js
@@ -24,6 +24,9 @@ export const SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
 export const SELF_UPDATE_TARBALL_URL = 'https://yarnpkg.com/latest.tar.gz';
 export const SELF_UPDATE_DOWNLOAD_FOLDER = 'updates';
 
+// cache version, bump whenever we make backwards incompatible changes
+export const CACHE_VERSION = 1;
+
 // lockfile version, bump whenever we make backwards incompatible changes
 export const LOCKFILE_VERSION = 1;