Skip to content

Commit

Permalink
Revert file formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
martpie committed Apr 3, 2020
1 parent 96d6a78 commit 4a2525f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions jest-puppeteer.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ module.exports = {
launch: {
headless: true,
slowMo: false,
devtools: true,
devtools: true
},
server: [
{
command: `npm run build --prefix=${localModuleAppPath} && npm run start --prefix=${localModuleAppPath}`,
launchTimeout: 50000,
port: 3000,
},
],
port: 3000
}
]
};
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ module.exports = {
globalTeardown: 'jest-environment-puppeteer/teardown',
testEnvironment: 'jest-environment-puppeteer',
testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node']
};
8 changes: 4 additions & 4 deletions src/next-transpile-modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ const regexEqual = (x, y) => {
const generateIncludes = (modules) => {
return [
new RegExp(`(${modules.map(safePath).join('|')})$`),
new RegExp(`(${modules.map(safePath).join('|')})${PATH_DELIMITER}(?!.*node_modules)`),
new RegExp(`(${modules.map(safePath).join('|')})${PATH_DELIMITER}(?!.*node_modules)`)
];
};

const generateExcludes = (modules) => {
return [
new RegExp(
`node_modules${PATH_DELIMITER}(?!(${modules.map(safePath).join('|')})(${PATH_DELIMITER}|$)(?!.*node_modules))`
),
)
];
};

Expand Down Expand Up @@ -81,7 +81,7 @@ const withTmInitializer = (transpileModules = []) => {
config.module.rules.push({
test: /\.+(js|jsx|mjs|ts|tsx)$/,
loader: options.defaultLoaders.babel,
include: includes,
include: includes
});

// Support CSS modules + global in node_modules
Expand Down Expand Up @@ -163,7 +163,7 @@ const withTmInitializer = (transpileModules = []) => {
}

return config;
},
}
});
};

Expand Down

0 comments on commit 4a2525f

Please sign in to comment.