fix: upgrades

.github/workflows/build.yml

@@ -36,12 +36,8 @@ jobs:
       - run: git config --global user.name "GitHub Actions"
       - run: yarn --frozen-lockfile
       - run: yarn test
-      - name: Push changed files
-        run: yarn dw-ci push-changed-files
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
       - name: Coveralls
+        if: matrix.os == 'ubuntu-latest' && matrix.node == 12
         run: yarn dw-ci coveralls
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -54,12 +50,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
       - uses: actions/setup-node@v1
         with:
           node-version: 12
+      - run: git config --global user.email "actions@github.com"
+      - run: git config --global user.name "GitHub Actions"
       - run: yarn --frozen-lockfile
+      - run: yarn lint
+      - name: Push changed files
+        run: yarn dw-ci push-changed-files
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -12,20 +12,20 @@
   "scripts": {
     "commit": "base commit",
     "dev": "base dev",
+    "lint": "base lint",
     "prepare": "base prepare",
     "prepublishOnly": "base prepublishOnly",
     "test": "base test"
   },
   "dependencies": {
-    "@dword-design/depcheck-config": "^1.1.1",
     "@dword-design/depcheck-sass-parser": "^1.0.0",
     "fs-extra": "^9.0.0"
   },
   "devDependencies": {
     "@dword-design/base": "^6.0.0",
     "@dword-design/functions": "^2.7.0",
     "execa": "^4.0.0",
-    "glob-promise": "^3.4.0",
+    "globby": "^11.0.1",
     "output-files": "^1.1.8",
     "with-local-tmp-dir": "^2.2.2"
   },

src/index.js

@@ -1,22 +1,20 @@
-import depcheckConfig from '@dword-design/depcheck-config'
 import depcheckSassParser from '@dword-design/depcheck-sass-parser'
+
 import prepublishOnly from './prepublish-only'
 
 export default {
+  commands: {
+    prepublishOnly,
+  },
   depcheckConfig: {
-    ...depcheckConfig,
     parsers: {
-      ...depcheckConfig.parsers,
       '*.scss': depcheckSassParser,
     },
   },
-  gitignore: ['/dist'],
   editorIgnore: ['dist'],
+  gitignore: ['/dist'],
+  npmPublish: true,
   packageConfig: {
     main: 'dist/index.scss',
   },
-  commands: {
-    prepublishOnly,
-  },
-  npmPublish: true,
 }

src/prepublish-only.js

@@ -1,4 +1,4 @@
-import { remove, copy } from 'fs-extra'
+import { copy, remove } from 'fs-extra'
 
 export default async () => {
   console.log('Copying sass files …')

src/prepublish-only.spec.js

@@ -1,19 +1,21 @@
+import { endent, identity, sortBy } from '@dword-design/functions'
 import execa from 'execa'
-import withLocalTmpDir from 'with-local-tmp-dir'
-import outputFiles from 'output-files'
-import glob from 'glob-promise'
-import { endent } from '@dword-design/functions'
 import { readFile } from 'fs-extra'
+import globby from 'globby'
+import outputFiles from 'output-files'
 import P from 'path'
+import withLocalTmpDir from 'with-local-tmp-dir'
 
 export default {
   valid: () =>
     withLocalTmpDir(async () => {
       await outputFiles({
         'dist/foo.txt': 'foo',
+        'node_modules/base-config-foo/index.js':
+          "module.exports = require('../../../src')",
         'package.json': JSON.stringify(
           {
-            baseConfig: require.resolve('.'),
+            baseConfig: 'foo',
           },
           undefined,
           2
@@ -24,23 +26,22 @@ export default {
           body
             color: $color
         `,
-          'test.txt': 'foo',
           'index.scss': endent`
           $color: red;
           body {
             background: $color;
           }
         `,
+          'test.txt': 'foo',
         },
       })
       await execa.command('base prepare')
-      const { all } = await execa.command('base prepublishOnly', { all: true })
-      expect(await glob('**', { cwd: 'dist', dot: true })).toEqual([
-        'foo',
-        'foo/test.scss',
-        'index.scss',
-        'test.txt',
-      ])
+      const output = await execa.command('base prepublishOnly', { all: true })
+      expect(
+        globby('**', { cwd: 'dist', dot: true, filesOnly: false })
+          |> await
+          |> sortBy(identity)
+      ).toEqual(['foo/test.scss', 'index.scss', 'test.txt'])
       expect(await readFile(P.resolve('dist', 'foo', 'test.scss'), 'utf8'))
         .toEqual(endent`
       $color: blue
@@ -54,7 +55,7 @@ export default {
         background: $color;
       }
     `)
-      expect(all).toEqual(endent`
+      expect(output.all).toEqual(endent`
       Copying sass files …
       Sass files successfully copied.
     `)