Merge branch 'develop'

- fix #132 - fix #224 - fix #225 - fix #226 - fix #230
ghettovoice · Sep 27, 2019 · baa9ed4 · baa9ed4
2 parents 82a60aa + bd39d56
commit baa9ed4
Show file tree

Hide file tree

Showing 72 changed files with 933 additions and 780 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,34 @@
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
 
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
 ### Node template
 node_modules
 # Logs
@@ -80,7 +108,7 @@ typings/
 # User-specific stuff:
 .idea/**/workspace.xml
 .idea/**/tasks.xml
-.idea/dictionaries
+#.idea/dictionaries
 
 # Sensitive or high-churn files:
 .idea/**/dataSources/

diff --git a/.idea/dictionaries/ghetto.xml b/.idea/dictionaries/ghetto.xml
diff --git a/build/rollup.js b/build/rollup.js
@@ -62,13 +62,25 @@ function getAllPackages () {
       globName: config.fullname,
       amdName: config.name,
     },
+    {
+      entry: utils.resolve('src/mixin/index.js'),
+      jsName: 'mixin',
+      pkgName: 'mixin',
+    },
+    {
+      entry: utils.resolve('src/ol-ext/index.js'),
+      jsName: 'ol-ext',
+      pkgName: 'ol-ext',
+    },
+    {
+      entry: utils.resolve('src/rx-ext/index.js'),
+      jsName: 'rx-ext',
+      pkgName: 'rx-ext',
+    },
   ]
 
   return Promise.all([
     packagesFromPath(utils.resolve('src/component'), utils.resolve('src/component')),
-    packagesFromPath(utils.resolve('src/mixin'), srcPath),
-    packagesFromPath(utils.resolve('src/ol-ext'), srcPath),
-    packagesFromPath(utils.resolve('src/rx-ext'), srcPath),
     packagesFromPath(utils.resolve('src/util'), srcPath),
   ]).then(otherPackages => {
     return packages.concat(otherPackages.reduce((all, packages) => all.concat(packages), []))
@@ -132,8 +144,11 @@ function bundleOptions (format, package, env = 'development') {
       return false
     }
     // embeddable
-    const embeddableRegExp = /(\.\/|src\/)(install)/i
-    if (embeddableRegExp.test(id)) {
+    const embeddableRegExp = /\/(mixin|ol-ext|rx-ext)\//i
+    if (
+      embeddableRegExp.test(parentId) &&
+      (/^\.\//.test(id) || embeddableRegExp.test(id))
+    ) {
       return false
     }
     // check internal component imports
@@ -174,17 +189,17 @@ function bundleOptions (format, package, env = 'development') {
       options.output.globals = (id) => {
         if (id === 'vue') return 'Vue'
 
-        if (ol[id] != null) {
-          return ol[id]
-        }
+        // if (ol[id] != null) {
+        //   return ol[id]
+        // }
       }
       options.input.external = (id, parent, resolved) => {
         if (['vue'].includes(id)) return true
 
-        if (!resolved && /^ol\/.+/.test(id)) {
-          ol[id] = id.replace(/\//g, '.')
-          return true
-        }
+        // if (!resolved && /^ol\/.+/.test(id)) {
+        //   ol[id] = id.replace(/\//g, '.')
+        //   return true
+        // }
 
         return false
       }

diff --git a/docs/home.md b/docs/home.md
@@ -7,10 +7,10 @@
 [![License](https://img.shields.io/github/license/ghettovoice/vuelayers.svg)](https://github.com/ghettovoice/vuelayers/blob/master/LICENSE)
 
 <iframe src="https://ghbtns.com/github-btn.html?user=ghettovoice&amp;repo=vuelayers&amp;type=star&amp;count=true&amp;size=large" 
-    frameborder="0" scrolling="0" class="github-button vld-github-btn" width="130px" height="30px"></iframe>
+    frameborder="0" scrolling="0" class="github-button vld-github-btn" width="140px" height="30px"></iframe>
 
 <iframe src="https://ghbtns.com/github-btn.html?user=ghettovoice&amp;repo=vuelayers&amp;type=fork&amp;count=true&amp;size=large" 
-    frameborder="0" scrolling="0" class="github-button vld-github-btn" width="130px" height="30px"></iframe>
+    frameborder="0" scrolling="0" class="github-button vld-github-btn" width="140px" height="30px"></iframe>
 
 ## Overview
 

diff --git a/docs/index.html b/docs/index.html
@@ -22,7 +22,7 @@
   <link rel="stylesheet" href="//unpkg.com/docsify@4.6.10/lib/themes/vue.css">
 
   <link rel="stylesheet" href="//unpkg.com/vuep@0.8.0/dist/vuep.min.css">
-  <link rel="stylesheet" href="//unpkg.com/vuelayers@0.10.7/lib/style.min.css">
+  <link rel="stylesheet" href="//unpkg.com/vuelayers@latest/lib/style.css">
 
   <style>
     .cover-main pre {
@@ -34,7 +34,7 @@
       padding: 0 1.4rem;
       position: relative;
       word-wrap: normal;
-      ackground-color: #f8f8f8;
+      background-color: #f8f8f8;
       font-family: Roboto Mono,Monaco,courier,monospace;
     }
 
@@ -84,11 +84,11 @@
     Please wait...
   </div>
 
-  <script src="//unpkg.com/openlayers@4.6.5/dist/ol.js"></script>
+  <script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v5.3.0/build/ol.js"></script>
   <script src="//unpkg.com/babel-standalone@6.26.0/babel.min.js"></script>
   <script src="//unpkg.com/vue@2.5.16/dist/vue.min.js"></script>
   <script src="//unpkg.com/vuep@0.8.0/dist/vuep.min.js"></script>
-  <script src="//unpkg.com/vuelayers@0.10.7/lib/index.umd.min.js"></script>
+  <script src="//unpkg.com/vuelayers@latest/lib/index.umd.js"></script>
   <script src="//unpkg.com/fakerator@0.3.0/dist/fakerator.js"></script>
 
   <script src="//unpkg.com/docsify-edit-on-github@1.0.1/index.js"></script>

diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -31,8 +31,6 @@ You can browse the source of the npm package at [unpkg.com/vuelayers/](https://u
 ```html
 <!-- include Vue -->
 <script src="https://unpkg.com/vue/dist/vue.js"></script>
-<!-- include OpenLayers -->
-<script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v5.3.0/build/ol.js"></script>
 <!-- include UMD VueLayers build -->
 <link rel="stylesheet" href="https://unpkg.com/vuelayers/lib/style.css">
 <script src="https://unpkg.com/vuelayers/lib/index.umd.js"></script>

diff --git a/package.json b/package.json
@@ -58,8 +58,7 @@
     "ol-tilecache": "^3.0.1",
     "parse-color": "^1.0.0",
     "rxjs": "^6.3.3",
-    "uuid": "^3.3.2",
-    "whatwg-fetch": "^3.0.0"
+    "uuid": "^3.3.2"
   },
   "peerDependencies": {
     "vue": "^2.3.0"

diff --git a/src/component/circle-style/style.vue b/src/component/circle-style/style.vue
@@ -1,8 +1,7 @@
 <script>
-  import Vue from 'vue'
   import Circle from 'ol/style/Circle'
-  import imageStyle from '../../mixin/image-style'
-  import withFillStrokeStyle from '../../mixin/with-fill-stroke-style'
+  import Vue from 'vue'
+  import { imageStyle, withFillStrokeStyle } from '../../mixin'
   import { isEqual } from '../../util/minilo'
   import mergeDescriptors from '../../util/multi-merge-descriptors'