Skip to content

Commit

Permalink
fix: update dependency @dword-design/ci to v4 (#687)
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] committed May 19, 2023
1 parent 95cc129 commit 11bdb26
Show file tree
Hide file tree
Showing 7 changed files with 1,300 additions and 1,460 deletions.
2 changes: 2 additions & 0 deletions .gitpod.yml
Expand Up @@ -17,3 +17,5 @@ vscode:
- https://sebastianlandwehr.com/vscode-extensions/karlito40.fix-irregular-whitespace-0.1.1.vsix
- https://sebastianlandwehr.com/vscode-extensions/adrianwilczynski.toggle-hidden-1.0.2.vsix
- octref.vetur@0.33.1
- Tobermory.es6-string-html
- zjcompt.es6-string-javascript
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -30,7 +30,7 @@
"@commitlint/config-conventional": "^17.4.0",
"@dword-design/babel-config": "^2.0.0",
"@dword-design/base-config-node": "^1.6.0",
"@dword-design/ci": "^3.0.0",
"@dword-design/ci": "^4.0.0",
"@dword-design/eslint-config": "^3.0.6",
"@dword-design/functions": "^4.0.0",
"@dword-design/jiti-babel-transform": "^1.0.7",
Expand Down
27 changes: 14 additions & 13 deletions src/commands/test-raw/index.spec.js
@@ -1,5 +1,6 @@
import {
endent,
endent as javascript,
identity,
keyBy,
mapValues,
Expand All @@ -24,7 +25,7 @@ export default tester(
files: {
src: {
'index.js': 'export default 1',
'index.spec.js': endent`
'index.spec.js': javascript`
export default {
valid: () => expect(1).toEqual(2),
}
Expand Down Expand Up @@ -78,7 +79,7 @@ export default tester(
files: {
src: {
'index.js': 'export default 1',
'index.spec.js': endent`
'index.spec.js': javascript`
export default {
bar: () => console.log('run bar'),
foo: () => console.log('run foo'),
Expand All @@ -95,7 +96,7 @@ export default tester(
},
'image snapshot': {
files: {
'index.spec.js': endent`
'index.spec.js': javascript`
import sharp from '${packageName`sharp`}'
export default {
Expand Down Expand Up @@ -183,7 +184,7 @@ export default tester(
},
'multiple snapshots': {
files: {
'index.spec.js': endent`
'index.spec.js': javascript`
export default {
works: function () {
expect('foo').toMatchSnapshot(this)
Expand All @@ -202,7 +203,7 @@ export default tester(
P.join('__snapshots__', 'index.spec.js.snap'),
'utf8',
),
).toEqual(endent`
).toEqual(javascript`
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[\`index works 1\`] = \`"foo"\`;
Expand Down Expand Up @@ -268,15 +269,15 @@ export default tester(
type: 'module',
}),
src: {
'index.spec.js': endent`
'index.spec.js': javascript`
import { execa } from 'execa'
import P from 'path'
export default {
valid: () => execa(P.join('src', 'subprocess.js'), { stdio: 'inherit' }),
}
`,
'subprocess.js': endent`
'subprocess.js': javascript`
#!/usr/bin/env node
console.log(1 |> x => x * 2)
Expand All @@ -290,7 +291,7 @@ export default tester(
},
snapshot: {
files: {
'index.spec.js': endent`
'index.spec.js': javascript`
export default {
works: function () {
expect('foo').toMatchSnapshot(this)
Expand All @@ -307,13 +308,13 @@ export default tester(
},
'test in project root': {
files: {
'index.spec.js': endent`
'index.spec.js': javascript`
export default {
valid: () => console.log('run test')
}
`,
'node_modules/base-config-foo/index.js': endent`
'node_modules/base-config-foo/index.js': javascript`
module.exports = {
allowedMatches: [
'index.spec.js',
Expand Down Expand Up @@ -350,7 +351,7 @@ export default tester(
},
'update snapshot': {
files: {
'__snapshots__/index.spec.js.snap': endent`
'__snapshots__/index.spec.js.snap': javascript`
exports[\`index works 1\`] = \`"foo"\`;
`,
Expand Down Expand Up @@ -429,11 +430,11 @@ export default tester(
type: 'module',
}),
src: {
'index.js': endent`
'index.js': javascript`
export default 1
`,
'index.spec.js': endent`
'index.spec.js': javascript`
import foo from './index.js'
export default {
Expand Down
12 changes: 4 additions & 8 deletions src/get-generated-files/get-github-workflow/steps/get-release.js
@@ -1,12 +1,8 @@
import { first, keys, map } from '@dword-design/functions'
import { map } from '@dword-design/functions'
import packageName from 'depcheck-package-name'
import { createRequire } from 'module'
import parsePackagejsonName from 'parse-packagejson-name'

const _require = createRequire(import.meta.url)

const ci = _require(`${packageName`@dword-design/ci`}/package.json`)

const bin = ci.bin |> keys |> first
const ci = `dw-${parsePackagejsonName(packageName`@dword-design/ci`).fullName}`

export default config => [
{
Expand All @@ -15,7 +11,7 @@ export default config => [
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}',
},
name: 'Push changed files',
run: `yarn ${bin} push-changed-files`,
run: `yarn ${ci} push-changed-files`,
},
...([
...config.preDeploySteps,
Expand Down
Expand Up @@ -20,6 +20,8 @@ yarn --frozen-lockfile",
"https://sebastianlandwehr.com/vscode-extensions/karlito40.fix-irregular-whitespace-0.1.1.vsix",
"https://sebastianlandwehr.com/vscode-extensions/adrianwilczynski.toggle-hidden-1.0.2.vsix",
"octref.vetur@0.33.1",
"Tobermory.es6-string-html",
"zjcompt.es6-string-javascript",
],
},
}
Expand Down
2 changes: 2 additions & 0 deletions src/get-generated-files/get-gitpod/index.js
Expand Up @@ -29,6 +29,8 @@ export default function () {
'https://sebastianlandwehr.com/vscode-extensions/karlito40.fix-irregular-whitespace-0.1.1.vsix',
'https://sebastianlandwehr.com/vscode-extensions/adrianwilczynski.toggle-hidden-1.0.2.vsix',
'octref.vetur@0.33.1',
'Tobermory.es6-string-html',
'zjcompt.es6-string-javascript',
],
},
}
Expand Down

0 comments on commit 11bdb26

Please sign in to comment.