fix: Disambiguate paths for build (#88)

* Disambiguate paths * Fix tests
salesforce · Mar 8, 2018 · f5e6290 · f5e6290
1 parent 7023328
commit f5e6290
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/best-build/src/__tests__/best-build.spec.js b/packages/best-build/src/__tests__/best-build.spec.js
@@ -10,6 +10,7 @@ const MOCK_MESSAGER = {
     onBenchmarkBuildEnd() {},
     logState() {}
 };
+const projectName = 'test';
 
 function tempDir() {
     return fs.mkdtempSync(path.join(os.tmpdir(), TEMP_DIR_PREFIX));
@@ -22,21 +23,23 @@ describe('buildBenchmark', () => {
             path.resolve(__dirname, 'fixtures', 'single-file', 'single-file.js'),
             {
                 cacheDirectory,
+                projectName
             },
             {},
             MOCK_MESSAGER,
         );
 
-        expect(fs.statSync(`${cacheDirectory}/single-file`).isDirectory()).toBe(true);
-        expect(fs.statSync(`${cacheDirectory}/single-file/single-file.html`).isFile()).toBe(true);
-        expect(fs.statSync(`${cacheDirectory}/single-file/single-file.js`).isFile()).toBe(true);
+        expect(fs.statSync(`${cacheDirectory}/${projectName}/single-file`).isDirectory()).toBe(true);
+        expect(fs.statSync(`${cacheDirectory}/${projectName}/single-file/single-file.html`).isFile()).toBe(true);
+        expect(fs.statSync(`${cacheDirectory}/${projectName}/single-file/single-file.js`).isFile()).toBe(true);
     });
 
     test('build output', async () => {
         const { benchmarkName, benchmarkEntry, benchmarkFolder, benchmarkSignature } = await buildBenchmark(
             path.resolve(__dirname, 'fixtures', 'single-file', 'single-file.js'),
             {
                 cacheDirectory: tempDir(),
+                projectName
             },
             {},
             MOCK_MESSAGER,
@@ -59,6 +62,8 @@ describe('buildBenchmark', () => {
             path.resolve(__dirname, 'fixtures', 'single-file', 'single-file.js'),
             {
                 cacheDirectory: tempDir(),
+                projectName
+
             },
             {},
             messager,
@@ -92,6 +97,7 @@ describe('buildBenchmark', () => {
             path.resolve(__dirname, 'fixtures', 'single-file', 'single-file.js'),
             {
                 cacheDirectory: tempDir(),
+                projectName,
                 plugins: [['build-plugin-opts', PLUGIN_OPTIONS]],
             },
             {},
@@ -127,6 +133,7 @@ describe('buildBenchmark', () => {
             path.resolve(__dirname, 'fixtures', 'single-file', 'single-file.js'),
             {
                 cacheDirectory: tempDir(),
+                projectName,
                 plugins: ['build-plugin-hooks'],
             },
             {},

diff --git a/packages/best-build/src/index.js b/packages/best-build/src/index.js
@@ -34,11 +34,12 @@ function addResolverPlugins({ plugins }) {
 }
 
 export async function buildBenchmark(entry, projectConfig, globalConfig, messager) {
-    messager.onBenchmarkBuildStart(entry, projectConfig.projectName);
+    const { projectName, cacheDirectory } = projectConfig;
+    messager.onBenchmarkBuildStart(entry, projectName);
 
     const ext = path.extname(entry);
     const benchmarkName = path.basename(entry, ext);
-    const benchmarkFolder = path.join(projectConfig.cacheDirectory, benchmarkName);
+    const benchmarkFolder = path.join(cacheDirectory, projectName, benchmarkName);
     const benchmarkJSFileName = benchmarkName + ext;
     const inputOptions = Object.assign({}, BASE_ROLLUP_INPUT, {
         input: entry,
@@ -67,7 +68,7 @@ export async function buildBenchmark(entry, projectConfig, globalConfig, message
 
     fs.writeFileSync(htmlPath, html, 'utf8');
 
-    messager.onBenchmarkBuildEnd(entry, projectConfig.projectName);
+    messager.onBenchmarkBuildEnd(entry, projectName);
 
     return {
         benchmarkName,