Skip to content

Commit 55ae6d1

Browse files
Merge branch 'main' into chore/RMET-4678/up-gradle-dep
2 parents 4dc76cc + 253d2d5 commit 55ae6d1

File tree

19 files changed

+2805
-2314
lines changed

19 files changed

+2805
-2314
lines changed

example-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@
4747
"vitest": "^0.34.6"
4848
},
4949
"description": "An Ionic project"
50-
}
50+
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"publish:latest": "lerna publish --conventional-commits --dist-tag latest --force-publish --no-verify-access --yes"
1313
},
1414
"devDependencies": {
15-
"@types/node": "^20.11.25",
16-
"husky": "^9.0.1",
17-
"lerna": "^8.1.2",
18-
"typescript": "^5.4.2"
15+
"@types/node": "^24.10.1",
16+
"husky": "^9.1.7",
17+
"lerna": "^9.0.1",
18+
"typescript": "^5.9.3"
1919
},
2020
"engines": {
2121
"node": ">=20",

plugin/.eslintignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

plugin/.eslintrc.json

Lines changed: 0 additions & 39 deletions
This file was deleted.

plugin/.prettierignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

plugin/.prettierrc

Lines changed: 0 additions & 29 deletions
This file was deleted.

plugin/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Defines the options for configuring a barcode scan.
147147

148148
| Members | Value |
149149
| ----------- | -------------------- |
150-
| **`ZXING`** | <code>'zxing'</code> |
151-
| **`MLKIT`** | <code>'mlkit'</code> |
150+
| **`ZXING`** | <code>"zxing"</code> |
151+
| **`MLKIT`** | <code>"mlkit"</code> |
152152

153153
</docgen-api>

plugin/android/src/androidTest/java/com/getcapacitor/android/ExampleInstrumentedTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
@RunWith(AndroidJUnit4.class)
1717
public class ExampleInstrumentedTest {
1818

19-
@Test
20-
public void useAppContext() throws Exception {
21-
// Context of the app under test.
22-
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
19+
@Test
20+
public void useAppContext() throws Exception {
21+
// Context of the app under test.
22+
Context appContext =
23+
InstrumentationRegistry.getInstrumentation().getTargetContext();
2324

24-
assertEquals("com.getcapacitor.android", appContext.getPackageName());
25-
}
25+
assertEquals("com.getcapacitor.android", appContext.getPackageName());
26+
}
2627
}

plugin/android/src/test/java/com/getcapacitor/ExampleUnitTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
*/
1212
public class ExampleUnitTest {
1313

14-
@Test
15-
public void addition_isCorrect() throws Exception {
16-
assertEquals(4, 2 + 2);
17-
}
14+
@Test
15+
public void addition_isCorrect() throws Exception {
16+
assertEquals(4, 2 + 2);
17+
}
1818
}

plugin/eslint.config.cjs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
const eslintjs = require('@eslint/js');
2+
const tseslint = require('@typescript-eslint/eslint-plugin');
3+
const tseslintparser = require('@typescript-eslint/parser');
4+
const prettierConfig = require('eslint-config-prettier');
5+
6+
module.exports = [
7+
{
8+
ignores: ['node_modules/**', 'dist/**', 'build/**', 'types/**', 'android/**', 'ios/**', 'eslint.config.*'],
9+
},
10+
eslintjs.configs.recommended,
11+
{
12+
files: ['**/*.ts', '**/*.js'],
13+
languageOptions: {
14+
parser: tseslintparser,
15+
ecmaVersion: 'latest',
16+
sourceType: 'module',
17+
globals: {
18+
browser: 'readonly',
19+
window: 'readonly',
20+
document: 'readonly',
21+
console: 'readonly',
22+
HTMLStyleElement: 'readonly',
23+
atob: 'readonly',
24+
btoa: 'readonly',
25+
Blob: 'readonly',
26+
FileReader: 'readonly',
27+
capacitorExports: 'readonly',
28+
html5Qrcode: 'readonly',
29+
exports: 'readonly',
30+
},
31+
},
32+
plugins: {
33+
'@typescript-eslint': tseslint,
34+
},
35+
rules: {
36+
...tseslint.configs.recommended.rules,
37+
'@typescript-eslint/no-explicit-any': 'off',
38+
'no-redeclare': 'off',
39+
indent: ['error', 2],
40+
'linebreak-style': ['error', 'unix'],
41+
quotes: ['error', 'single'],
42+
semi: ['error', 'always'],
43+
},
44+
},
45+
prettierConfig,
46+
];
47+

0 commit comments

Comments
 (0)