Merge pull request #187 from gboutte/master

Avoid CLI re building the project if it's already built

Author: boazpoolman

playground/.gitignore

@@ -108,12 +108,13 @@ coverage
 # Strapi
 ############################
 
-# .env
 license.txt
 exports
-*.cache
+.strapi
+dist
 build
 .strapi-updater.json
+.strapi-cloud.json
 
 # yalc
 .yalc

playground/.strapi/client/app.js

@@ -58,4 +58,47 @@ describe('Test the config-sync CLI', () => {
     }
     expect(error).toHaveProperty('code', 1);
   });
+
+  test('Import build project', async () => {
+    // First we make sure the dist folder is deleted.
+    await exec('mv dist .tmp');
+
+    await exec('yarn cs import -y');
+
+    const { stdout: buildOutput } = await exec('ls dist');
+    expect(buildOutput).toContain('config');
+    expect(buildOutput).toContain('src');
+    expect(buildOutput).toContain('tsconfig.tsbuildinfo');
+
+    // We restore the dist folder.
+    await exec('rm -rf dist');
+    await exec('mv .tmp/dist ./dist');
+
+  });
+  test('Import project already built', async () => {
+
+
+    // First we make sure the dist folder exists by doing an import.
+    await exec('yarn cs import -y');
+
+    const { stdout: lsDist } = await exec('ls dist');
+    expect(lsDist).toContain('config');
+    expect(lsDist).toContain('src');
+    expect(lsDist).toContain('tsconfig.tsbuildinfo');
+
+    // We remove on file from the dist folder
+    await exec('mv dist/tsconfig.tsbuildinfo .tmp');
+
+    // The new import should not rebuild the project.
+    await exec('yarn cs import -y');
+
+    const { stdout: buildOutput } = await exec('ls dist');
+    expect(buildOutput).toContain('config');
+    expect(buildOutput).toContain('src');
+    expect(buildOutput).not.toContain('tsconfig.tsbuildinfo');
+
+    // We restore the tsconfig.tsbuildinfo file.
+    await exec('mv .tmp/tsconfig.tsbuildinfo dist/tsconfig.tsbuildinfo');
+
+  });
 });

playground/.strapi/client/index.html

@@ -7,7 +7,7 @@ jest.setTimeout(20000);
 
 afterEach(async () => {
   // Disable importOnBootstrap
-  await exec('sed -i "s/importOnBootstrap: true/importOnBootstrap: false/g" config/plugins.js');
+  await exec('sed -i "s/importOnBootstrap: true/importOnBootstrap: false/g" config/plugins.ts');
 
   await cleanupStrapi();
   await exec('rm -rf config/sync');
@@ -19,8 +19,8 @@ describe('Test the importOnBootstrap feature', () => {
     await exec('yarn cs export -y');
     await exec('rm -rf .tmp');
 
-    // Manually change the plugins.js to enable importOnBoostrap.
-    await exec('sed -i "s/importOnBootstrap: false/importOnBootstrap: true/g" config/plugins.js');
+    // Manually change the plugins.ts to enable importOnBoostrap.
+    await exec('sed -i "s/importOnBootstrap: false/importOnBootstrap: true/g" config/plugins.ts');
 
     // Start up Strapi to initiate the importOnBootstrap function.
     await setupStrapi();
@@ -33,8 +33,8 @@ describe('Test the importOnBootstrap feature', () => {
     await exec('rm -rf .tmp');
     await exec('yarn cs export -y');
 
-    // Manually change the plugins.js to enable importOnBoostrap.
-    await exec('sed -i "s/importOnBootstrap: false/importOnBootstrap: true/g" config/plugins.js');
+    // Manually change the plugins.ts to enable importOnBoostrap.
+    await exec('sed -i "s/importOnBootstrap: false/importOnBootstrap: true/g" config/plugins.ts');
 
     // Remove a config file to make sure the importOnBoostrap
     // function actually attempts to import.

playground/__tests__/cli.test.js

@@ -1,4 +1,4 @@
-module.exports = ({ env }) => ({
+export default ({ env }) => ({
   auth: {
     secret: env('ADMIN_JWT_SECRET'),
   },
@@ -19,6 +19,5 @@ module.exports = ({ env }) => ({
   },
   watchIgnoreFiles: [
     '!**/.yalc/**/server/**',
-    '**/config/sync/**',
-  ]
+  ],
 });

playground/__tests__/import-on-boostrap.test.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   rest: {
     defaultLimit: 25,
     maxLimit: 100,

playground/config/admin.js playground/config/admin.tsplayground/config/admin.js renamed to playground/config/admin.ts

@@ -0,0 +1,15 @@
+import path from 'path';
+
+export default ({ env }) => {
+
+  return {
+    connection: {
+      client: 'sqlite',
+      connection: {
+        filename: path.join(__dirname, '..', '..', env('DATABASE_FILENAME', '.tmp/data.db')),
+      },
+      useNullAsDefault: true,
+    },
+  };
+
+};

playground/config/api.js playground/config/api.tsplayground/config/api.js renamed to playground/config/api.ts

@@ -1,4 +1,4 @@
-module.exports = [
+export default [
   'strapi::logger',
   'strapi::errors',
   'strapi::security',