Skip to content

Commit 7431d5f

Browse files
committed
fix #23
1 parent fc6e1b1 commit 7431d5f

7 files changed

Lines changed: 1342 additions & 11430 deletions

File tree

dist/construct-devtool.js

Lines changed: 18 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -103,30 +103,6 @@ __webpack_require__.r(__webpack_exports__);
103103

104104
"use strict";
105105

106-
<<<<<<< Updated upstream
107-
108-
/*
109-
MIT License http://www.opensource.org/licenses/mit-license.php
110-
Author Tobias Koppers @sokra
111-
*/
112-
// css base code, injected by the css-loader
113-
// eslint-disable-next-line func-names
114-
module.exports = function (useSourceMap) {
115-
var list = []; // return the list of modules as css string
116-
117-
list.toString = function toString() {
118-
return this.map(function (item) {
119-
var content = cssWithMappingToString(item, useSourceMap);
120-
121-
if (item[2]) {
122-
return "@media ".concat(item[2], "{").concat(content, "}");
123-
}
124-
125-
return content;
126-
}).join('');
127-
}; // import a list of modules into the list
128-
// eslint-disable-next-line func-names
129-
=======
130106

131107
/*
132108
MIT License http://www.opensource.org/licenses/mit-license.php
@@ -7587,77 +7563,9 @@ function trigger (el, type) {
75877563
e.initEvent(type, true, true);
75887564
el.dispatchEvent(e);
75897565
}
7590-
>>>>>>> Stashed changes
75917566

75927567
/* */
75937568

7594-
<<<<<<< Updated upstream
7595-
list.i = function (modules, mediaQuery) {
7596-
if (typeof modules === 'string') {
7597-
// eslint-disable-next-line no-param-reassign
7598-
modules = [[null, modules, '']];
7599-
}
7600-
7601-
var alreadyImportedModules = {};
7602-
7603-
for (var i = 0; i < this.length; i++) {
7604-
// eslint-disable-next-line prefer-destructuring
7605-
var id = this[i][0];
7606-
7607-
if (id != null) {
7608-
alreadyImportedModules[id] = true;
7609-
}
7610-
}
7611-
7612-
for (var _i = 0; _i < modules.length; _i++) {
7613-
var item = modules[_i]; // skip already imported module
7614-
// this implementation is not 100% perfect for weird media query combinations
7615-
// when a module is imported multiple times with different media queries.
7616-
// I hope this will never occur (Hey this way we have smaller bundles)
7617-
7618-
if (item[0] == null || !alreadyImportedModules[item[0]]) {
7619-
if (mediaQuery && !item[2]) {
7620-
item[2] = mediaQuery;
7621-
} else if (mediaQuery) {
7622-
item[2] = "(".concat(item[2], ") and (").concat(mediaQuery, ")");
7623-
}
7624-
7625-
list.push(item);
7626-
}
7627-
}
7628-
};
7629-
7630-
return list;
7631-
};
7632-
7633-
function cssWithMappingToString(item, useSourceMap) {
7634-
var content = item[1] || ''; // eslint-disable-next-line prefer-destructuring
7635-
7636-
var cssMapping = item[3];
7637-
7638-
if (!cssMapping) {
7639-
return content;
7640-
}
7641-
7642-
if (useSourceMap && typeof btoa === 'function') {
7643-
var sourceMapping = toComment(cssMapping);
7644-
var sourceURLs = cssMapping.sources.map(function (source) {
7645-
return "/*# sourceURL=".concat(cssMapping.sourceRoot).concat(source, " */");
7646-
});
7647-
return [content].concat(sourceURLs).concat([sourceMapping]).join('\n');
7648-
}
7649-
7650-
return [content].join('\n');
7651-
} // Adapted from convert-source-map (MIT)
7652-
7653-
7654-
function toComment(sourceMap) {
7655-
// eslint-disable-next-line no-undef
7656-
var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));
7657-
var data = "sourceMappingURL=data:application/json;charset=utf-8;base64,".concat(base64);
7658-
return "/*# ".concat(data, " */");
7659-
}
7660-
=======
76617569
// recursively search for possible transition defined inside the component root
76627570
function locateNode (vnode) {
76637571
return vnode.componentInstance && (!vnode.data || !vnode.data.transition)
@@ -8119,7 +8027,6 @@ if (inBrowser) {
81198027
/* harmony default export */ __webpack_exports__["a"] = (Vue);
81208028

81218029
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("c8ba")))
8122-
>>>>>>> Stashed changes
81238030

81248031
/***/ }),
81258032

@@ -8630,23 +8537,16 @@ function normalizeComponent (
86308537
}
86318538
}
86328539

8633-
<<<<<<< Updated upstream
8634-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7801baa6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/App.vue?vue&type=template&id=4f215440&shadow
8635-
=======
8636-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5dff49d6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/App.vue?vue&type=template&id=30e14678&shadow
8637-
>>>>>>> Stashed changes
8540+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"782ff1d9-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/App.vue?vue&type=template&id=1ba08c16&shadow
86388541
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{attrs:{"id":"app"}},[_c('div',{attrs:{"id":"devtool"}},[_c('div',{staticClass:"bubble",on:{"click":function($event){_vm.showBS = true}}},[_c('font-awesome-icon',{staticClass:"icon",attrs:{"icon":_vm.faCog}})],1),_c('div',{staticClass:"overlay",class:{ active: _vm.showBS }}),_c('div',{staticClass:"modal",class:{ active: _vm.showBS }},[_c('div',{staticClass:"modal-content"},[_c('font-awesome-icon',{staticClass:"icon close",attrs:{"icon":_vm.faTimes},on:{"click":function($event){_vm.showBS = false}}}),_c('div',{staticClass:"item",on:{"click":_vm.reloadPage}},[_c('font-awesome-icon',{staticClass:"icon",attrs:{"icon":_vm.faSync}}),_c('span',[_vm._v("Reload")])],1),_c('div',{staticClass:"item",on:{"click":_vm.openDevTools}},[_c('font-awesome-icon',{staticClass:"icon",attrs:{"icon":_vm.faDev}}),_c('span',[_vm._v("DevTools")])],1)],1)])])])}
86398542
var staticRenderFns = []
86408543

86418544

8642-
// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=30e14678&shadow
8545+
// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=1ba08c16&shadow
86438546

86448547
// EXTERNAL MODULE: ./node_modules/@fortawesome/vue-fontawesome/index.es.js
86458548
var index_es = __webpack_require__("ad3d");
86468549

8647-
// EXTERNAL MODULE: ./node_modules/@fortawesome/fontawesome-svg-core/index.es.js
8648-
var fontawesome_svg_core_index_es = __webpack_require__("ecee");
8649-
86508550
// CONCATENATED MODULE: ./node_modules/@fortawesome/free-solid-svg-icons/index.es.js
86518551
var prefix = "fas";
86528552
var faAd = {
@@ -17085,7 +16985,7 @@ var index_es_iconsCache = {
1708516985

1708616986

1708716987

17088-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/@vue/cli-plugin-babel/node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/App.vue?vue&type=script&lang=js&shadow
16988+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/App.vue?vue&type=script&lang=js&shadow
1708916989
//
1709016990
//
1709116991
//
@@ -17115,8 +17015,6 @@ var index_es_iconsCache = {
1711517015

1711617016

1711717017

17118-
17119-
fontawesome_svg_core_index_es["a" /* config */].autoAddCss = false;
1712017018
/* harmony default export */ var Appvue_type_script_lang_js_shadow = ({
1712117019
name: 'DevTool',
1712217020
components: {
@@ -17148,31 +17046,20 @@ fontawesome_svg_core_index_es["a" /* config */].autoAddCss = false;
1714817046

1714917047
},
1715017048
methods: {
17151-
reloadPage() {
17152-
var event = new Event('reloadPage');
17049+
dispatch(eventName) {
17050+
var event = new Event(eventName);
1715317051
document.dispatchEvent(event);
1715417052
},
1715517053

17054+
reloadPage() {
17055+
this.dispatch('reloadPage');
17056+
},
17057+
1715617058
openDevTools() {
17157-
var event = new Event('openDevTools');
17158-
document.dispatchEvent(event);
17059+
this.dispatch('openDevTools');
1715917060
}
1716017061

17161-
},
17162-
17163-
mounted() {
17164-
// This will only work on your root Vue component since it's using $parent
17165-
var shadowRoot = this.$parent.$options.shadowRoot;
17166-
var id = 'fa-styles';
17167-
17168-
if (!shadowRoot.getElementById("".concat(id))) {
17169-
var faStyles = document.createElement('style');
17170-
faStyles.setAttribute('id', id);
17171-
faStyles.textContent = fontawesome_svg_core_index_es["b" /* dom */].css();
17172-
shadowRoot.appendChild(faStyles);
17173-
}
1717417062
}
17175-
1717617063
});
1717717064
// CONCATENATED MODULE: ./src/App.vue?vue&type=script&lang=js&shadow
1717817065
/* harmony default export */ var src_Appvue_type_script_lang_js_shadow = (Appvue_type_script_lang_js_shadow);
@@ -17219,25 +17106,13 @@ window.customElements.define('construct-devtool', vue_wc_wrapper(vue_runtime_esm
1721917106
/***/ "5dee":
1722017107
/***/ (function(module, exports, __webpack_require__) {
1722117108

17222-
<<<<<<< Updated upstream
17223-
exports = module.exports = __webpack_require__("24fb")(false);
17224-
// Module
17225-
exports.push([module.i, "#devtool{display:-webkit-box;display:-ms-flexbox;display:flex;font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#2c3e50;margin-top:60px}#devtool,.bubble{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;text-align:center}.bubble{position:fixed;right:5px;bottom:5px;background-color:#005fff;height:50px;width:50px;line-height:50px;border-radius:25px;color:#fff;cursor:pointer}.overlay{-webkit-transition:background-color .25s;transition:background-color .25s;background-color:transparent;position:fixed;top:0;left:0;height:100%;width:100%;pointer-events:none}.overlay.active{background-color:rgba(0,0,0,.7)}.modal{-webkit-transition:all .25s;transition:all .25s;background-color:#fff;position:fixed;bottom:-150px;height:100px;width:80%;border-radius:2px 2px 0 0;padding:1rem}.modal.active{bottom:0;-webkit-box-shadow:0 19px 38px rgba(0,0,0,.3),0 15px 12px rgba(0,0,0,.22);box-shadow:0 19px 38px rgba(0,0,0,.3),0 15px 12px rgba(0,0,0,.22)}.close{position:absolute;right:5px;top:2px;background-color:transparent;border:none;width:16px;cursor:pointer;outline:none}.modal-content{height:100%}.item,.modal-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.item{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;border-radius:2px;padding:10px;margin:15px;width:100px;height:50px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24);box-shadow:0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24);cursor:pointer;-webkit-transition:background-color .25s;transition:background-color .25s}.item:hover{background-color:rgba(0,0,0,.12)}.icon{width:16px}.item>.icon{width:16px;margin:7px}", ""]);
17226-
17227-
17228-
/***/ }),
17229-
17230-
/***/ "8bbf":
17231-
/***/ (function(module, exports) {
17232-
=======
1723317109
// Imports
1723417110
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
1723517111
exports = ___CSS_LOADER_API_IMPORT___(false);
1723617112
// Module
1723717113
exports.push([module.i, "#devtool{display:-webkit-box;display:-ms-flexbox;display:flex;font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#2c3e50;margin-top:60px}#devtool,.bubble{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;text-align:center}.bubble{position:fixed;right:5px;bottom:5px;background-color:#005fff;height:50px;width:50px;line-height:50px;border-radius:25px;color:#fff;cursor:pointer}.overlay{-webkit-transition:background-color .25s;transition:background-color .25s;background-color:transparent;position:fixed;top:0;left:0;height:100%;width:100%;pointer-events:none}.overlay.active{background-color:rgba(0,0,0,.7)}.modal{-webkit-transition:all .25s;transition:all .25s;background-color:#fff;position:fixed;bottom:-150px;height:100px;width:80%;border-radius:2px 2px 0 0;padding:1rem}.modal.active{bottom:0;-webkit-box-shadow:0 19px 38px rgba(0,0,0,.3),0 15px 12px rgba(0,0,0,.22);box-shadow:0 19px 38px rgba(0,0,0,.3),0 15px 12px rgba(0,0,0,.22)}.close{position:absolute;right:5px;top:2px;background-color:transparent;border:none;width:16px;cursor:pointer;outline:none}.modal-content{height:100%}.item,.modal-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.item{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;border-radius:2px;padding:10px;margin:15px;width:100px;height:50px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24);box-shadow:0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24);cursor:pointer;-webkit-transition:background-color .25s;transition:background-color .25s}.item:hover{background-color:rgba(0,0,0,.12)}.icon{width:16px}.item>.icon{width:16px;margin:7px}", ""]);
1723817114
// Exports
1723917115
module.exports = exports;
17240-
>>>>>>> Stashed changes
1724117116

1724217117

1724317118
/***/ }),
@@ -17688,10 +17563,10 @@ var FontAwesomeIcon = {
1768817563

1768917564
var icon$$1 = normalizeIconArgs(iconArgs);
1769017565
var classes = objectWithKey('classes', classList(props));
17691-
var transform = objectWithKey('transform', typeof props.transform === 'string' ? _fortawesome_fontawesome_svg_core__WEBPACK_IMPORTED_MODULE_0__[/* parse */ "d"].transform(props.transform) : props.transform);
17566+
var transform = objectWithKey('transform', typeof props.transform === 'string' ? _fortawesome_fontawesome_svg_core__WEBPACK_IMPORTED_MODULE_0__[/* parse */ "c"].transform(props.transform) : props.transform);
1769217567
var mask = objectWithKey('mask', normalizeIconArgs(maskArgs));
1769317568

17694-
var renderedIcon = Object(_fortawesome_fontawesome_svg_core__WEBPACK_IMPORTED_MODULE_0__[/* icon */ "c"])(icon$$1, _extends({}, classes, transform, mask, { symbol: symbol, title: title }));
17569+
var renderedIcon = Object(_fortawesome_fontawesome_svg_core__WEBPACK_IMPORTED_MODULE_0__[/* icon */ "b"])(icon$$1, _extends({}, classes, transform, mask, { symbol: symbol, title: title }));
1769517570

1769617571
if (!renderedIcon) {
1769717572
return log('Could not find one or more icon(s)', icon$$1, mask);
@@ -17764,9 +17639,9 @@ var FontAwesomeLayersText = {
1776417639

1776517640
var classes = objectWithKey('classes', [].concat(toConsumableArray(props.counter ? [familyPrefix + '-layers-counter'] : []), toConsumableArray(props.position ? [familyPrefix + '-layers-' + props.position] : [])));
1776617641

17767-
var transform = objectWithKey('transform', typeof props.transform === 'string' ? _fortawesome_fontawesome_svg_core__WEBPACK_IMPORTED_MODULE_0__[/* parse */ "d"].transform(props.transform) : props.transform);
17642+
var transform = objectWithKey('transform', typeof props.transform === 'string' ? _fortawesome_fontawesome_svg_core__WEBPACK_IMPORTED_MODULE_0__[/* parse */ "c"].transform(props.transform) : props.transform);
1776817643

17769-
var renderedText = Object(_fortawesome_fontawesome_svg_core__WEBPACK_IMPORTED_MODULE_0__[/* text */ "e"])(props.value.toString(), _extends({}, transform, classes));
17644+
var renderedText = Object(_fortawesome_fontawesome_svg_core__WEBPACK_IMPORTED_MODULE_0__[/* text */ "d"])(props.value.toString(), _extends({}, transform, classes));
1777017645

1777117646
var abstract = renderedText.abstract;
1777217647

@@ -17818,16 +17693,16 @@ module.exports = g;
1781817693
/***/ (function(module, __webpack_exports__, __webpack_require__) {
1781917694

1782017695
"use strict";
17821-
/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return icon; });
17696+
/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return icon; });
1782217697
/* unused harmony export noAuto */
1782317698
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return config; });
1782417699
/* unused harmony export toHtml */
1782517700
/* unused harmony export layer */
17826-
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return text; });
17701+
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return text; });
1782717702
/* unused harmony export counter */
1782817703
/* unused harmony export library */
17829-
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return dom; });
17830-
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return parse; });
17704+
/* unused harmony export dom */
17705+
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return parse; });
1783117706
/* unused harmony export findIconDefinition */
1783217707
function _typeof(obj) {
1783317708
if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {

dist/construct-devtool.js.map

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/construct-devtool.min.js

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/construct-devtool.min.js.map

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
"wc": "vue-cli-service build --target wc --name construct-devtool ./src/App.vue --inline-vue"
1010
},
1111
"dependencies": {
12-
"@fortawesome/fontawesome-free": "^5.12.0",
1312
"@fortawesome/fontawesome-svg-core": "^1.2.26",
1413
"@fortawesome/free-brands-svg-icons": "^5.12.0",
1514
"@fortawesome/free-solid-svg-icons": "^5.12.0",
1615
"@fortawesome/vue-fontawesome": "^0.1.9",
17-
"@mdi/js": "^4.7.95",
1816
"vue": "^2.6.11"
1917
},
2018
"devDependencies": {

src/App.vue

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,9 @@
2626

2727
<script>
2828
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
29-
import { config, dom } from '@fortawesome/fontawesome-svg-core';
3029
import { faSync, faCog, faTimes } from '@fortawesome/free-solid-svg-icons';
3130
import { faDev } from '@fortawesome/free-brands-svg-icons';
3231
33-
config.autoAddCss = false;
34-
3532
export default {
3633
name: 'DevTool',
3734
components: {
@@ -57,27 +54,17 @@ export default {
5754
},
5855
},
5956
methods: {
60-
reloadPage() {
61-
const event = new Event('reloadPage');
57+
dispatch(eventName) {
58+
const event = new Event(eventName);
6259
document.dispatchEvent(event);
6360
},
61+
reloadPage() {
62+
this.dispatch('reloadPage');
63+
},
6464
openDevTools() {
65-
const event = new Event('openDevTools');
66-
document.dispatchEvent(event);
65+
this.dispatch('openDevTools');
6766
},
6867
},
69-
mounted() {
70-
// This will only work on your root Vue component since it's using $parent
71-
const { shadowRoot } = this.$parent.$options;
72-
const id = 'fa-styles';
73-
74-
if (!shadowRoot.getElementById(`${id}`)) {
75-
const faStyles = document.createElement('style');
76-
faStyles.setAttribute('id', id);
77-
faStyles.textContent = dom.css();
78-
shadowRoot.appendChild(faStyles);
79-
}
80-
},
8168
};
8269
</script>
8370

0 commit comments

Comments
 (0)