feat: add ts check in loadFile

eggjs · Mar 23, 2018 · 46dc810 · 46dc810
1 parent 5363b4a
commit 46dc810
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/lib/loader/egg_loader.js b/lib/loader/egg_loader.js
@@ -287,6 +287,10 @@ class EggLoader {
       return null;
     }
 
+    if (!this.options.typescript && filepath.endsWith('.ts')) {
+      return null;
+    }
+
     const ret = utils.loadFile(filepath);
     // function(arg1, args, ...) {}
     if (inject.length === 0) inject = [ this.app ];

diff --git a/lib/loader/mixin/extend.js b/lib/loader/mixin/extend.js
@@ -110,7 +110,8 @@ module.exports = {
         deprecate(`app/extend/${name}/index.js is deprecated, use app/extend/${name}.js instead`);
       }
 
-      const ext = utils.loadFile(filepath);
+      const ext = this.loadFile(filepath);
+      if (!ext) continue;
 
       const properties = Object.getOwnPropertyNames(ext)
         .concat(Object.getOwnPropertySymbols(ext));

diff --git a/test/egg-ts.test.js b/test/egg-ts.test.js
@@ -79,7 +79,9 @@ describe('test/egg-ts.test.js', () => {
   it('should not load ts files while typescript was false', async () => {
     app = utils.createApp('egg-ts-js');
 
+    app.loader.loadApplicationExtend();
     app.loader.loadService();
+    assert(!app.appExtend);
     assert(app.serviceClasses.lord);
     assert(!app.serviceClasses.test);
   });

diff --git a/test/fixtures/egg-ts-js/app/extend/application.ts b/test/fixtures/egg-ts-js/app/extend/application.ts
@@ -0,0 +1,3 @@
+module.exports = {
+  appExtend: 'hello'
+}