fix: tsdk sync files should include JSON files too

tsdk-monorepo · Jan 20, 2024 · 5afac09 · 5afac09
1 parent 734df89
commit 5afac09
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 9 deletions.
diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
@@ -2,6 +2,11 @@
 
 This is the log of notable changes to the `tsdk` that are developer-facing.
 
+
+### 0.1.3 2024/01/20
+
+- Fix: sync shared files should include JSON files like `*.json` or `*.shared.json`
+
 ### 0.1.2 2024/01/20
 
 - Chore: add `incremental: true` in fe-sdk template's tsconfig.json

diff --git a/examples/server/.gitignore b/examples/server/.gitignore
@@ -12,4 +12,5 @@ build-*
 *.db
 *.db-shm
 *.db-wal
-*.sqlite
+*.sqlite
+packages/fe-sdk-demo
diff --git a/examples/server/src/i18n/index.json b/examples/server/src/i18n/index.json
@@ -0,0 +1,3 @@
+{
+  "hello": "hello world"
+}
diff --git a/examples/server/src/i18n/index.ts b/examples/server/src/i18n/index.ts
@@ -1,9 +1,9 @@
 import 'intl-pluralrules';
 import i18next from 'i18next';
 
-const translation = {
-  hello: 'hello world',
-};
+import helloJSON from './index.json';
+
+const translation = helloJSON;
 export const i18n = i18next.createInstance(
   {
     fallbackLng: 'en',

diff --git a/examples/server/src/test-shared/index.shared.json b/examples/server/src/test-shared/index.shared.json
@@ -0,0 +1,3 @@
+{
+  "hello": "hello world"
+}
diff --git a/examples/server/src/test-shared/index.shared.ts b/examples/server/src/test-shared/index.shared.ts
@@ -0,0 +1,3 @@
+import helloJSON from './index.shared.json';
+
+export { helloJSON };
diff --git a/examples/server/tsconfig.json b/examples/server/tsconfig.json
@@ -7,6 +7,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true,
     "target": "es2017",
     "sourceMap": true,
     "baseUrl": "./",

diff --git a/packages/tsdk-server-adapters/package.json b/packages/tsdk-server-adapters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tsdk-server-adapters",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "lib/index.js",
   "repository": "tsdk-monorepo/tsdk",
   "bugs": "https://github.com/tsdk-monorepo/tsdk/issues",

diff --git a/packages/tsdk/package.json b/packages/tsdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tsdk",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Type-safe API development and code share tool for TypeScript projects.",
   "repository": "tsdk-monorepo/tsdk",
   "bugs": "https://github.com/tsdk-monorepo/tsdk/issues",

diff --git a/packages/tsdk/src/sync-files.ts b/packages/tsdk/src/sync-files.ts
@@ -230,8 +230,8 @@ export async function syncSharedFiles() {
   console.log(symbols.bullet, `sync shared files`);
 
   const files = await glob([
-    ...config.sharedDirs.map((i) => path.join(i, `**/*.ts`).replace(/\\/g, '/')),
-    path.join(config.baseDir, `**/*.${config.shareExt || 'shared'}.ts`),
+    ...config.sharedDirs.map((i) => path.join(i, `**/*.*`).replace(/\\/g, '/')),
+    path.join(config.baseDir, `**/*.${config.shareExt || 'shared'}.*`),
   ]);
   files.sort();
 
@@ -248,7 +248,7 @@ export async function syncSharedFiles() {
       );
       fromPath = path.normalize(fromPath);
       fromPath = fromPath.startsWith('.') ? fromPath : './' + fromPath;
-      if (fromPath.indexOf('tsdk-types') < 0) {
+      if (fromPath.indexOf('tsdk-types') < 0 && filePath.endsWith('.ts')) {
         indexContentMap[file] = `export * from '${fromPath.replace(/\\/g, '/')}';\n`;
       }
       return fsExtra.writeFile(filePath, content);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import helloJSON from './index.shared.json';

		export { helloJSON };