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

Use babel-loader for building #3808

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Use babel-loader for building #3808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions _develop/browsers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
const desktop = {
'mac-chrome-latest': ['macOS 10.15', 'chrome', '80.0'],
'mac-firefox-latest': ['macOS 10.15', 'firefox', '74.0'],
'mac-safari-latest': ['macOS 10.15', 'safari', '13.1'],
'mac-chrome-previous': ['macOS 10.14', 'chrome', '79.0'],
'mac-firefox-previous': ['macOS 10.14', 'firefox', '73.0'],
'mac-safari-previous': ['macOS 10.14', 'safari', '12.0'],
'mac-chrome-latest': ['macOS 12', 'chrome', 'latest'],
'mac-firefox-latest': ['macOS 12', 'firefox', 'latest'],
'mac-safari-latest': ['macOS 12', 'safari', '16'],
'mac-chrome-previous': ['macOS 11', 'chrome', 'latest-1'],
'mac-firefox-previous': ['macOS 11', 'firefox', 'latest-1'],
'mac-safari-previous': ['macOS 11', 'safari', '14'],

'windows-chrome-latest': ['Windows 10', 'chrome', '80.0'],
'windows-firefox-latest': ['Windows 10', 'firefox', '74.0'],
'windows-edge-latest': ['Windows 10', 'microsoftedge', '80.0'],
'windows-chrome-previous': ['Windows 8.1', 'chrome', '79.0'],
'windows-firefox-previous': ['Windows 8.1', 'firefox', '74.0'],
'windows-edge-previous': ['Windows 10', 'microsoftedge', '79.0'],
'windows-chrome-latest': ['Windows 11', 'chrome', 'latest'],
'windows-firefox-latest': ['Windows 11', 'firefox', 'latest'],
'windows-edge-latest': ['Windows 11', 'microsoftedge', 'latest'],
'windows-chrome-previous': ['Windows 10', 'chrome', 'latest-1'],
'windows-firefox-previous': ['Windows 10', 'firefox', 'latest-1'],
'windows-edge-previous': ['Windows 10', 'microsoftedge', 'latest-1'],
};

const mobile = {
'ios-latest': ['iPhone 11 Simulator', 'iOS', '13.2', 'Safari'],
'ios-previous': ['iPhone X Simulator', 'iOS', '12.4', 'Safari'],
'ios-latest': ['iPhone 11 Simulator', 'iOS', '15.5', 'Safari'],
'ios-previous': ['iPhone X Simulator', 'iOS', '14.5', 'Safari'],

'android-latest': ['Android GoogleAPI Emulator', 'Android', '10.0', 'Chrome'],
'android-latest': ['Android GoogleAPI Emulator', 'Android', '13.0', 'Chrome'],
'android-previous': [
'Android GoogleAPI Emulator',
'Android',
'9.0',
'12.0',
'Chrome',
],
};
Expand All @@ -40,7 +40,7 @@ Object.keys(mobile).forEach(key => {
module.exports[key] = {
base: 'SauceLabs',
browserName: mobile[key][3],
appiumVersion: '1.16.0',
appiumVersion: '1.22.3',
deviceName: mobile[key][0],
deviceOrientation: 'portrait',
platformVersion: mobile[key][2],
Expand Down
39 changes: 6 additions & 33 deletions _develop/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,9 @@ const source = [
});

const jsRules = {
test: /\.js$/,
test: /\.(j|t)s$/,
include: source,
use: [
{
loader: 'babel-loader',
options: {
presets: [
[
'@babel/env',
{
targets: {
browsers: [
'last 2 Chrome major versions',
'last 2 Firefox major versions',
'last 2 Safari major versions',
'last 2 Edge major versions',
'last 2 iOS major versions',
'last 2 ChromeAndroid major versions',
],
},
},
],
],
},
},
],
use: ['babel-loader'],
};

const svgRules = {
Expand All @@ -78,11 +55,6 @@ const stylRules = {
use: [MiniCssExtractPlugin.loader, 'css-loader', 'stylus-loader'],
};

const tsRules = {
test: /\.ts$/,
use: [{ loader: 'ts-loader' }],
};

const baseConfig = {
mode: 'development',
context: path.resolve(__dirname, '..'),
Expand All @@ -100,12 +72,13 @@ const baseConfig = {
libraryExport: 'default',
libraryTarget: 'umd',
path: path.resolve(__dirname, '../dist/'),
clean: true,
},
resolve: {
extensions: ['.js', '.styl', '.ts'],
},
module: {
rules: [jsRules, stylRules, svgRules, tsRules],
rules: [jsRules, stylRules, svgRules],
noParse: [
/\/node_modules\/clone\/clone\.js$/,
/\/node_modules\/eventemitter3\/index\.js$/,
Expand Down Expand Up @@ -133,7 +106,7 @@ const baseConfig = {
};

module.exports = env => {
if (env && env.minimize) {
if (env?.minimize) {
const { devServer, ...prodConfig } = baseConfig;
return {
...prodConfig,
Expand All @@ -142,7 +115,7 @@ module.exports = env => {
devtool: 'source-map',
};
}
if (env && env.coverage) {
if (env?.coverage) {
baseConfig.module.rules[0].use[0].options.plugins = ['istanbul'];
return baseConfig;
}
Expand Down
3 changes: 3 additions & 0 deletions babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
presets: ['@babel/preset-env', '@babel/preset-typescript'],
};