Skip to content

Commit 875da47

Browse files
committed
chore: upgrade to ts4 and buble to babel
1 parent 42f7ff3 commit 875da47

File tree

14 files changed

+1035
-105
lines changed

14 files changed

+1035
-105
lines changed

babel.config.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module.exports = {
2+
root: true,
3+
presets: [
4+
[
5+
'@babel/env', {
6+
modules: false,
7+
},
8+
],
9+
],
10+
}

packages/api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"devDependencies": {
3333
"@types/node": "^13.9.1",
3434
"@types/webpack-env": "^1.15.1",
35-
"typescript": "^3.8.3"
35+
"typescript": "^4.5.2"
3636
}
3737
}

packages/app-backend-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"devDependencies": {
1717
"@types/node": "^13.9.1",
1818
"@types/webpack-env": "^1.15.1",
19-
"typescript": "^3.8.3"
19+
"typescript": "^4.5.2"
2020
}
2121
}

packages/app-backend-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"devDependencies": {
2323
"@types/node": "^13.9.1",
2424
"@types/webpack-env": "^1.15.1",
25-
"typescript": "^3.8.3"
25+
"typescript": "^4.5.2"
2626
}
2727
}

packages/app-backend-vue1/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"devDependencies": {
1717
"@types/node": "^13.9.1",
1818
"@types/webpack-env": "^1.15.1",
19-
"typescript": "^3.8.3"
19+
"typescript": "^4.5.2"
2020
}
2121
}

packages/app-backend-vue2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
"devDependencies": {
1919
"@types/node": "^13.9.1",
2020
"@types/webpack-env": "^1.15.1",
21-
"typescript": "^3.8.3"
21+
"typescript": "^4.5.2"
2222
}
2323
}

packages/app-backend-vue3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"devDependencies": {
1818
"@types/node": "^13.9.1",
1919
"@types/webpack-env": "^1.15.1",
20-
"typescript": "^3.8.3"
20+
"typescript": "^4.5.2"
2121
}
2222
}

packages/build-tools/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
"private": true,
55
"main": "src/index.js",
66
"dependencies": {
7-
"buble": "^0.20.0",
8-
"buble-loader": "^0.5.1",
7+
"@babel/core": "^7.16.0",
8+
"@babel/preset-env": "^7.16.4",
9+
"babel-loader": "^8.2.3",
910
"css-loader": "^5.2.4",
1011
"esbuild": "^0.11.20",
1112
"esbuild-loader": "^2.13.0",

packages/build-tools/src/createConfig.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,7 @@ exports.createConfig = (config, target = { chrome: 52, firefox: 48 }) => {
2929
{
3030
test: /\.js$/,
3131
exclude: /node_modules|vue\/dist|vuex\/dist/,
32-
loader: 'buble-loader',
33-
options: {
34-
target,
35-
objectAssign: 'Object.assign',
36-
transforms: {
37-
modules: false,
38-
asyncAwait: false,
39-
forOf: false,
40-
},
41-
},
32+
loader: 'babel-loader',
4233
},
4334
{
4435
test: /\.ts$/,

packages/shared-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"devDependencies": {
1717
"@types/node": "^13.9.1",
1818
"@types/webpack-env": "^1.15.1",
19-
"typescript": "^3.8.3"
19+
"typescript": "^4.5.2"
2020
}
2121
}

packages/shared-utils/src/shared-data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export interface SharedDataParams {
7373

7474
const initCbs = []
7575

76-
export function initSharedData (params: SharedDataParams) {
76+
export function initSharedData (params: SharedDataParams): Promise<void> {
7777
return new Promise((resolve) => {
7878
// Mandatory params
7979
bridge = params.bridge

packages/shared-utils/src/storage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const useStorage = typeof target.chrome !== 'undefined' && typeof target.chrome.
77

88
let storageData = null
99

10-
export function initStorage () {
10+
export function initStorage (): Promise<void> {
1111
return new Promise((resolve) => {
1212
if (useStorage) {
1313
target.chrome.storage.local.get(null, result => {

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"webpack-env",
2121
],
2222
"allowJs": true,
23+
"target": "ES2019",
2324
// Strict
2425
"noImplicitAny": false,
2526
"noImplicitThis": true,

0 commit comments

Comments
 (0)