Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: fix server tests after Babel update #6196

Merged
merged 4 commits into from May 4, 2021
Merged

test: fix server tests after Babel update #6196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50a141c
test: trying to fix server tests
wentwrong Apr 30, 2021
0b5b93f
return test to the prev state
wentwrong Apr 30, 2021
3d47d1f
load babel libs differently
wentwrong Apr 30, 2021
fc04b70
add linting
wentwrong Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/compiler/babel/load-libs.js
View file
Open in desktop
Expand Up @@ -60,6 +60,8 @@ export default function loadLibs () {
presetEnvForClientFunction: [require('@babel/preset-env'), getPresetEnvForClientFunctionOpts()],
presetEnvForTestCode: [require('@babel/preset-env'), getPresetEnvForTestCodeOpts()],
moduleResolver: [require('babel-plugin-module-resolver'), getModuleResolverOpts()],
presetReact: getPresetReact()
presetReact: getPresetReact(),
proposalPrivateMethods: [require('@babel/plugin-proposal-private-methods'), { loose: true }],
proposalClassProperties: [require('@babel/plugin-proposal-class-properties'), { loose: true }]
};
}
6 changes: 4 additions & 2 deletions src/compiler/test-file/formats/es-next/compiler.js
View file
Open in desktop
Expand Up @@ -11,12 +11,14 @@ export default class ESNextTestFileCompiler extends APIBasedTestFileCompilerBase
transformRuntime,
presetEnvForTestCode,
presetReact,
moduleResolver
moduleResolver,
proposalPrivateMethods,
proposalClassProperties
} = loadBabelLibs();

const opts = Object.assign({}, BASE_BABEL_OPTIONS, {
presets: [presetStage2, presetEnvForTestCode, presetReact],
plugins: [transformRuntime, moduleResolver],
plugins: [transformRuntime, moduleResolver, proposalPrivateMethods, proposalClassProperties],
sourceMaps: 'inline',
filename
});
Expand Down
4 changes: 2 additions & 2 deletions test/server/compiler-test.js
View file
Open in desktop
Expand Up @@ -968,7 +968,7 @@ describe('Compiler', function () {


message: 'Cannot prepare tests due to an error.\n\n' +
'SyntaxError: ' + testfiles[0] + ': Missing semicolon (1:7)'
'SyntaxError: ' + testfiles[0] + ': Missing semicolon. (1:7)'
}, true);

return compile(testfiles[1]);
Expand All @@ -981,7 +981,7 @@ describe('Compiler', function () {
stackTop: null,

message: 'Cannot prepare tests due to an error.\n\n' +
'SyntaxError: ' + testfiles[1] + ': Missing semicolon (2:7)'
'SyntaxError: ' + testfiles[1] + ': Missing semicolon. (2:7)'
}, true);
});
});
Expand Down