Merge branch 'master' into issue/accessibility

.github/workflows/release-build.yml

@@ -0,0 +1,38 @@
+name: Widget Release Build
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+     - 'v[0-9]+.[0-9]+.[0-9]+'
+     - 'v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
+     - 'v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+'
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.13.0]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Test and build with node ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Setup GIT user
+      uses: fregante/setup-git-user@v1
+
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+
+    - name: Upload Release .wigt
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: build/_output/*
+        tag: ${{ github.ref }}
+        overwrite: true
+        file_glob: true

.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Run Tests
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.13.0]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Run tests with Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+
+    - name: Setup GIT user
+      uses: fregante/setup-git-user@v1
+
+    - name: Run tests with Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install -g yarn
+    - run: yarn install
+    - run: yarn test-ci
+    - run: yarn build

package.json

@@ -3,18 +3,18 @@
   "materia": {
     "cleanName": "flash-cards"
   },
-  "version": "1.1.3",
+  "version": "1.1.4",
   "scripts": {
-    "start": "webpack-dev-server",
-    "build-dev": "webpack",
-    "build": "webpack -p",
+    "start": "mwdk-start",
+    "build": "mwdk-build-prod",
+    "build-dev": "mwdk-build-dev",
     "test": "echo 'tests not implemented'",
     "test-ci": "echo 'tests not implemented'"
   },
   "dependencies": {
     "hammerjs": "2.0.6",
     "konami": "^1.6.2",
-    "materia-widget-development-kit": "^2.5.0",
+    "materia-widget-development-kit": "~3.0.0",
     "modernizr-webpack-plugin": "^1.0.7"
   },
   "license": "AGPL-3.0",

webpack.config.js

@@ -1,6 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const outputPath = path.join(process.cwd(), 'build')
+const srcPath = path.join(__dirname, 'src') + path.sep
 
 const widgetWebpack = require('materia-widget-development-kit/webpack-widget')
 const copy = widgetWebpack.getDefaultCopyList()
@@ -23,37 +24,17 @@ const customCopy = copy.concat([
 ])
 
 const entries = {
-	'creator.js': [
-		path.join(__dirname, 'src', 'creator.coffee')
-	],
-	'player.js': [
-		path.join(__dirname, 'src', 'player.coffee')
-	],
-	'creator.css': [
-		path.join(__dirname, 'src', 'creator.html'),
-		path.join(__dirname, 'src', 'creator.scss')
-	],
-	'player.css': [
-		path.join(__dirname, 'src', 'player.html'),
-		path.join(__dirname, 'src', 'player.scss')
-	],
-	'assets/js/atari.js': [
-		path.join(__dirname, 'src', 'atari.coffee')
-	],
-	'assets/css/atari.css': [
-		path.join(__dirname, 'src', 'atari.scss')
-	],
-	'assets/css/IE.css': [
-		path.join(__dirname, 'src', 'IE.scss')
-	],
-	'guides/guideStyles.css': [
-		path.join(__dirname, 'src', '_guides', 'guideStyles.scss')
-	],
-	'guides/player.temp.html': [
-		path.join(__dirname, 'src', '_guides', 'player.md')
-	],
-	'guides/creator.temp.html': [
-		path.join(__dirname, 'src', '_guides', 'creator.md')
+	'creator': [
+		path.join(srcPath, 'creator.html'),
+		path.join(srcPath, 'creator.coffee'),
+		path.join(srcPath, 'creator.scss'),
+	],
+	'player': [
+		path.join(srcPath, 'player.html'),
+		path.join(srcPath, 'player.coffee'),
+		path.join(srcPath, 'atari.coffee'),
+		path.join(srcPath, 'player.scss'),
+		path.join(srcPath, 'atari.scss')
 	]
 }