Yuki Takei 4 лет назад
Родитель
Сommit
33816bf4d6

+ 0 - 12
package.json

@@ -64,18 +64,6 @@
   "devDependencies": {
   "devDependencies": {
     "lerna": "^4.0.0"
     "lerna": "^4.0.0"
   },
   },
-  "_moduleAliases": {
-    "@root": ".",
-    "@commons": "src/lib",
-    "@server": "src/server",
-    "@alias/logger": "src/lib/service/logger",
-    "debug": "src/lib/service/logger/alias-for-debug"
-  },
-  "jest": {
-    "moduleNameMapper": {
-      "@commons/(.*)": "<rootDir>/src/lib/$1"
-    }
-  },
   "engines": {
   "engines": {
     "node": "^12 || ^14",
     "node": "^12 || ^14",
     "npm": ">=6.11.3 <7",
     "npm": ">=6.11.3 <7",

+ 13 - 9
packages/app/config/jest.config.js

@@ -1,33 +1,37 @@
 // For a detailed explanation regarding each configuration property, visit:
 // For a detailed explanation regarding each configuration property, visit:
 // https://jestjs.io/docs/en/configuration.html
 // https://jestjs.io/docs/en/configuration.html
+// https://kulshekhar.github.io/ts-jest/user/config/
 
 
 const MODULE_NAME_MAPPING = {
 const MODULE_NAME_MAPPING = {
-  '@root/(.+)': '<rootDir>/$1',
-  '@commons/(.+)': '<rootDir>/src/lib/$1',
-  '@server/(.+)': '<rootDir>/src/server/$1',
-  '@alias/logger': '<rootDir>/src/lib/service/logger',
-  // -- doesn't work with unknown error -- 2019.06.19 Yuki Takei
-  // debug: '<rootDir>/src/lib/service/logger/alias-for-debug',
+  '^\\^/(.+)$': '<rootDir>/$1',
+  '^~/(.+)$': '<rootDir>/src/$1',
 };
 };
 
 
 module.exports = {
 module.exports = {
   // Indicates whether each individual test should be reported during the run
   // Indicates whether each individual test should be reported during the run
   verbose: true,
   verbose: true,
 
 
+  preset: 'ts-jest/presets/js-with-ts',
+
   rootDir: '../',
   rootDir: '../',
+  roots: ['<rootDir>/src'],
+
   globalSetup: '<rootDir>/src/test/global-setup.js',
   globalSetup: '<rootDir>/src/test/global-setup.js',
   globalTeardown: '<rootDir>/src/test/global-teardown.js',
   globalTeardown: '<rootDir>/src/test/global-teardown.js',
 
 
   projects: [
   projects: [
     {
     {
       displayName: 'server',
       displayName: 'server',
-      testEnvironment: 'node',
+
+      preset: 'ts-jest/presets/js-with-ts',
+
       rootDir: '.',
       rootDir: '.',
+      roots: ['<rootDir>/src'],
+      testEnvironment: 'node',
       setupFilesAfterEnv: ['<rootDir>/src/test/setup.js'],
       setupFilesAfterEnv: ['<rootDir>/src/test/setup.js'],
-      testMatch: ['<rootDir>/src/test/**/*.test.js'],
+      testMatch: ['<rootDir>/src/test/**/*.test.ts', '<rootDir>/src/test/**/*.test.js'],
       // Automatically clear mock calls and instances between every test
       // Automatically clear mock calls and instances between every test
       clearMocks: true,
       clearMocks: true,
-      // A map from regular expressions to module names that allow to stub out resources with a single module
       moduleNameMapper: MODULE_NAME_MAPPING,
       moduleNameMapper: MODULE_NAME_MAPPING,
     },
     },
     // {
     // {

+ 0 - 4
packages/app/config/webpack.common.js

@@ -66,10 +66,6 @@ module.exports = (options) => {
       alias: {
       alias: {
         '~': path.resolve(__dirname, '../src'), // src
         '~': path.resolve(__dirname, '../src'), // src
         '^': path.resolve(__dirname, '../'), // project root
         '^': path.resolve(__dirname, '../'), // project root
-        '@root': path.resolve(__dirname, '../'),
-        '@commons': path.resolve(__dirname, '../src/lib'),
-        '@client': path.resolve(__dirname, '../src/client'),
-        '@alias/logger': path.resolve(__dirname, '../src/utils/logger'),
       },
       },
     },
     },
     node: {
     node: {

+ 0 - 1
packages/app/tsconfig.build.json

@@ -10,7 +10,6 @@
     "paths": {
     "paths": {
       "~/*": ["./src/*"],
       "~/*": ["./src/*"],
       "^/*": ["./*"],
       "^/*": ["./*"],
-      "@alias/logger": ["./src/server/utils/logger"],
       "debug": ["./src/server/utils/logger/alias-for-debug"]
       "debug": ["./src/server/utils/logger/alias-for-debug"]
     }
     }
   }
   }

+ 0 - 1
packages/app/tsconfig.json

@@ -6,7 +6,6 @@
       "~/*": ["./src/*"],
       "~/*": ["./src/*"],
       "^/*": ["./*"],
       "^/*": ["./*"],
       "@growi/*": ["./packages/*/src"],
       "@growi/*": ["./packages/*/src"],
-      "@alias/logger": ["./src/server/utils/logger"],
       "debug": ["./src/server/utils/logger/alias-for-debug"]
       "debug": ["./src/server/utils/logger/alias-for-debug"]
     }
     }
   }
   }