diff --git a/examples/with-jest-typescript/.babelrc b/examples/with-jest-typescript/.babelrc index f1ced417..37de2b50 100644 --- a/examples/with-jest-typescript/.babelrc +++ b/examples/with-jest-typescript/.babelrc @@ -1,6 +1,29 @@ { - "presets": [ - "next/babel", - "@zeit/next-typescript/babel" - ] -} \ No newline at end of file + "env": { + "development": { + "presets": [ + "next/babel", + "@zeit/next-typescript/babel" + ] + }, + "production": { + "presets": [ + "next/babel", + "@zeit/next-typescript/babel" + ] + }, + "test": { + "presets": [ + [ + "next/babel", + { + "preset-env": { + "modules": "commonjs" + } + } + ], + "@zeit/next-typescript/babel" + ] + } + } +} diff --git a/examples/with-jest-typescript/jest.config.js b/examples/with-jest-typescript/jest.config.js index a839f1d1..bb88ced3 100644 --- a/examples/with-jest-typescript/jest.config.js +++ b/examples/with-jest-typescript/jest.config.js @@ -2,14 +2,9 @@ const TEST_REGEX = '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|js?|tsx?|ts?)$' module.exports = { setupFiles: ['/jest.setup.js'], - globals: { - 'ts-jest': { - 'useBabelrc': true - } - }, testRegex: TEST_REGEX, transform: { - '^.+\\.tsx?$': 'ts-jest' + '^.+\\.tsx?$': 'babel-jest' }, testPathIgnorePatterns: [ '/.next/', '/node_modules/' diff --git a/examples/with-jest-typescript/package.json b/examples/with-jest-typescript/package.json index cc31316d..3be35d38 100644 --- a/examples/with-jest-typescript/package.json +++ b/examples/with-jest-typescript/package.json @@ -2,28 +2,29 @@ "name": "with-jest-typescript", "version": "1.0.0", "scripts": { - "test": "NODE_ENV=test jest", + "test": "jest", "dev": "next", "build": "next build", "start": "next start" }, "dependencies": { - "next": "^5.0.0", + "next": "^6.0.0", "react": "^16.2.0", "react-dom": "^16.2.0" }, "devDependencies": { - "@types/jest": "^22.2.2", + "@types/jest": "^23.0.0", "@types/next": "^2.4.8", "@types/react": "^16.0.41", "@types/react-dom": "^16.0.4", "@zeit/next-typescript": "1.0.1", + "babel-core": "^7.0.0-bridge.0", + "babel-jest": "23.0.1", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.1.1", - "jest": "^22.4.3", + "jest": "^23.1.0", "react-addons-test-utils": "^15.6.2", "react-test-renderer": "^16.2.0", - "ts-jest": "^22.4.2", "typescript": "^2.7.2" } }