Merge remote-tracking branch 'origin/dev'

Author: juzser

build/rollup.config.base.js

@@ -16,7 +16,7 @@ export default {
       }),
       alias({
         entries: [
-          { find: /@\//, replacement: `${path.resolve(__dirname, '../src/')}` },
+          { find: /@\/(.*)/, replacement: `${path.resolve(__dirname, '../src/$1')}` },
         ],
       }),
       postcss(),

src/classes/Icon.json

@@ -1 +1 @@
-{"Icon":"Polaris-Icon","applyColor":"Polaris-Icon--applyColor","hasBackdrop":"Polaris-Icon--hasBackdrop","colorBase":"Polaris-Icon--colorBase","colorSubdued":"Polaris-Icon--colorSubdued","colorCritical":"Polaris-Icon--colorCritical","colorInteractive":"Polaris-Icon--colorInteractive","colorWarning":"Polaris-Icon--colorWarning","colorHighlight":"Polaris-Icon--colorHighlight","colorSuccess":"Polaris-Icon--colorSuccess","colorPrimary":"Polaris-Icon--colorPrimary","Svg":"Polaris-Icon__Svg","Img":"Polaris-Icon__Img","Placeholder":"Polaris-Icon__Placeholder"}
+{"Icon":"Polaris-Icon","applyColor":"Polaris-Icon--applyColor","hasBackdrop":"Polaris-Icon--hasBackdrop","colorBase":"Polaris-Icon--colorBase","colorSubdued":"Polaris-Icon--colorSubdued","colorCritical":"Polaris-Icon--colorCritical","colorInteractive":"Polaris-Icon--colorInteractive","colorWarning":"Polaris-Icon--colorWarning","colorHighlight":"Polaris-Icon--colorHighlight","colorSuccess":"Polaris-Icon--colorSuccess","colorPrimary":"Polaris-Icon--colorPrimary","Img":"Polaris-Icon__Img","Svg":"Polaris-Icon__Svg","Placeholder":"Polaris-Icon__Placeholder"}

src/components/Icon/Icon.vue

@@ -26,6 +26,7 @@ import { classNames, variationName } from 'polaris-react/src/utilities/css';
 import type { IconSource } from 'types/type';
 import styles from '@/classes/Icon.json';
 import { VisuallyHidden } from '../VisuallyHidden';
+import config from '@/config';
 
 export const getPolarisIcon = async (
   iconName: string,
@@ -140,7 +141,7 @@ export default class Icon extends Vue {
     if (
       this.color
       && this.sourceType === 'external'
-      && process.env.NODE_ENV === 'development'
+      && config.env === 'development'
     ) {
       // eslint-disable-next-line no-console
       console.warn(
@@ -154,7 +155,7 @@ export default class Icon extends Vue {
       this.backdrop
       && this.color
       && !COLORS_WITH_BACKDROPS.includes(this.color)
-      && process.env.NODE_ENV === 'development'
+      && config.env === 'development'
     ) {
       // eslint-disable-next-line no-console
       console.warn(

src/components/InlineError/InlineError.vue

@@ -12,8 +12,8 @@ div(:id="wrapperID", :class="wrapperClassName")
 <script lang="ts">
 import Vue from 'vue';
 import { Component, Prop } from 'vue-property-decorator';
+import type { Error } from 'types/type';
 import styles from '@/classes/InlineError.json';
-import type { Error } from '@/type';
 import { Icon } from '../Icon';
 
 export const errorTextID = (id: string): string => `${id}Error`;

src/config/index.ts

@@ -0,0 +1,3 @@
+export default {
+  env: process.env.NODE_ENV,
+};