Unverified Commit e0531e30 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Add support for legacy decorators through tsconfig/jsconfig (#31376)

parent ae1cee59
...@@ -24,6 +24,7 @@ packages/next-codemod/**/*.d.ts ...@@ -24,6 +24,7 @@ packages/next-codemod/**/*.d.ts
packages/next-env/**/*.d.ts packages/next-env/**/*.d.ts
packages/create-next-app/templates/** packages/create-next-app/templates/**
test/integration/eslint/** test/integration/eslint/**
test/development/basic/legacy-decorators/**/*
test-timings.json test-timings.json
packages/next/build/swc/tests/** packages/next/build/swc/tests/**
bench/nested-deps/pages/** bench/nested-deps/pages/**
......
...@@ -2,7 +2,7 @@ import { loadEnvConfig } from '@next/env' ...@@ -2,7 +2,7 @@ import { loadEnvConfig } from '@next/env'
import { resolve, join } from 'path' import { resolve, join } from 'path'
import loadConfig from '../../server/config' import loadConfig from '../../server/config'
import { PHASE_TEST } from '../../shared/lib/constants' import { PHASE_TEST } from '../../shared/lib/constants'
// import loadJsConfig from '../load-jsconfig' import loadJsConfig from '../load-jsconfig'
import * as Log from '../output/log' import * as Log from '../output/log'
async function getConfig(dir: string) { async function getConfig(dir: string) {
...@@ -51,7 +51,7 @@ export default function nextJest(options: { dir?: string } = {}) { ...@@ -51,7 +51,7 @@ export default function nextJest(options: { dir?: string } = {}) {
// Will be called and awaited by Jest // Will be called and awaited by Jest
return async () => { return async () => {
let nextConfig let nextConfig
let paths let jsConfig
let resolvedBaseUrl let resolvedBaseUrl
let isEsmProject = false let isEsmProject = false
if (options.dir) { if (options.dir) {
...@@ -62,9 +62,9 @@ export default function nextJest(options: { dir?: string } = {}) { ...@@ -62,9 +62,9 @@ export default function nextJest(options: { dir?: string } = {}) {
nextConfig = await getConfig(resolvedDir) nextConfig = await getConfig(resolvedDir)
loadEnvConfig(resolvedDir, false, Log) loadEnvConfig(resolvedDir, false, Log)
// TODO: revisit when bug in SWC is fixed that strips `.css` // TODO: revisit when bug in SWC is fixed that strips `.css`
// const result = await loadJsConfig(resolvedDir, nextConfig) const result = await loadJsConfig(resolvedDir, nextConfig)
// paths = result?.jsConfig?.compilerOptions?.paths jsConfig = result.jsConfig
// resolvedBaseUrl = result.resolvedBaseUrl resolvedBaseUrl = result.resolvedBaseUrl
} }
// Ensure provided async config is supported // Ensure provided async config is supported
const resolvedJestConfig = const resolvedJestConfig =
...@@ -107,10 +107,9 @@ export default function nextJest(options: { dir?: string } = {}) { ...@@ -107,10 +107,9 @@ export default function nextJest(options: { dir?: string } = {}) {
'^.+\\.(js|jsx|ts|tsx)$': [ '^.+\\.(js|jsx|ts|tsx)$': [
require.resolve('../swc/jest-transformer'), require.resolve('../swc/jest-transformer'),
{ {
styledComponents: nextConfig,
nextConfig && nextConfig.experimental.styledComponents, jsConfig,
paths, resolvedBaseUrl,
resolvedBaseUrl: resolvedBaseUrl,
isEsmProject, isEsmProject,
}, },
], ],
......
...@@ -48,9 +48,9 @@ module.exports = { ...@@ -48,9 +48,9 @@ module.exports = {
isServer: isServer:
jestConfig.testEnvironment && jestConfig.testEnvironment === 'node', jestConfig.testEnvironment && jestConfig.testEnvironment === 'node',
filename, filename,
styledComponents: inputOptions.styledComponents, nextConfig: inputOptions.nextConfig,
paths: inputOptions.paths, jsConfig: inputOptions.jsConfig,
baseUrl: inputOptions.resolvedBaseUrl, resolvedBaseUrl: inputOptions.resolvedBaseUrl,
esm: esm:
isSupportEsm && isSupportEsm &&
isEsm(Boolean(inputOptions.isEsmProject), filename, jestConfig), isEsm(Boolean(inputOptions.isEsmProject), filename, jestConfig),
......
...@@ -6,32 +6,36 @@ function getBaseSWCOptions({ ...@@ -6,32 +6,36 @@ function getBaseSWCOptions({
development, development,
hasReactRefresh, hasReactRefresh,
globalWindow, globalWindow,
styledComponents, nextConfig,
paths, resolvedBaseUrl,
baseUrl, jsConfig,
importSource,
}) { }) {
const isTSFile = filename.endsWith('.ts') const isTSFile = filename.endsWith('.ts')
const isTypeScript = isTSFile || filename.endsWith('.tsx') const isTypeScript = isTSFile || filename.endsWith('.tsx')
const paths = jsConfig?.compilerOptions?.paths
const enableDecorators = Boolean(
jsConfig?.compilerOptions?.experimentalDecorators
)
return { return {
jsc: { jsc: {
...(baseUrl && paths ...(resolvedBaseUrl && paths
? { ? {
baseUrl, baseUrl: resolvedBaseUrl,
paths, paths,
} }
: {}), : {}),
parser: { parser: {
syntax: isTypeScript ? 'typescript' : 'ecmascript', syntax: isTypeScript ? 'typescript' : 'ecmascript',
dynamicImport: true, dynamicImport: true,
decorators: enableDecorators,
// Exclude regular TypeScript files from React transformation to prevent e.g. generic parameters and angle-bracket type assertion from being interpreted as JSX tags. // Exclude regular TypeScript files from React transformation to prevent e.g. generic parameters and angle-bracket type assertion from being interpreted as JSX tags.
[isTypeScript ? 'tsx' : 'jsx']: isTSFile ? false : true, [isTypeScript ? 'tsx' : 'jsx']: isTSFile ? false : true,
}, },
transform: { transform: {
legacyDecorator: enableDecorators,
react: { react: {
importSource: importSource || 'react', importSource: jsConfig?.compilerOptions?.jsxImportSource || 'react',
runtime: 'automatic', runtime: 'automatic',
pragma: 'React.createElement', pragma: 'React.createElement',
pragmaFrag: 'React.Fragment', pragmaFrag: 'React.Fragment',
...@@ -57,7 +61,7 @@ function getBaseSWCOptions({ ...@@ -57,7 +61,7 @@ function getBaseSWCOptions({
}, },
}, },
}, },
styledComponents: styledComponents styledComponents: nextConfig?.experimental?.styledComponents
? { ? {
displayName: Boolean(development), displayName: Boolean(development),
} }
...@@ -69,18 +73,19 @@ export function getJestSWCOptions({ ...@@ -69,18 +73,19 @@ export function getJestSWCOptions({
isServer, isServer,
filename, filename,
esm, esm,
styledComponents, nextConfig,
paths, jsConfig,
baseUrl, // This is not passed yet as "paths" resolving needs a test first
// resolvedBaseUrl,
}) { }) {
let baseOptions = getBaseSWCOptions({ let baseOptions = getBaseSWCOptions({
filename, filename,
development: false, development: false,
hasReactRefresh: false, hasReactRefresh: false,
globalWindow: !isServer, globalWindow: !isServer,
styledComponents, nextConfig,
paths, jsConfig,
baseUrl, // resolvedBaseUrl,
}) })
const isNextDist = nextDistPath.test(filename) const isNextDist = nextDistPath.test(filename)
...@@ -108,16 +113,19 @@ export function getLoaderSWCOptions({ ...@@ -108,16 +113,19 @@ export function getLoaderSWCOptions({
pagesDir, pagesDir,
isPageFile, isPageFile,
hasReactRefresh, hasReactRefresh,
styledComponents, nextConfig,
importSource, jsConfig,
// This is not passed yet as "paths" resolving is handled by webpack currently.
// resolvedBaseUrl,
}) { }) {
let baseOptions = getBaseSWCOptions({ let baseOptions = getBaseSWCOptions({
filename, filename,
development, development,
globalWindow: !isServer, globalWindow: !isServer,
hasReactRefresh, hasReactRefresh,
styledComponents, nextConfig,
importSource, jsConfig,
// resolvedBaseUrl,
}) })
const isNextDist = nextDistPath.test(filename) const isNextDist = nextDistPath.test(filename)
......
...@@ -441,8 +441,8 @@ export default async function getBaseWebpackConfig( ...@@ -441,8 +441,8 @@ export default async function getBaseWebpackConfig(
isServer: isMiddleware || isServer, isServer: isMiddleware || isServer,
pagesDir, pagesDir,
hasReactRefresh: !isMiddleware && hasReactRefresh, hasReactRefresh: !isMiddleware && hasReactRefresh,
styledComponents: config.experimental.styledComponents, nextConfig: config,
importSource: jsConfig?.compilerOptions?.jsxImportSource, jsConfig,
}, },
} }
: { : {
......
...@@ -35,13 +35,8 @@ async function loaderTransform(parentTrace, source, inputSourceMap) { ...@@ -35,13 +35,8 @@ async function loaderTransform(parentTrace, source, inputSourceMap) {
let loaderOptions = this.getOptions() || {} let loaderOptions = this.getOptions() || {}
const { const { isServer, pagesDir, hasReactRefresh, nextConfig, jsConfig } =
isServer, loaderOptions
pagesDir,
hasReactRefresh,
styledComponents,
importSource,
} = loaderOptions
const isPageFile = filename.startsWith(pagesDir) const isPageFile = filename.startsWith(pagesDir)
const swcOptions = getLoaderSWCOptions({ const swcOptions = getLoaderSWCOptions({
...@@ -51,8 +46,8 @@ async function loaderTransform(parentTrace, source, inputSourceMap) { ...@@ -51,8 +46,8 @@ async function loaderTransform(parentTrace, source, inputSourceMap) {
isPageFile, isPageFile,
development: this.mode === 'development', development: this.mode === 'development',
hasReactRefresh, hasReactRefresh,
styledComponents, nextConfig,
importSource, jsConfig,
}) })
const programmaticOptions = { const programmaticOptions = {
......
import { join } from 'path'
import webdriver from 'next-webdriver'
import { createNext, FileRef } from 'e2e-utils'
import { NextInstance } from 'test/lib/next-modes/base'
import { check } from 'next-test-utils'
describe('Legacy decorators SWC option', () => {
let next: NextInstance
beforeAll(async () => {
next = await createNext({
files: {
'jsconfig.json': new FileRef(
join(__dirname, 'legacy-decorators/jsconfig.json')
),
pages: new FileRef(join(__dirname, 'legacy-decorators/pages')),
},
dependencies: {
mobx: '6.3.7',
'mobx-react': '7.2.1',
},
})
})
afterAll(() => next.destroy())
it('should compile with legacy decorators enabled', async () => {
let browser
try {
browser = await webdriver(next.appPort, '/')
const text = await browser.elementByCss('#count').text()
expect(text).toBe('Current number: 0')
await browser.elementByCss('#increase').click()
await check(
() => browser.elementByCss('#count').text(),
/Current number: 1/
)
} finally {
if (browser) {
await browser.close()
}
}
})
})
{
"compilerOptions": {
"experimentalDecorators": true
}
}
import React from 'react'
import { makeAutoObservable } from 'mobx'
import { observer } from 'mobx-react'
class Counter {
count = 0
constructor() {
makeAutoObservable(this)
}
increase() {
this.count += 1
}
}
const myCounter = new Counter()
@observer
class CounterView extends React.Component {
render() {
return (
<>
<span id="count">Current number: {this.props.counter.count}</span>
<button id="increase" onClick={() => this.props.counter.increase()}>
Increase
</button>
</>
)
}
}
export default function Home() {
return <CounterView counter={myCounter} />
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment