Skip to content

Commit 77be89f

Browse files
vlad-dargelvlad-dargel
committed
merge main
2 parents c178df4 + 0396da8 commit 77be89f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1124
-2401
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apk update && apk add --no-cache --virtual .gyp \
1818
WORKDIR /usr/src/app
1919

2020
# restore node_modules for front-end
21-
COPY package.json yarn.lock babel.config.cjs tsconfig.json ./
21+
COPY package.json yarn.lock tsconfig.json ./
2222
RUN SKIP_POSTINSTALL=1 yarn install
2323

2424
# prepare backend by copying scripts/configs and installing node modules

‎babel.config.cjs‎

Lines changed: 4 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,13 @@
11
/* eslint global-require: off, import/no-extraneous-dependencies: off */
2-
3-
const developmentEnv = ['development', 'test'];
4-
5-
const developmentPlugins = [
6-
require('@babel/plugin-transform-runtime'),
7-
];
8-
9-
const productionPlugins = [
10-
require('babel-plugin-dev-expression'),
11-
require('@babel/plugin-transform-react-constant-elements'),
12-
require('@babel/plugin-transform-react-inline-elements'),
13-
require('babel-plugin-transform-react-remove-prop-types'),
14-
];
15-
2+
const developmentEnv = ['development', 'test']
163
module.exports = (api) => {
17-
const development = api.env(developmentEnv);
4+
const development = api.env(developmentEnv)
185

196
return {
207
presets: [
218
require('@babel/preset-env'),
229
require('@babel/preset-typescript'),
2310
[require('@babel/preset-react'), { development }],
2411
],
25-
plugins: [
26-
// Stage 0
27-
require('@babel/plugin-proposal-function-bind'),
28-
29-
// Stage 1
30-
require('@babel/plugin-proposal-export-default-from'),
31-
require('@babel/plugin-proposal-logical-assignment-operators'),
32-
[require('@babel/plugin-proposal-optional-chaining'), { loose: false }],
33-
[require('@babel/plugin-proposal-pipeline-operator'), { proposal: 'minimal' }],
34-
[require('@babel/plugin-proposal-nullish-coalescing-operator'), { loose: false }],
35-
require('@babel/plugin-proposal-do-expressions'),
36-
37-
// Stage 2
38-
[require('@babel/plugin-proposal-decorators'), { legacy: true }],
39-
require('babel-plugin-parameter-decorator'),
40-
require('@babel/plugin-proposal-function-sent'),
41-
require('@babel/plugin-proposal-export-namespace-from'),
42-
require('@babel/plugin-proposal-numeric-separator'),
43-
require('@babel/plugin-proposal-throw-expressions'),
44-
45-
// Stage 3
46-
require('@babel/plugin-syntax-dynamic-import'),
47-
require('@babel/plugin-syntax-import-meta'),
48-
[require('@babel/plugin-proposal-class-properties'), { loose: true }],
49-
require('@babel/plugin-proposal-json-strings'),
50-
[require('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
51-
[require('@babel/plugin-proposal-private-methods'), { loose: true }],
52-
53-
...(development ? developmentPlugins : productionPlugins),
54-
],
55-
};
56-
};
12+
}
13+
}

‎configs/webpack.config.base.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,17 @@ const configuration: webpack.Configuration = {
1313
{
1414
test: /\.tsx?$/,
1515
exclude: /node_modules/,
16-
use: {
17-
loader: 'babel-loader',
18-
options: {
19-
cacheDirectory: true,
16+
use: [
17+
{
18+
loader: 'ts-loader',
19+
options: {
20+
transpileOnly: true,
21+
compilerOptions: {
22+
module: 'esnext',
23+
},
24+
},
2025
},
21-
},
26+
]
2227
},
2328
],
2429
},

‎configs/webpack.config.eslint.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// eslint-disable-next-line import/no-self-import
22
/* eslint import/no-unresolved: off, import/no-self-import: off */
3-
require('@babel/register');
43

54
module.exports = require('./webpack.config.renderer.dev').default;

‎configs/webpack.config.renderer.dev.dll.ts‎

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,90 @@ export default merge(baseConfig, {
2424
/**
2525
* Use `module` from `webpack.config.renderer.dev.js`
2626
*/
27-
module: require('./webpack.config.renderer.dev').default.module,
27+
module: {
28+
rules: [
29+
{
30+
test: /\.css$/,
31+
use: ['style-loader', 'css-loader'],
32+
},
33+
34+
// TTF Font
35+
{
36+
test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
37+
exclude: /codicon\.ttf(\?v=\d+\.\d+\.\d+)?$/,
38+
use: [
39+
{
40+
loader: 'file-loader',
41+
options: {
42+
name: '[hash]-[name].[ext]',
43+
outputPath: 'fonts',
44+
publicPath: 'fonts',
45+
},
46+
},
47+
],
48+
},
49+
// TTF codicon font
50+
{
51+
test: /codicon\.ttf(\?v=\d+\.\d+\.\d+)?$/,
52+
use: 'url-loader',
53+
},
54+
55+
// TODO remove after regression
56+
// // WOFF Font
57+
// {
58+
// test: /\.woff(\?v=\d+\.\d+\.\d+)?$/,
59+
// use: {
60+
// loader: 'url-loader',
61+
// options: {
62+
// limit: 10000,
63+
// mimetype: 'application/font-woff',
64+
// },
65+
// },
66+
// },
67+
// // WOFF2 Font
68+
// {
69+
// test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/,
70+
// use: [
71+
// {
72+
// loader: 'file-loader',
73+
// options: {
74+
// name: '[hash]-[name].[ext]',
75+
// outputPath: 'fonts',
76+
// publicPath: 'fonts',
77+
// },
78+
// },
79+
// ],
80+
// },
81+
// // OTF Font
82+
// {
83+
// test: /\.otf(\?v=\d+\.\d+\.\d+)?$/,
84+
// use: [
85+
// {
86+
// loader: 'file-loader',
87+
// options: {
88+
// name: '[hash]-[name].[ext]',
89+
// outputPath: 'fonts',
90+
// publicPath: 'fonts',
91+
// },
92+
// },
93+
// ],
94+
// },
95+
// // EOT Font
96+
// {
97+
// test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
98+
// use: 'file-loader',
99+
// },
100+
// {
101+
// test: /\.svg$/,
102+
// use: ['@svgr/webpack', 'url-loader'],
103+
// },
104+
// // Common Image Formats
105+
// {
106+
// test: /\.(?:ico|gif|png|jpg|jpeg|webp)$/,
107+
// use: 'url-loader',
108+
// },
109+
],
110+
},
28111

29112
entry: {
30113
renderer: [...Object.keys(dependencies || {}), ...Object.keys(dependenciesApi || {})],

0 commit comments

Comments
 (0)