Upgrade ts version and webpack version

.gitignore

@@ -22,9 +22,6 @@ dist
 lerna-debug.log
 yerna.log
 
-# awesome-typescript-loader
-.awcache
-
 # Testing
 coverage
 test-report.xml

changelog/@unreleased/pr-184.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Upgrade typescript/webpack versions
+  links:
+  - https://github.com/palantir/conjure-typescript/pull/184

jest.config.js

@@ -9,24 +9,12 @@
 module.exports = {
     bail: false,
     collectCoverage: false,
-    /**
-     * Here, we enable code coverage reporting for parts of your application that can be easily
-     * unit tested as well as critical code paths where logic errors are costly. Note that many aspects
-     * of an application's user interface are best verified using ETE or integration tests rather than
-     * unit tests. While Jest tests are very cheap to run in a jsdom environment, they might provide
-     * a false sense of security that features are properly guarded against regressions.
-     */
     collectCoverageFrom: [
-        "src/**/*.{ts,tsx}",
-        "!**/*.d.ts",
-    ],
-    coveragePathIgnorePatterns: [
+        'src/**/*.{ts,tsx}',
+        '!**/*.d.ts',
     ],
+    coveragePathIgnorePatterns: [],
     coverageThreshold: {
-        /**
-         * These thresholds are intentionally kept low so as not to impose undue burden when bootstrapping
-         * a project. They should be adjusted as necessary as a project matures.
-         */
         global: {
             branches: 50,
             functions: 50,
@@ -35,21 +23,26 @@ module.exports = {
         },
     },
     globals: {
-        "ts-jest": {
-            /** This global is necessary for ts-jest to locate the compiler project config. */
-            tsConfigFile: "src/tsconfig.json",
+        'ts-jest': {
+            tsconfig: 'src/tsconfig.json',
         },
     },
-    moduleFileExtensions: ["js", "json", "ts", "tsx"],
-    // rootDir is set at the package level and assumed to be the package root
-    // setupFiles: ["<rootDir>/src/testBootstrap.js"],
-    testEnvironment: "jsdom",
-    testMatch: ["<rootDir>/src/**/__tests__/*.{ts,tsx}"],
+    moduleFileExtensions: [
+        'js',
+        'json',
+        'ts',
+        'tsx',
+    ],
+    testEnvironment: 'jsdom',
+    testMatch: [
+        '<rootDir>/src/**/__tests__/*.{ts,tsx}',
+    ],
     transform: {
-        "^.+\\.(js|jsx|ts|tsx)$": "ts-jest",
+        '^.+\\.(js|jsx|ts|tsx)$': 'ts-jest',
     },
     transformIgnorePatterns: [
-        "/node_modules/(?!(lodash-es)/)",
+        '/node_modules/(?!(lodash-es)/)',
     ],
     verbose: true,
-};
+    preset: 'ts-jest/presets/js-with-ts',
+}

package.json

@@ -44,17 +44,17 @@
     "@types/commander": "2.12.2",
     "@types/download": "^6.2.2",
     "@types/fs-extra": "^5.0.4",
-    "@types/jest": "^22.2.3",
+    "@types/jest": "^27.0.3",
     "@types/lodash": "^4.14.117",
     "@types/mkdirp": "^0.5.2",
     "@types/nock": "^9.3.0",
+    "@types/node": "^16.11.7",
     "@types/node-dir": "^0.0.30",
     "@types/semver": "^5.5.0",
     "@types/tempy": "^0.1.0",
     "@types/yargs": "^11.1.2",
-    "awesome-typescript-loader": "^5.2.1",
     "chai": "^4.2.0",
-    "jest": "^22.4.4",
+    "jest": "^27.0.3",
     "karma": "^2.0.5",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.2.0",
@@ -64,12 +64,14 @@
     "mocha": "^5.2.0",
     "node-dir": "^0.1.17",
     "npm-run-all": "^4.1.3",
+    "spawn-sync": "^2.0.0",
     "tempy": "^0.2.1",
-    "ts-jest": "^22.4.6",
+    "ts-jest": "^27.0.7",
+    "ts-loader": "^9.2.6",
     "tslint": "^5.11.0",
-    "typescript": "~3.2.0",
-    "webpack": "^4.21.0",
-    "webpack-cli": "^3.1.2"
+    "typescript": "~4.4.4",
+    "webpack": "^5.64.1",
+    "webpack-cli": "^4.9.1"
   },
   "author": "Palantir Technologies, Inc.",
   "license": "Apache-2.0"

src/commands/generate/__tests__/cliTest.ts

@@ -186,8 +186,8 @@ describe("generate command", () => {
         expect(fs.existsSync(path.join(outDir, "node_modules/typescript/bin/tsc")));
     });
 
+    jest.setTimeout(10000);
     it("generated code compiles", async () => {
-        jest.setTimeout(10000);
         await generateCommand.handler({
             _: ["generate", input, outDir],
             packageName: "foo",
@@ -242,7 +242,7 @@ describe("generate command", () => {
             const child = child_process.exec(command, { cwd });
             child.on("error", reject);
             child.on("exit", code => {
-                resolve(code);
+                resolve(code || 0);
             });
         });
     }

webpack.config.js

@@ -6,7 +6,7 @@ module.exports = {
     devtool: false,
     entry: "./src/conjureTypeScript.ts",
     resolve: {
-        extensions: [ ".js", ".ts", ".json" ],
+        extensions: [".js", ".ts", ".json"],
     },
     output: {
         path: path.resolve(__dirname, 'dist/bin'),
@@ -17,17 +17,18 @@ module.exports = {
         rules: [
             {
                 test: /\.ts$/,
-                loader: require.resolve("awesome-typescript-loader"),
-                options: {
-                    configFileName: "./src/tsconfig.json",
-                    useCache: true,
-                    declaration: false
-                }
+                use: [
+                    {
+                        loader: 'ts-loader',
+                        options: {
+                            configFile: "./tsconfig.json",
+                        }
+                    }
+                ],
             }
         ]
     },
     plugins: [
-        new webpack.IgnorePlugin(/^electron$/),
-        new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true})
+        new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
     ],
 };