Merge pull request #3 from literallycanvas/chore/webpack

jasoniangreen · web-flow · commit c174ca59109e · 2018-10-21T00:23:33.000+01:00
Just doing some build work @irskep
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,82 @@
+version: 2
+
+refs:
+  container: &container
+    docker:
+      - image: node:8.11
+    working_directory: ~/repo
+
+jobs:
+  all:
+    <<: *container
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "yarn.lock" }}
+            - v1-dependencies-
+      - run:
+          name: Versions
+          command: node -v && npm -v && yarn -v
+      - run:
+          name: Install dependencies
+          command: yarn install
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "yarn.lock" }}
+      - run:
+          name: Build
+          command: yarn build
+      - run:
+          name: Test
+          command: yarn test
+
+  master:
+    <<: *container
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "yarn.lock" }}
+            - v1-dependencies-
+      - run:
+          name: Versions
+          command: node -v && npm -v && yarn -v
+      - run:
+          name: Install dependencies
+          command: yarn install
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "yarn.lock" }}
+      - run:
+          name: Build
+          command: yarn build
+      - run:
+          name: Test
+          command: yarn test
+      - run:
+          name: Post status to GitHub
+          command: |
+              npx cross-ci :run \
+                  npx commit-status success Version "'\${BUILD_VERSION}'"
+      - run:
+          name: Release
+          command: yarn release
+
+workflows:
+  version: 2
+  all:
+    jobs:
+      - all:
+          filters:
+            branches:
+              ignore:
+                - master
+  master:
+    jobs:
+      - master:
+          filters:
+            branches:
+              only: master
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,7 +1,9 @@
 {
   "env": {
       "browser": true,
-      "es6": true
+      "es6": true,
+      "node": true,
+      "jest": true
   },
   "extends": [
       "eslint:recommended"
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,6 @@ node_modules/
 *.log
 package-lock.json
 .DS_Store
-lib/
+lib/
+dist/
+coverage/
diff --git a/Makefile b/Makefile
diff --git a/commitlint.config.js b/commitlint.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+    extends: ["@commitlint/config-conventional"],
+    rules: {
+        "subject-case": [1, "always", "lower-case"],
+    },
+};
diff --git a/demo/simple.html b/demo/simple.html
@@ -23,13 +23,13 @@
 
   <body>
     <div class="literally"></div>
-    <script src="../lib/index.js"></script>
+    <script src="../dist/bundle.js"></script>
 
     <script type="text/javascript">
-      const LiterallyCanvas = LC.default;
+      const LiterallyCanvas = LC.LiterallyCanvas;
       const mainDiv = document.querySelector('.literally');
       const lc = new LiterallyCanvas(mainDiv, {
-        ...LiterallyCanvas.defaultOptions,
+        ...LC.defaultOptions,
         defaultStrokeWidth: 10,
         backgroundColor: '#FFF',
       });
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/literallycanvas.sublime-project b/literallycanvas.sublime-project
diff --git a/package.json b/package.json
@@ -2,22 +2,25 @@
   "name": "literallycanvas-core",
   "version": "0.6.0",
   "description": "HTML5 drawing widget - core lib",
-  "main": "lib/index.js",
+  "main": "dist/bundle.js",
   "files": [
     "lib/*",
-    "src/*"
+    "src/*",
+    "dist/*"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "bundle": "gulp bundle",
-    "dev": "gulp dev",
+    "test": "jest --no-cache",
+    "test:coverage": "jest --no-cache --coverage",
+    "test:watch": "jest --no-cache --watch",
+    "build": "webpack -d --watch",
     "prettier": "prettier --write \"src/**/*.js\"",
-    "lint": "eslint src",
-    "gulp": "gulp"
+    "release": "semantic-release",
+    "lint": "eslint src"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged"
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
+      "pre-commit": "yarn test && lint-staged"
     }
   },
   "lint-staged": {
@@ -40,21 +43,52 @@
   "bugs": {
     "url": "https://github.com/literallycanvas/literallycanvas-core/issues"
   },
+  "jest": {
+    "moduleFileExtensions": [
+      "js"
+    ],
+    "testRegex": ".*/__tests__/.*\\.(test|spec)\\.js$",
+    "collectCoverageFrom": [
+      "src/**/*.js"
+    ]
+  },
   "devDependencies": {
+    "@commitlint/cli": "^7.2.1",
+    "@commitlint/config-conventional": "^7.1.2",
+    "@semantic-release/changelog": "^3.0.1",
+    "@semantic-release/git": "^7.0.5",
+    "@semantic-release/npm": "^5.0.5",
     "babel-eslint": "^10.0.1",
     "babel-preset-es2015": "^6.3.13",
     "babelify": "^7.2.0",
     "browserify": "~13.0.0",
+    "commit-status": "^4.3.0",
     "envify": "~3.4.0",
     "eslint": "^5.7.0",
     "gulp": "~3.9.0",
     "gulp-rename": "~1.2.2",
     "gulp-uglify": "~1.5.1",
     "husky": "^1.1.2",
+    "jest": "^23.6.0",
     "lint-staged": "^7.3.0",
     "prettier": "1.14.3",
+    "semantic-release": "^15.10.5",
     "uglify-js": "~2.6.1",
     "vinyl-source-stream": "~1.1.0",
-    "watchify": "~3.7.0"
+    "watchify": "~3.7.0",
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.1.2"
+  },
+  "release": {
+    "verifyConditions": [
+      "@semantic-release/changelog",
+      "@semantic-release/npm",
+      "@semantic-release/git"
+    ],
+    "prepare": [
+      "@semantic-release/changelog",
+      "@semantic-release/npm",
+      "@semantic-release/git"
+    ]
   }
 }
diff --git a/src/LiterallyCanvas.js b/src/LiterallyCanvas.js
@@ -1,4 +1,4 @@
-import actions from "./actions";
+import * as actions from "./actions";
 import bindEvents from "./bindEvents";
 import {JSONToShape, shapeToJSON} from "./shapes";
 import {renderShapeToContext} from "./canvasRenderer";
diff --git a/src/__tests__/math.spec.js b/src/__tests__/math.spec.js
@@ -0,0 +1,7 @@
+import math from "../math";
+
+describe("math", () => {
+    it("should define length function", () => {
+        expect(math.len({x: 3, y: 4})).toBe(5);
+    });
+});
diff --git a/src/actions.js b/src/actions.js
@@ -97,4 +97,4 @@ class AddShapeAction {
     }
 }
 
-export default {ClearAction, MoveAction, AddShapeAction};
+export {ClearAction, MoveAction, AddShapeAction};
diff --git a/src/index.js b/src/index.js
@@ -0,0 +1,58 @@
+import * as toolsBase from "./tools/base";
+import Pencil from "./tools/Pencil";
+import * as actions from "./actions";
+import bindEvents from "./bindEvents";
+import * as canvasRenderer from "./canvasRenderer";
+import defaultOptions from "./defaultOptions";
+import lineEndCapShapes from "./lineEndCapShapes";
+import LiterallyCanvas from "./LiterallyCanvas";
+import * as localization from "./localization";
+import math from "./math";
+import renderSnapshotToImage from "./renderSnapshotToImage";
+import renderSnapshotToSVG from "./renderSnapshotToSVG";
+import * as shapes from "./shapes";
+import * as svgRenderer from "./svgRenderer";
+import TextRenderer from "./TextRenderer";
+import * as util from "./util";
+
+export {
+    actions,
+    bindEvents,
+    canvasRenderer,
+    defaultOptions,
+    lineEndCapShapes,
+    LiterallyCanvas,
+    localization,
+    math,
+    renderSnapshotToImage,
+    renderSnapshotToSVG,
+    shapes,
+    svgRenderer,
+    TextRenderer,
+    util,
+    toolsBase,
+    Pencil,
+};
+
+if (window) {
+    window.LC = {
+        actions,
+        bindEvents,
+        canvasRenderer,
+        defaultOptions,
+        lineEndCapShapes,
+        LiterallyCanvas,
+        localization,
+        math,
+        renderSnapshotToImage,
+        renderSnapshotToSVG,
+        shapes,
+        svgRenderer,
+        TextRenderer,
+        util,
+        toolsBase,
+        Pencil,
+    };
+}
+
+export default LiterallyCanvas;
diff --git a/webpack.config.js b/webpack.config.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import actions from "./actions";`
	`1`	`+import * as actions from "./actions";`
`2`	`2`	`import bindEvents from "./bindEvents";`
`3`	`3`	`import {JSONToShape, shapeToJSON} from "./shapes";`
`4`	`4`	`import {renderShapeToContext} from "./canvasRenderer";`