Skip to content

Commit 223ee43

Browse files
author
brizental
committed
Fix issues this PR causes with CI
1 parent ba8bae6 commit 223ee43

File tree

6 files changed

+27
-2
lines changed

6 files changed

+27
-2
lines changed

bin/build-size-check.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ npm run build:webext
1616
webext_size=$(wc -c ./dist/glean.js | awk '{print $1}')
1717
webext_size_pretty=$(wc -c ./dist/glean.js | awk '{printf "%0.2f\n",$1/1024"."substr($2,1,2)}')
1818

19-
git checkout -b original-main origin/main
19+
git branch -f original-main origin/main
20+
# TODO: This is done in case there were changes to the package.json,
21+
# we should find a better way to deal with that though.
22+
git reset --hard HEAD
23+
git checkout original-main
2024

2125
npm install
2226

package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"ts-mocha": "^8.0.0",
4343
"ts-node": "^9.0.0",
4444
"typescript": "^4.0.5",
45+
"web-ext-types": "^3.2.1",
4546
"webpack": "^5.4.0",
4647
"webpack-cli": "^4.2.0"
4748
}

src/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import StorageWeak from "storage/weak";
99
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1010
import StoragePersistent from "storage/persistent";
1111

12+
console.log(
13+
StorageWeak,
14+
StoragePersistent
15+
);
1216

1317
export = {
1418
/**

webpack.config.qt.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,21 @@
44

55
"use strict";
66

7+
const path = require("path");
8+
79
const baseConfig = require("./webpack.config.shared");
810

911
module.exports = {
1012
...baseConfig,
1113
output: {
1214
...baseConfig.output,
1315
libraryTarget: "var",
16+
},
17+
resolve: {
18+
...baseConfig.resolve,
19+
alias: {
20+
// TODO: This is temporary until we actually have a persistent storage impl for Qt.
21+
"storage/persistent": path.resolve(__dirname, "src/storage/weak"),
22+
}
1423
}
1524
};

webpack.config.shared.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ module.exports = {
1313
rules: [
1414
{
1515
test: /\.tsx?$/,
16-
use: "ts-loader",
16+
loader: "ts-loader",
1717
exclude: /node_modules/,
18+
options: { onlyCompileBundledFiles: true }
1819
},
1920
],
2021
},

0 commit comments

Comments
 (0)