Update config

ucfopen · Sep 13, 2023 · 670eda5 · 670eda5
1 parent 1875d98
commit 670eda5
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 45 deletions.
diff --git a/package.json b/package.json
@@ -5,17 +5,17 @@
   },
   "version": "2.0.5",
   "dependencies": {
-    "materia-widget-development-kit": "2.5.2"
+    "materia-widget-development-kit": "../../MWDK4"
   },
   "devDependencies": {
     "angular-mocks": "~1.5.0",
     "jest": "^23.6.0",
     "jest-coffee-preprocessor": "^1.0.0"
   },
   "scripts": {
-    "start": "webpack-dev-server",
-    "build": "webpack -p",
-    "build-dev": "webpack",
+    "start": "mwdk-start",
+    "build": "mwdk-build-prod",
+    "build-dev": "mwdk-build-dev",
     "test": "TZ='America/New_York' jest --verbose",
     "test-ci": "TZ='America/New_York' CI=true jest --ci --useStderr --coverage --coverageReporters text-summary cobertura"
   },

diff --git a/src/controllers/creator.coffee b/src/controllers/creator.coffee
@@ -1,6 +1,5 @@
-Matching = angular.module 'matching', ['ngAnimate']
-
-Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
+angular.module 'matching', ['ngAnimate']
+.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
 	_qset = {}
 	materiaCallbacks = {}
 	# Stores data to be gathered on save.
@@ -176,3 +175,5 @@ Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
 
 	Materia.CreatorCore.start materiaCallbacks
 ]
+
+angular.bootstrap(document, ['matching'])
diff --git a/src/controllers/player.coffee b/src/controllers/player.coffee
@@ -1,6 +1,5 @@
-Matching = angular.module 'matching'
-
-Matching.controller 'matchingPlayerCtrl', ['$scope', '$timeout', '$sce', ($scope, $timeout, $sce) ->
+angular.module 'matching'
+.controller 'matchingPlayerCtrl', ['$scope', '$timeout', '$sce', ($scope, $timeout, $sce) ->
 	materiaCallbacks = {}
 	$scope.title = ''
 
@@ -513,3 +512,5 @@ Matching.controller 'matchingPlayerCtrl', ['$scope', '$timeout', '$sce', ($scope
 
 	Materia.Engine.start materiaCallbacks
 ]
+
+angular.bootstrap(document, ['matching'])
diff --git a/src/creator.html b/src/creator.html
@@ -14,11 +14,8 @@
 		<!-- YOUR PREREQUISITES -->
 		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.9/angular.min.js"></script>
 		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.9/angular-animate.min.js"></script>
-
-		<!-- MAIN CREATOR SCRIPT -->
-		<script src="creator.js"></script>
 	</head>
-	<body ng-app='matching' ng-controller="matchingCreatorCtrl">
+	<body ng-controller="matchingCreatorCtrl">
 		<div id='modal'></div>
 		<div id='header'>
 			<div class='logo'></div>
@@ -214,5 +211,8 @@ <h1>Last Chance Cadet</h1>
 			ng-show='!widget.wordPairs.length && step'>
 			<span>Click here to add your first pair</span>
 		</div>
+
+		<!-- MAIN CREATOR SCRIPT -->
+		<script src="creator.js"></script>
 	</body>
 </html>
diff --git a/src/player.html b/src/player.html
@@ -16,10 +16,8 @@
 
 		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.9/angular.min.js"></script>
 
-		<!-- MAIN PLAYER SCRIPT -->
-		<script src="player.js"></script>
 	</head>
-	<body ng-app='matching' ng-controller='matchingPlayerCtrl' ng-keydown='keydownHandler($event)'>
+	<body ng-controller='matchingPlayerCtrl' ng-keydown='keydownHandler($event)'>
 		<header id="header">
 			<div id='titleContainer'>
 				<h1>{{ title }}</h1>
@@ -394,5 +392,7 @@ <h2>How to Play:</h2>
 				<br/>close!
 			</div>
 		</section>
+		<!-- MAIN PLAYER SCRIPT -->
+		<script src="player.js"></script>
 	</body>
 </html>
diff --git a/webpack.config.js b/webpack.config.js
@@ -7,36 +7,26 @@ const widgetWebpack = require('materia-widget-development-kit/webpack-widget')
 const copy = widgetWebpack.getDefaultCopyList()
 
 const entries = {
-	'creator.js': [
-			path.join(srcPath, 'modules', 'matching.coffee'),
-			path.join(srcPath, 'controllers', 'creator.coffee'),
-			path.join(srcPath, 'directives', 'audioControls.coffee'),
-			path.join(srcPath, 'directives', 'focusMe.coffee'),
-			path.join(srcPath, 'directives', 'ngEnter.coffee'),
-			path.join(srcPath, 'directives', 'inputStateManager.coffee')
+	'creator': [
+		path.join(srcPath, 'creator.html'),
+		path.join(srcPath, 'modules', 'matching.coffee'),
+		path.join(srcPath, 'controllers', 'creator.coffee'),
+		path.join(srcPath, 'directives', 'audioControls.coffee'),
+		path.join(srcPath, 'directives', 'focusMe.coffee'),
+		path.join(srcPath, 'directives', 'ngEnter.coffee'),
+		path.join(srcPath, 'directives', 'inputStateManager.coffee'),
+		path.join(srcPath, 'creator.scss'),
 	],
-	'player.js': [
-			path.join(srcPath, 'modules', 'matching.coffee'),
-			path.join(srcPath, 'controllers', 'player.coffee'),
-			path.join(srcPath, 'directives', 'audioControls.coffee')
+	'player': [
+		path.join(srcPath, 'player.html'),
+		path.join(srcPath, 'modules', 'matching.coffee'),
+		path.join(srcPath, 'controllers', 'player.coffee'),
+		path.join(srcPath, 'directives', 'audioControls.coffee'),
+		path.join(srcPath, 'player.scss'),
 	],
-	'audioControls.css': [
-			path.join(srcPath, 'audioControls.scss'),
-			path.join(srcPath, 'audioControls.html')
-	],
-	'player.css': [
-			path.join(srcPath, 'player.html'),
-			path.join(srcPath, 'player.scss'),
-	],
-	'creator.css': [
-			path.join(srcPath, 'creator.html'),
-			path.join(srcPath, 'creator.scss'),
-	],
-	'guides/player.temp.html': [
-			path.join(srcPath, '_guides', 'player.md')
-	],
-	'guides/creator.temp.html': [
-			path.join(srcPath, '_guides', 'creator.md')
+	'audioControls': [
+		path.join(srcPath, 'audioControls.html'),
+		path.join(srcPath, 'audioControls.scss'),
 	]
 }