Skip to content

Commit

Permalink
feat: remove workspace feature
Browse files Browse the repository at this point in the history
  • Loading branch information
test123456789012345 committed Jun 17, 2020
1 parent 5f31344 commit a8bd6d5
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 168 deletions.
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,17 @@
"get-package-name": "^1.0.0",
"get-projectz-readme-section-regex": "^1.0.5",
"glob-promise": "^3.4.0",
"globby": "^11.0.1",
"hosted-git-info": "^3.0.2",
"ignore": "^5.1.4",
"is-docker": "^2.0.0",
"is-gitpod": "^1.0.7",
"load-pkg": "^4.0.0",
"make-cli": "^1.0.9",
"mocha": "^7.0.1",
"mocha-ui-exports-auto-describe": "^1.0.0",
"nyc": "^15.0.0",
"output-files": "^1.1.7",
"package-name-regex": "^1.0.5",
"parse-git-config": "^3.0.0",
"promise-sequential": "^1.1.1",
"resolve-cwd": "^3.0.0",
"resolve-from": "^5.0.0",
"safe-readfile": "^1.0.2",
Expand Down
15 changes: 0 additions & 15 deletions src/depcheck.root.config.js

This file was deleted.

38 changes: 2 additions & 36 deletions src/test.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,14 @@
import { endent, filter, join, map, property } from '@dword-design/functions'
import { filter, join } from '@dword-design/functions'
import { isCI } from '@qawolf/ci-info'
import execa from 'execa'
import getProjectzReadmeSectionRegex from 'get-projectz-readme-section-regex'
import globby from 'globby'
import isDocker from 'is-docker'
import isGitpod from 'is-gitpod'
import loadPkg from 'load-pkg'
import promiseSequential from 'promise-sequential'
import { readFileSync as safeReadFileSync } from 'safe-readfile'

import config from './config'
import lint from './lint'

const workspaceDepcheck = async workspace => {
try {
await execa(
'depcheck',
[
'--skip-missing',
true,
'--config',
require.resolve('./depcheck.config'),
'.',
],
{ all: true, cwd: workspace }
)
} catch (error) {
const workspaceName =
loadPkg({ cwd: workspace }) |> await |> property('name')
throw new Error(endent`
Error in ${workspaceName}:
${error.all}
`)
}
}

export default async (pattern, options) => {
try {
await execa(
Expand Down Expand Up @@ -74,22 +48,14 @@ export default async (pattern, options) => {
'--skip-missing',
true,
'--config',
require.resolve(
`./depcheck${config.packageConfig?.workspaces ? '.root' : ''}.config`
),
require.resolve('./depcheck.config'),
'.',
],
{ all: true }
)
} catch (error) {
throw new Error(error.all)
}
if (config.packageConfig?.workspaces) {
await (globby(config.packageConfig.workspaces, { onlyDirectories: true })
|> await
|> map(workspace => () => workspaceDepcheck(workspace))
|> promiseSequential)
}
if (!config.testInContainer || isCI || isDocker() || (await isGitpod())) {
return execa(
'nyc',
Expand Down
87 changes: 0 additions & 87 deletions src/test.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,93 +271,6 @@ export default {
* change-case
`)
}),
'unused workspace root dependency': () =>
withLocalTmpDir(async () => {
await outputFiles({
'node_modules/config/index.js': endent`
module.exports = {
allowedMatches: [
'packages',
],
packageConfig: {
workspaces: ['packages/*'],
},
}
`,
'packages/a/index.js': endent`
import 'change-case'
`,
'package.json': JSON.stringify(
{
dependencies: {
'change-case': '^1.0.0',
},
baseConfig: 'config',
},
undefined,
2
),
})
await execa(require.resolve('./cli'), ['prepare'])
let all
try {
await execa(require.resolve('./cli'), ['test'], { all: true })
} catch (error) {
all = error.all
}
expect(all).toMatch(endent`
Unused dependencies
* change-case
`)
}),
'unused workspace dependency': () =>
withLocalTmpDir(async () => {
await outputFiles({
'node_modules/config/index.js': endent`
module.exports = {
allowedMatches: [
'packages',
],
packageConfig: {
private: true,
workspaces: ['packages/*'],
},
}
`,
'packages/a/package.json': JSON.stringify(
{
name: 'a',
dependencies: {
'change-case': '^1.0.0',
},
},
undefined,
2
),
'package.json': JSON.stringify(
{
baseConfig: 'config',
},
undefined,
2
),
})
await execa(require.resolve('./cli'), ['prepare'])
let all
try {
await execa(require.resolve('./cli'), ['test'], { all: true })
} catch (error) {
all = error.all
}
expect(all).toMatch(endent`
Error in a:
Unused dependencies
* change-case
`)
}),
valid: () =>
withLocalTmpDir(async () => {
await outputFiles({
Expand Down
28 changes: 1 addition & 27 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3654,13 +3654,6 @@ find-cache-dir@^3.2.0:
make-dir "^3.0.2"
pkg-dir "^4.1.0"

find-file-up@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/find-file-up/-/find-file-up-2.0.1.tgz#4932dd81551af643893f8cda7453f221e3e28261"
integrity sha512-qVdaUhYO39zmh28/JLQM5CoYN9byEOKEH4qfa8K1eNV17W0UUMJ9WgbR/hHFH+t5rcl+6RTb5UC7ck/I+uRkpQ==
dependencies:
resolve-dir "^1.0.1"

find-node-modules@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/find-node-modules/-/find-node-modules-2.0.0.tgz#5db1fb9e668a3d451db3d618cd167cdd59e41b69"
Expand All @@ -3679,13 +3672,6 @@ find-parent-dir@0.3.0, find-parent-dir@^0.3.0:
resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=

find-pkg@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/find-pkg/-/find-pkg-2.0.0.tgz#3a7c35c704e11a6e5722c56e45bd7e587507735e"
integrity sha512-WgZ+nKbELDa6N3i/9nrHeNznm+lY3z4YfhDDWgW+5P0pdmMj26bxaxU11ookgY3NyP9GC7HvZ9etp0jRFqGEeQ==
dependencies:
find-file-up "^2.0.1"

find-project-root@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/find-project-root/-/find-project-root-1.1.1.tgz#d242727a2d904725df5714f23dfdcdedda0b6ef8"
Expand Down Expand Up @@ -4156,7 +4142,7 @@ globby@11.0.0:
merge2 "^1.3.0"
slash "^3.0.0"

globby@^11.0.0, globby@^11.0.1:
globby@^11.0.0:
version "11.0.1"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
Expand Down Expand Up @@ -5496,13 +5482,6 @@ load-json-file@^4.0.0:
pify "^3.0.0"
strip-bom "^3.0.0"

load-pkg@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/load-pkg/-/load-pkg-4.0.0.tgz#f80a29aec2f6d02aadde714099fda4eea1b611f1"
integrity sha512-xS6uYdbUzHbwO5bExhtM8RsU6Z/fVEfZE4uZpWQOwVygLSUfXz7J97nGzJfZ+FFCZc0Weabn/wA3y1k9Q7Y4mw==
dependencies:
find-pkg "^2.0.0"

locate-path@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
Expand Down Expand Up @@ -7255,11 +7234,6 @@ promise-retry@^1.1.1:
err-code "^1.0.0"
retry "^0.10.0"

promise-sequential@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/promise-sequential/-/promise-sequential-1.1.1.tgz#f79e8950ef86e7a7a85bf320452643592f6d2fb2"
integrity sha1-956JUO+G56eoW/MgRSZDWS9tL7I=

promzard@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
Expand Down

0 comments on commit a8bd6d5

Please sign in to comment.