Merge branch 'master' of github.com:remotelock/react-week-scheduler

remotelock · Jul 6, 2019 · 844e0a6 · 844e0a6
2 parents 7080ea6 + fe93d9f
commit 844e0a6
Show file tree

Hide file tree

Showing 6 changed files with 216 additions and 101 deletions.
diff --git a/.releaserc.json b/.releaserc.json
@@ -1,4 +1,17 @@
 {
+  "branches": [
+    "+([1-9])?(.{+([1-9]),x}).x",
+    "master",
+    "develop",
+    {
+      "name": "alpha",
+      "prerelease": true
+    },
+    {
+      "name": "beta",
+      "prerelease": true
+    }
+  ],
   "analyzeCommits": {
     "preset": "angular",
     "releaseRules": [

diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,14 @@ jobs:
       deploy:
         - provider: script
           skip_cleanup: true
-          script: npx semantic-release
+          script: yarn semantic-release
+          on:
+            branch: master
+        - provider: script
+          skip_cleanup: true
+          script: yarn semantic-release
+          on:
+            branch: develop
         - provider: pages
           github-token: $GH_TOKEN
           skip-cleanup: true

diff --git a/README.md b/README.md
@@ -23,13 +23,13 @@ import { TimeGridScheduler, classes } from '@remotelock/react-week-scheduler';
 import '@remotelock/react-week-scheduler/index.css';
 
 const rangeStrings = [
-  ['2019-03-03T22:45:00.000Z', '2019-03-04T01:15:00.000Z'],
-  ['2019-03-04T22:15:00.000Z', '2019-03-05T01:00:00.000Z'],
-  ['2019-03-05T22:00:00.000Z', '2019-03-06T01:00:00.000Z'],
-  ['2019-03-06T22:00:00.000Z', '2019-03-07T01:00:00.000Z'],
-  ['2019-03-07T05:30:00.000Z', '2019-03-07T10:00:00.000Z'],
-  ['2019-03-08T22:00:00.000Z', '2019-03-09T01:00:00.000Z'],
-  ['2019-03-09T22:00:00.000Z', '2019-03-10T01:00:00.000Z'],
+  ['2019-03-04 00:15', '2019-03-04 01:45'],
+  ['2019-03-05 09:00', '2019-03-05 10:30'],
+  ['2019-03-06 22:00', '2019-03-06 22:30'],
+  ['2019-03-07 01:30', '2019-03-07 03:00'],
+  ['2019-03-07 05:30', '2019-03-07 10:00'],
+  ['2019-03-08 12:30', '2019-03-08 01:30'],
+  ['2019-03-09 22:00', '2019-03-09 23:59'],
 ];
 
 const defaultSchedule = rangeStrings.map(range =>

diff --git a/demo/index.tsx b/demo/index.tsx
@@ -46,13 +46,13 @@ const classes = mapValues(
 );
 
 const rangeStrings: [string, string][] = [
-  ['2019-03-03T22:45:00.000Z', '2019-03-04T01:15:00.000Z'],
-  ['2019-03-04T22:15:00.000Z', '2019-03-05T01:00:00.000Z'],
-  ['2019-03-05T22:00:00.000Z', '2019-03-06T01:00:00.000Z'],
-  ['2019-03-06T22:00:00.000Z', '2019-03-07T01:00:00.000Z'],
-  ['2019-03-07T05:30:00.000Z', '2019-03-07T10:00:00.000Z'],
-  ['2019-03-08T22:00:00.000Z', '2019-03-09T01:00:00.000Z'],
-  ['2019-03-09T22:00:00.000Z', '2019-03-10T01:00:00.000Z'],
+  ['2019-03-04 00:15', '2019-03-04 01:45'],
+  ['2019-03-05 09:00', '2019-03-05 10:30'],
+  ['2019-03-06 22:00', '2019-03-06 22:30'],
+  ['2019-03-07 01:30', '2019-03-07 03:00'],
+  ['2019-03-07 05:30', '2019-03-07 10:00'],
+  ['2019-03-08 12:30', '2019-03-08 01:30'],
+  ['2019-03-09 22:00', '2019-03-09 23:59'],
 ];
 
 const defaultSchedule: ScheduleType = rangeStrings.map(

diff --git a/package.json b/package.json
@@ -35,10 +35,10 @@
     "scroll-into-view-if-needed": "^2.2.20"
   },
   "peerDependencies": {
+    "pepjs": "^0.5.0",
     "react": "^16.8.4",
     "react-dom": "^16.8.4",
-    "resize-observer-polyfill": "^1.5.1",
-    "pepjs": "^0.5.0"
+    "resize-observer-polyfill": "^1.5.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",
@@ -97,7 +97,7 @@
     "rollup-plugin-postcss": "^2.0.3",
     "sass": "^1.17.2",
     "scroll-into-view-if-needed": "^2.2.20",
-    "semantic-release": "^15.13.3",
+    "semantic-release": "^16.0.0-beta.22",
     "source-map-explorer": "^1.7.0",
     "stylelint": "^9.10.1",
     "stylelint-config-standard": "^18.2.0",