Merge branch 'master' into dev/calendar

.github/workflows/lint.yml

@@ -0,0 +1,26 @@
+name: Lint
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install
+      run: npm ci
+    - name: Run linting
+      run: make lint

.github/workflows/nodejs.yml

@@ -31,8 +31,6 @@ jobs:
       run: npm run build
     - name: Run tests
       run: npm test
-    - name: Run linting
-      run: make lint
     - name: Serve webui
       run: npm run serve &
     - name: Run e2e tests with testcafe

.prettierrc.yml

@@ -2,3 +2,5 @@ singleQuote: true
 trailingComma: 'es5'
 tabWidth: 2
 printWidth: 100
+arrowParens: "avoid"
+endOfLine: "lf"

Makefile

@@ -2,8 +2,17 @@
 
 .FORCE: ;
 
+# This is to disable check for new release in aw-webui for aw-android
+ifdef ON_ANDROID
+# The following flag will pass --android as a command line argument to vue-cli-service
+# https://docs.npmjs.com/cli/run-script
+androidflag := -- --os=android
+else
+androidflag :=
+endif
+
 build: install
-	npm run build
+	npm run build ${androidflag}
 
 install:
 	npm ci
@@ -12,7 +21,7 @@ uninstall:
 	rm -r node_modules/
 
 dev:
-	npm run serve
+	npm run serve ${androidflag}
 
 test:
 	npm test
@@ -24,7 +33,7 @@ clean:
 	rm -rf node_modules dist
 
 lint:
-	npx eslint --ext=js,ts,vue src/
+	npx eslint --ext=js,ts,vue --max-warnings=0 src/
 
 lint-fix:
 	npx eslint --ext=js,ts,vue --fix src/

babel.config.js

@@ -1,6 +1,7 @@
 module.exports = {
   // TODO: We should try to switch to the @vue/app preset, but right now it breaks everything
   //presets: ['@vue/app'],
+  presets: ['@vue/cli-plugin-babel/preset'],
   plugins: ['lodash', '@babel/plugin-syntax-dynamic-import'],
   comments: false,
 };

jest.config.js

@@ -1,4 +1,31 @@
+// Tests can be added in the aw-webui/test folder
+// File names that end with .test.js will be run in the jsdom testEnvironment
+// File names that end with .test.node.js will be run in the node testEnvironment
+
 module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-};
+  projects: [
+    {
+      displayName: 'jsdom',
+      preset: '@vue/cli-plugin-unit-jest',
+      testEnvironment: 'jsdom',
+      transform: {
+        '^.+\\.js$': 'babel-jest',
+        '^.+\\.vue$': 'vue-jest'
+      },
+      testMatch: ['**/test/**/*.test.js?(x)'],
+      moduleNameMapper: {
+        '^~/(.+)$': '<rootDir>/src/$1',
+      },
+      modulePathIgnorePatterns: ['test/e2e/screenshot.test.js'] // Don't run this file in npm test
+    },
+    {
+      displayName: 'node',
+      preset: 'ts-jest',
+      testEnvironment: 'node',
+      testMatch: ['**/test/**/*.test.node.js?(x)'],
+      moduleNameMapper: {
+        '^~/(.+)$': '<rootDir>/src/$1',
+      }
+    }
+  ]
+};