Merge pull request #22298 from code-dot-org/revert-21452-revert-21388…

…-revert-21137-export-maze Revert "Revert "Revert "Build Maze app from external repo"""
code-dot-org · May 9, 2018 · 99ed867 · 99ed867
2 parents bfa51eb + f0beb22
commit 99ed867
Show file tree

Hide file tree

Showing 57 changed files with 5,197 additions and 134 deletions.
diff --git a/apps/package.json b/apps/package.json
@@ -49,7 +49,6 @@
     "@code-dot-org/johnny-five": "0.11.1-cdo.2",
     "@code-dot-org/js-interpreter-tyrant": "0.2.2",
     "@code-dot-org/js-numbers": "0.1.0-cdo.0",
-    "@code-dot-org/maze": "github:code-dot-org/maze#dca2c2d65fa0ab5941c1dcc757e0ae176546124c",
     "@code-dot-org/p5.play": "1.2.2-cdo",
     "@code-dot-org/piskel": "0.13.0-cdo.3",
     "@storybook/addon-info": "3.2.11",

diff --git a/apps/src/code-studio/components/BeeCellEditor.jsx b/apps/src/code-studio/components/BeeCellEditor.jsx
@@ -1,11 +1,11 @@
 /**
  * @overview React component to allow for easy editing and creation of BeeCells
- * @see @code-dot-org/maze/src/beeCell
+ * @see @cdo/apps/maze/beeCell
  */
 
 import React from 'react';
 import CellEditor from './CellEditor';
-import BeeCell from '@code-dot-org/maze/src/beeCell';
+import BeeCell from '@cdo/apps/maze/beeCell';
 
 export default class BeeCellEditor extends CellEditor {
   /**

diff --git a/apps/src/code-studio/components/CellEditor.jsx b/apps/src/code-studio/components/CellEditor.jsx
@@ -1,10 +1,10 @@
 /**
  * @overview React component to allow for easy editing and creation of Cells.
  * can be extended to allow for editing of various specialized kinds of cells.
- * @see @code-dot-org/maze/src/cell
+ * @see @cdo/apps/maze/cell
  */
 import React, {PropTypes} from 'react';
-import { SquareType } from '@code-dot-org/maze/src/tiles';
+import { SquareType } from '@cdo/apps/maze/tiles';
 
 export default class CellEditor extends React.Component {
   static propTypes = {

diff --git a/apps/src/code-studio/components/Grid.jsx b/apps/src/code-studio/components/Grid.jsx
@@ -7,7 +7,7 @@ import {
   WallCoordColMask,
   WallCoordColShift
 } from '@cdo/apps/studio/constants';
-import mazeUtils from '@code-dot-org/maze/src/utils';
+import mazeUtils from '@cdo/apps/maze/mazeUtils';
 
 const CELL_WIDTH = 48;
 const CELL_HEIGHT = 38;

diff --git a/apps/src/code-studio/components/GridEditor.jsx b/apps/src/code-studio/components/GridEditor.jsx
@@ -4,12 +4,12 @@
  * Supports both Bee and Farmer skins.
  */
 import React, {PropTypes} from 'react';
-var HarvesterCell = require('@code-dot-org/maze/src/harvesterCell');
-var PlanterCell = require('@code-dot-org/maze/src/planterCell');
-var BeeCell = require('@code-dot-org/maze/src/beeCell');
-var Cell = require('@code-dot-org/maze/src/cell');
+var HarvesterCell = require('@cdo/apps/maze/harvesterCell');
+var PlanterCell = require('@cdo/apps/maze/planterCell');
+var BeeCell = require('@cdo/apps/maze/beeCell');
+var Cell = require('@cdo/apps/maze/cell');
 var StudioCell = require('@cdo/apps/studio/cell');
-var mazeUtils = require('@code-dot-org/maze/src/utils');
+var mazeUtils = require('@cdo/apps/maze/mazeUtils');
 
 var HarvesterCellEditor = require('./HarvesterCellEditor');
 var PlanterCellEditor = require('./PlanterCellEditor');

diff --git a/apps/src/code-studio/components/HarvesterCellEditor.jsx b/apps/src/code-studio/components/HarvesterCellEditor.jsx
@@ -1,11 +1,11 @@
 /**
  * @overview React component to allow for easy editing and creation of HarvesterCells
- * @see @code-dot-org/maze/src/harvesterCell
+ * @see @cdo/apps/maze/harvesterCell
  */
 
 import React from 'react';
 import CellEditor from './CellEditor';
-import HarvesterCell from '@code-dot-org/maze/src/harvesterCell';
+import HarvesterCell from '@cdo/apps/maze/harvesterCell';
 
 export default class PlanterCellEditor extends CellEditor {
   /**

diff --git a/apps/src/code-studio/components/PlanterCellEditor.jsx b/apps/src/code-studio/components/PlanterCellEditor.jsx
@@ -1,12 +1,12 @@
 /**
  * @overview React component to allow for easy editing and creation of PlanterCells
- * @see @code-dot-org/maze/src/harvesterCell
+ * @see @cdo/apps/maze/harvesterCell
  */
 
 import React from 'react';
 import CellEditor from './CellEditor';
-import PlanterCell from '@code-dot-org/maze/src/planterCell';
-import { SquareType } from '@code-dot-org/maze/src/tiles';
+import PlanterCell from '@cdo/apps/maze/planterCell';
+import { SquareType } from '@cdo/apps/maze/tiles';
 
 export default class PlanterCellEditor extends CellEditor {
 

diff --git a/apps/src/code-studio/components/stageExtras/MazeThumbnail.jsx b/apps/src/code-studio/components/stageExtras/MazeThumbnail.jsx
@@ -1,9 +1,9 @@
 import React, {PropTypes} from 'react';
 import ProtectedStatefulDiv from '@cdo/apps/templates/ProtectedStatefulDiv';
 import skins from "@cdo/apps/maze/skins";
-import {getSubtypeForSkin} from '@code-dot-org/maze/src/utils';
-import MazeMap from '@code-dot-org/maze/src/mazeMap';
-import drawMap from '@code-dot-org/maze/src/drawMap';
+import {getSubtypeForSkin} from '@cdo/apps/maze/mazeUtils';
+import MazeMap from '@cdo/apps/maze/mazeMap';
+import drawMap from '@cdo/apps/maze/drawMap';
 import assetUrl from '@cdo/apps/code-studio/assetUrl';
 
 export default class MazeThumbnail extends React.Component {