mirror of https://github.com/rancher/dashboard.git
Fix epinio pkg build
- Includes fixes for some dashboard component references
This commit is contained in:
parent
bf96cea602
commit
bee5f86c2c
|
|
@ -1,5 +1,5 @@
|
|||
import { sortBy } from '@shell/utils/sort';
|
||||
import { EPINIO_TYPES } from '~/pkg/epinio/types';
|
||||
import { EPINIO_TYPES } from '../types';
|
||||
|
||||
export default {
|
||||
name: 'EpinioBindAppsMixin',
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { createEpinioRoute } from '~/pkg/epinio/utils/custom-routing';
|
||||
import { createEpinioRoute } from '../utils/custom-routing';
|
||||
import EpinioResource from './epinio-resource';
|
||||
|
||||
export default class EpinioMetaResource extends EpinioResource {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
<<<<<<< HEAD
|
||||
import { createEpinioRoute } from '@pkg/utils/custom-routing';
|
||||
import { EPINIO_TYPES } from '~/pkg/epinio/types';
|
||||
=======
|
||||
import { EPINIO_TYPES } from '../types';
|
||||
>>>>>>> Fix epinio pkg build
|
||||
import EpinioNamespacedResource from './epinio-namespaced-resource';
|
||||
|
||||
export default class EpinioServiceModel extends EpinioNamespacedResource {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,10 @@
|
|||
"preserveSymlinks": true,
|
||||
"types": [
|
||||
"node",
|
||||
"webpack-env"
|
||||
"webpack-env",
|
||||
"@types/node",
|
||||
"@types/jest",
|
||||
"@nuxt/types"
|
||||
],
|
||||
"lib": [
|
||||
"esnext",
|
||||
|
|
@ -42,8 +45,13 @@
|
|||
"@shell/models/*": [
|
||||
"../../shell/models/*"
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"@components/*": [
|
||||
"../../pkg/rancher-components/*"
|
||||
=======
|
||||
"@shell/mixins/*": [
|
||||
"../../shell/mixins/*"
|
||||
>>>>>>> Fix epinio pkg build
|
||||
],
|
||||
"@pkg/*": [
|
||||
"./*"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,15 @@
|
|||
import { escapeHtml, ucFirst } from '@shell/utils/string';
|
||||
import SteveModel from '@shell/plugins/steve/steve-class';
|
||||
import typeHelper from '@shell/utils/type-helpers';
|
||||
<<<<<<< HEAD
|
||||
import { addObject, addObjects, findBy } from '@shell/utils/array';
|
||||
import { FLEET } from '@shell/config/types';
|
||||
import { convertSelectorObj, matching } from '@shell/utils/selector';
|
||||
=======
|
||||
import { addObject, addObjects, findBy } from '~shell/utils/array';
|
||||
import { FLEET } from '@shell/config/types';
|
||||
import { convertSelectorObj, matching } from '~shell/utils/selector';
|
||||
>>>>>>> Fix epinio pkg build
|
||||
|
||||
export default class FleetBundle extends SteveModel {
|
||||
get deploymentInfo() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue