Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ module.exports = function(api) {
"root": ["./src"],
//make it work with both
"alias": [
{"@yakit/core": "./yakit/core"},
{"@yakit/ui": "./yakit/ui"},
{"@yakit/svelte": "./yakit/svelte"},
{"@yakit/core": "./node_modules/yakit/core"},
{"@yakit/ui": "./node_modules/yakit/ui"},
{"@yakit/svelte": "./node_modules/yakit/svelte"},
{"@yakit/jqGrid": "./node_modules/yakit/jqGrid"},
{"@ag": "./src"},
{"angle-grinder/src": "./src"},
//used for demo
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/src/assets/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@charset "utf-8";
@import "~angle-grinder/src/styles/all";
@import "~@yakit/ui/styles/all";

@import "examples";
@import "codeview";
2 changes: 1 addition & 1 deletion examples/demo/src/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// CSS and Sass
import 'angle-grinder/src/styles/vendor.css.js'
import '@yakit/ui/styles/vendor.css.js'
// import 'angle-grinder/src/styles/all.scss'
import './assets/styles.scss'
// framework7
Expand Down
7 changes: 4 additions & 3 deletions jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
"paths": {
"angle-grinder/src/*": ["src/*"],
"@ag/*": ["src/*"],
"@yakit/core/*": ["yakit/core/*"],
"@yakit/ui/*": ["yakit/ui/*"],
"@yakit/svelte/*": ["yakit/svelte/*"],
"@yakit/core/*": ["./node_modules/yakit/core/*"],
"@yakit/ui/*": ["./node_modules/yakit/ui/*"],
"@yakit/svelte/*": ["./node_modules/yakit/svelte/*"],
"@yakit/jqGrid/*": ["./node_modules/yakit/jqGrid/*"],
"~/*": ["examples/demo/src/*"],
},
"checkJs": true,
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"ti-icons": "^0.1.2",
"toastr": "~2.1.4",
"vanillajs-datepicker": "yakworks/vanillajs-datepicker",
"yakit": "yakworks/yakit#grinder",
"yup": "^0.32.9"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/gridz/GridCtrl.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-unused-vars */
import { makeLabel } from '@yakit/core/nameUtils'
import { xlsData, csvData } from './excelExport'
import { xlsData, csvData } from '@yakit/jqGrid/excelExport'
import flattenObject from '@yakit/core/flattenObject'
import toast from '@yakit/ui/growl'
import _ from 'lodash'
Expand Down
Loading