Merge branch 'master' of github.com:pluginpal/strapi-plugin-config-sync

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 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 renamed to playground/config/api.ts

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

playground/config/database.js

@@ -1,9 +1,9 @@
-module.exports = {
+export default () => ({
   'config-sync': {
     enabled: true,
     config: {
       importOnBootstrap: false,
       minify: true,
     },
   },
-};
+});

playground/config/database.ts

@@ -1,4 +1,4 @@
-module.exports = ({ env }) => ({
+export default ({ env }) => ({
   host: env('HOST', '0.0.0.0'),
   port: env.int('PORT', 1337),
   app: {

playground/config/middlewares.js renamed to playground/config/middlewares.ts

@@ -11,15 +11,19 @@
     "cs": "config-sync"
   },
   "devDependencies": {
+    "@types/node": "^24.0.7",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
     "supertest": "^6.3.3",
+    "typescript": "^5.8.3",
     "yalc": "^1.0.0-pre.53"
   },
   "dependencies": {
-    "@strapi/plugin-cloud": "5.0.4",
-    "@strapi/plugin-users-permissions": "5.0.4",
-    "@strapi/strapi": "5.0.4",
+    "@strapi/plugin-cloud": "5.16.0",
+    "@strapi/plugin-users-permissions": "5.16.0",
+    "@strapi/strapi": "5.16.0",
     "better-sqlite3": "9.4.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

playground/config/plugins.js renamed to playground/config/plugins.ts

@@ -1,3 +1,5 @@
+import type { StrapiApp } from '@strapi/strapi/admin';
+
 export default {
   config: {
     locales: [
@@ -29,7 +31,7 @@ export default {
       // 'zh',
     ],
   },
-  bootstrap(app) {
+  bootstrap(app: StrapiApp) {
     console.log(app);
   },
 };

playground/config/server.js renamed to playground/config/server.ts

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "useDefineForClassFields": true,
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "allowJs": false,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["../plugins/**/admin/src/**/*", "./"],
+  "exclude": ["node_modules/", "build/", "dist/", "**/*.test.ts"]
+}

playground/jsconfig.json

@@ -0,0 +1,12 @@
+import { mergeConfig, type UserConfig } from 'vite';
+
+export default (config: UserConfig) => {
+  // Important: always return the modified config
+  return mergeConfig(config, {
+    resolve: {
+      alias: {
+        '@': '/src',
+      },
+    },
+  });
+};

playground/package.json

@@ -0,0 +1,7 @@
+/**
+ * home controller
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreController('api::home.home');

playground/src/admin/app.example.js renamed to playground/src/admin/app.example.tsx

@@ -0,0 +1,8 @@
+
+/**
+ * home router
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('api::home.home');

playground/src/admin/tsconfig.json

@@ -0,0 +1,7 @@
+/**
+ * home service
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('api::home.home');