feat(alias): remove lib from imports

Thorn Walli · Thorn Walli · commit c003e77dd39e · 2020-10-31T19:57:40.000+01:00
diff --git a/.github/workflows/baqend.yml b/.github/workflows/baqend.yml
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -5,33 +5,33 @@ on:
       - beta
 
 jobs:
-  # install:
-  #   if: "!contains(github.event.head_commit.message, 'skip ci')"
-  #   name: Install
-  #   runs-on: ${{ matrix.os }}
+  install:
+    if: "!contains(github.event.head_commit.message, 'skip ci')"
+    name: Install
+    runs-on: ${{ matrix.os }}
 
-  #   strategy:
-  #     matrix:
-  #       os: [ubuntu-latest]
-  #       node: [12]
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [12]
 
-  #   steps:
-  #     - uses: actions/setup-node@v1
-  #       with:
-  #         node-version: ${{ matrix.node }}
-  #     - name: Checkout Repo
-  #       uses: actions/checkout@v2
-  #     - name: cache node_modules
-  #       uses: actions/cache@v2
-  #       id: cache
-  #       with:
-  #         path: node_modules
-  #         key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package-lock.json')) }}
-  #     - name: Install Dependencies
-  #       if: steps.cache.outputs.cache-hit != 'true'
-  #       run: npm ci
-  #     - name: Test
-  #       run: npm run test
+    steps:
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+      - name: cache node_modules
+        uses: actions/cache@v2
+        id: cache
+        with:
+          path: node_modules
+          key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package-lock.json')) }}
+      - name: Install Dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: npm ci
+      - name: Test
+        run: npm run test
 
   semantic-version:
     name: Semantic Release
diff --git a/example/components/InfoLayer.vue b/example/components/InfoLayer.vue
@@ -11,7 +11,7 @@
 
 <script>
 
-import SpeedkitLayer from 'nuxt-speedkit/lib/components/SpeedkitLayer'
+import SpeedkitLayer from 'nuxt-speedkit/components/SpeedkitLayer'
 export default {
   components: {
     SpeedkitLayer
diff --git a/example/components/organisms/ImageText.vue b/example/components/organisms/ImageText.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import LazyPicture from 'nuxt-speedkit/lib/components/LazyPicture'
+import LazyPicture from 'nuxt-speedkit/components/LazyPicture'
 export default {
   components: {
     LazyPicture
diff --git a/example/components/organisms/Stage.vue b/example/components/organisms/Stage.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import LazyPicture from 'nuxt-speedkit/lib/components/LazyPicture'
+import LazyPicture from 'nuxt-speedkit/components/LazyPicture'
 export default {
   components: {
     LazyPicture
diff --git a/example/layouts/default.vue b/example/layouts/default.vue
@@ -15,7 +15,7 @@ import InfoLayer from '@/components/InfoLayer'
 // import OrganismPageHeader from '@/components/organisms/PageHeader'
 export default {
   speedkitComponents: {
-    GoogleLighthouse: () => import(/* webpackMode: "eager" */ 'nuxt-speedkit/lib/components/GoogleLighthouse'),
+    GoogleLighthouse: () => import(/* webpackMode: "eager" */ 'nuxt-speedkit/components/GoogleLighthouse'),
     OrganismPageHeader: () => import(/* webpackMode: "eager" */ '@/components/organisms/PageHeader')
   },
   components: {
diff --git a/example/nuxt.config.js b/example/nuxt.config.js
@@ -29,7 +29,7 @@ module.exports = {
   },
 
   alias: {
-    [pkg.name]: resolve(__dirname, '../')
+    [pkg.name]: resolve(__dirname, '../lib')
   },
 
   build: {
diff --git a/example/pages/both/lazy-iframe.vue b/example/pages/both/lazy-iframe.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import LazyIframe from 'nuxt-speedkit/lib/components/LazyIframe'
+import LazyIframe from 'nuxt-speedkit/components/LazyIframe'
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
 export default {
   components: {
diff --git a/example/pages/both/lazy-image.vue b/example/pages/both/lazy-image.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import LazyImage from 'nuxt-speedkit/lib/components/LazyImage'
+import LazyImage from 'nuxt-speedkit/components/LazyImage'
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
 export default {
   components: {
diff --git a/example/pages/both/lazy-picture.vue b/example/pages/both/lazy-picture.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import LazyPicture from 'nuxt-speedkit/lib/components/LazyPicture'
+import LazyPicture from 'nuxt-speedkit/components/LazyPicture'
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
 export default {
   components: {
diff --git a/example/pages/critical/lazy-iframe.vue b/example/pages/critical/lazy-iframe.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import LazyIframe from 'nuxt-speedkit/lib/components/LazyIframe'
+import LazyIframe from 'nuxt-speedkit/components/LazyIframe'
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
 export default {
   components: {
diff --git a/example/pages/critical/lazy-image.vue b/example/pages/critical/lazy-image.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import LazyImage from 'nuxt-speedkit/lib/components/LazyImage'
+import LazyImage from 'nuxt-speedkit/components/LazyImage'
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
 export default {
   components: {
diff --git a/example/pages/critical/lazy-picture.vue b/example/pages/critical/lazy-picture.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import LazyPicture from 'nuxt-speedkit/lib/components/LazyPicture'
+import LazyPicture from 'nuxt-speedkit/components/LazyPicture'
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
 export default {
   components: {
diff --git a/example/pages/critical/lazy-video.vue b/example/pages/critical/lazy-video.vue
@@ -12,9 +12,9 @@
 </template>
 
 <script>
-import { resizeObserver } from 'nuxt-speedkit/lib/utils/viewport'
+import { resizeObserver } from 'nuxt-speedkit/utils/viewport'
 
-import LazyVideo from 'nuxt-speedkit/lib/components/LazyVideo'
+import LazyVideo from 'nuxt-speedkit/components/LazyVideo'
 export default {
   components: {
     LazyVideo
diff --git a/example/pages/full-example-without-components.vue b/example/pages/full-example-without-components.vue
@@ -59,7 +59,7 @@
 export default {
 
   speedkitComponents: {
-    LazyPicture: () => import('nuxt-speedkit/lib/components/LazyPicture')
+    LazyPicture: () => import('nuxt-speedkit/components/LazyPicture')
   },
 
   data () {
diff --git a/example/pages/lazy/lazy-iframe.vue b/example/pages/lazy/lazy-iframe.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import LazyIframe from 'nuxt-speedkit/lib/components/LazyIframe'
+import LazyIframe from 'nuxt-speedkit/components/LazyIframe'
 import OrganismSpacer from '@/components/organisms/Spacer'
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
 export default {
diff --git a/example/pages/lazy/lazy-image.vue b/example/pages/lazy/lazy-image.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import LazyImage from 'nuxt-speedkit/lib/components/LazyImage'
+import LazyImage from 'nuxt-speedkit/components/LazyImage'
 import OrganismSpacer from '@/components/organisms/Spacer'
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
 export default {
diff --git a/example/pages/lazy/lazy-picture.vue b/example/pages/lazy/lazy-picture.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import LazyPicture from 'nuxt-speedkit/lib/components/LazyPicture'
+import LazyPicture from 'nuxt-speedkit/components/LazyPicture'
 import OrganismSpacer from '@/components/organisms/Spacer'
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
 export default {
diff --git a/example/pages/tests/lazy-image.vue b/example/pages/tests/lazy-image.vue
@@ -21,7 +21,7 @@
 
 <script>
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
-import LazyImage from 'nuxt-speedkit/lib/components/LazyImage'
+import LazyImage from 'nuxt-speedkit/components/LazyImage'
 export default {
   components: {
     OrganismPreviewContainer,
diff --git a/example/pages/tests/lazy-picture.vue b/example/pages/tests/lazy-picture.vue
@@ -21,7 +21,7 @@
 
 <script>
 import OrganismPreviewContainer from '@/components/organisms/PreviewContainer'
-import LazyPicture from 'nuxt-speedkit/lib/components/LazyPicture'
+import LazyPicture from 'nuxt-speedkit/components/LazyPicture'
 export default {
   components: {
     OrganismPreviewContainer,
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -1,9 +1,9 @@
 import Vue from 'vue'
 
-import vFont from 'nuxt-speedkit/lib/plugins/vFont'
-import vImage from 'nuxt-speedkit/lib/plugins/vImagePreload'
-import FontList from 'nuxt-speedkit/lib/classes/FontList'
-import ImageList from 'nuxt-speedkit/lib/classes/ImageList'
+import vFont from 'nuxt-speedkit/plugins/vFont'
+import vImage from 'nuxt-speedkit/plugins/vImagePreload'
+import FontList from 'nuxt-speedkit/classes/FontList'
+import ImageList from 'nuxt-speedkit/classes/ImageList'
 
 
 Vue.use(vFont)
diff --git a/lib/plugins/vFont.js b/lib/plugins/vFont.js
@@ -1,5 +1,5 @@
-import directive from 'nuxt-speedkit/lib/plugins/vFont/directive'
-import mixin from 'nuxt-speedkit/lib/plugins/vFont/mixin'
+import directive from 'nuxt-speedkit/plugins/vFont/directive'
+import mixin from 'nuxt-speedkit/plugins/vFont/mixin'
 
 let _installed = false
 
diff --git a/lib/speedkit.js b/lib/speedkit.js
@@ -1,4 +1,4 @@
-import { hasSufficientPerformance } from 'nuxt-speedkit/lib/utils/performance'
+import { hasSufficientPerformance } from 'nuxt-speedkit/utils/performance'
 
 let init = false
 function initNuxt () {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { hasSufficientPerformance } from 'nuxt-speedkit/lib/utils/performance'`
	`1`	`+import { hasSufficientPerformance } from 'nuxt-speedkit/utils/performance'`
`2`	`2`
`3`	`3`	`let init = false`
`4`	`4`	`function initNuxt () {`