Skip to content

Commit 9b39f1e

Browse files
chore: update deps (#2346)
1 parent 5070b9b commit 9b39f1e

File tree

13 files changed

+190
-195
lines changed

13 files changed

+190
-195
lines changed

.github/workflows/nodejs.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ jobs:
9292
yarn build:ci
9393
yarn run lerna bootstrap
9494
95-
# - name: Run Smoketests
96-
# run: yarn test:smoketests
95+
- name: Run Smoketests
96+
run: yarn test:smoketests
9797

9898
- name: Test and Generate Coverage
9999
run: |
@@ -110,11 +110,15 @@ jobs:
110110
- uses: actions/checkout@v2
111111
with:
112112
fetch-depth: 0
113+
113114
- uses: actions/setup-node@v1
114115
with:
115116
node-version: '12.x'
117+
116118
- run: npm install
119+
117120
- name: conventional-changelog-lint-config-cz
118121
# $GITHUB_WORKSPACE is the path to your repository
119122
run: echo "NODE_PATH=$GITHUB_WORKSPACE/node_modules" >> $GITHUB_ENV
123+
120124
- uses: wagoid/commitlint-github-action@v2

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
coverage
2+
.nyc_output
23
node_modules
34
test/**/dist/
45
test/**/bin/

OPTIONS.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,12 +456,14 @@ Options:
456456
--resolve-main-files-reset Clear all items provided in configuration. Filenames used to find the default entry point if there is no description file or main field.
457457
--resolve-modules <value...> Folder name or directory path where to find modules.
458458
--resolve-modules-reset Clear all items provided in configuration. Folder names or directory paths where to find modules.
459+
--resolve-prefer-absolute Prefer to resolve server-relative URLs (starting with '/') as absolute paths before falling back to resolve in 'resolve.roots'.
460+
--no-resolve-prefer-absolute Negative 'resolve-prefer-absolute' option.
459461
--resolve-prefer-relative Prefer to resolve module requests as relative request and fallback to resolving as module.
460462
--no-resolve-prefer-relative Negative 'resolve-prefer-relative' option.
461463
--resolve-restrictions <value...> Resolve restriction. Resolve result must fulfill this restriction.
462464
--resolve-restrictions-reset Clear all items provided in configuration. A list of resolve restrictions. Resolve results must fulfill all of these restrictions to resolve successfully. Other resolve paths are taken when restrictions are not met.
463465
--resolve-roots <value...> Directory in which requests that are server-relative URLs (starting with '/') are resolved.
464-
--resolve-roots-reset Clear all items provided in configuration. A list of directories in which requests that are server-relative URLs (starting with '/') are resolved. On non-windows system these requests are tried to resolve as absolute path first.
466+
--resolve-roots-reset Clear all items provided in configuration. A list of directories in which requests that are server-relative URLs (starting with '/') are resolved.
465467
--resolve-symlinks Enable resolving symlinks to the original location.
466468
--no-resolve-symlinks Negative 'resolve-symlinks' option.
467469
--resolve-unsafe-cache Enable caching of successfully resolved requests (cache entries are not revalidated).
@@ -504,12 +506,14 @@ Options:
504506
--resolve-loader-main-files-reset Clear all items provided in configuration. Filenames used to find the default entry point if there is no description file or main field.
505507
--resolve-loader-modules <value...> Folder name or directory path where to find modules.
506508
--resolve-loader-modules-reset Clear all items provided in configuration. Folder names or directory paths where to find modules.
509+
--resolve-loader-prefer-absolute Prefer to resolve server-relative URLs (starting with '/') as absolute paths before falling back to resolve in 'resolve.roots'.
510+
--no-resolve-loader-prefer-absolute Negative 'resolve-loader-prefer-absolute' option.
507511
--resolve-loader-prefer-relative Prefer to resolve module requests as relative request and fallback to resolving as module.
508512
--no-resolve-loader-prefer-relative Negative 'resolve-loader-prefer-relative' option.
509513
--resolve-loader-restrictions <value...> Resolve restriction. Resolve result must fulfill this restriction.
510514
--resolve-loader-restrictions-reset Clear all items provided in configuration. A list of resolve restrictions. Resolve results must fulfill all of these restrictions to resolve successfully. Other resolve paths are taken when restrictions are not met.
511515
--resolve-loader-roots <value...> Directory in which requests that are server-relative URLs (starting with '/') are resolved.
512-
--resolve-loader-roots-reset Clear all items provided in configuration. A list of directories in which requests that are server-relative URLs (starting with '/') are resolved. On non-windows system these requests are tried to resolve as absolute path first.
516+
--resolve-loader-roots-reset Clear all items provided in configuration. A list of directories in which requests that are server-relative URLs (starting with '/') are resolved.
513517
--resolve-loader-symlinks Enable resolving symlinks to the original location.
514518
--no-resolve-loader-symlinks Negative 'resolve-loader-symlinks' option.
515519
--resolve-loader-unsafe-cache Enable caching of successfully resolved requests (cache entries are not revalidated).

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"cz-customizable": "^6.3.0",
7373
"del-cli": "^3.0.1",
7474
"eslint": "^7.12.1",
75-
"eslint-config-prettier": "^6.15.0",
75+
"eslint-config-prettier": "^7.1.0",
7676
"eslint-plugin-node": "^11.1.0",
7777
"eslint-plugin-prettier": "^3.1.4",
7878
"execa": "^5.0.0",
@@ -90,10 +90,13 @@
9090
"rimraf": "^3.0.2",
9191
"strip-ansi": "^6.0.0",
9292
"ts-jest": "^26.4.3",
93-
"typescript": "^3.9.7",
94-
"webpack": "^5.12.2",
93+
"typescript": "^4.1.3",
94+
"webpack": "^5.13.0",
9595
"webpack-bundle-analyzer": "^4.3.0",
9696
"webpack-dev-server": "^3.11.1",
9797
"yeoman-test": "^2.7.0"
98+
},
99+
"dependencies": {
100+
"@types/yeoman-test": "^2.0.5"
98101
}
99102
}

packages/generators/__tests__/init-generator.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as assert from 'yeoman-assert';
2+
// eslint-disable-next-line node/no-extraneous-import
23
import { run } from 'yeoman-test';
34
import { join } from 'path';
45

packages/generators/__tests__/loader-generator.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { join } from 'path';
2+
// eslint-disable-next-line node/no-extraneous-import
23
import { run } from 'yeoman-test';
34
import * as assert from 'yeoman-assert';
45

packages/generators/__tests__/plugin-generator.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { join } from 'path';
2+
// eslint-disable-next-line node/no-extraneous-import
23
import { run } from 'yeoman-test';
34
import * as assert from 'yeoman-assert';
45

packages/generators/__tests__/utils/scaffold-utils.test.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { Confirm, List, InputValidate, Input } from '../../src/utils/scaffold-utils';
22

33
describe('utils', () => {
4+
let mockSelf;
5+
46
beforeEach(() => {
5-
this.mockSelf = {
7+
mockSelf = {
68
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
79
prompt: (arg) => {
810
return arg[0];
@@ -11,7 +13,7 @@ describe('utils', () => {
1113
});
1214
describe('Inquirer', () => {
1315
it('should emulate a prompt for List', () => {
14-
expect(List(this.mockSelf, 'entry', 'does it work?', ['Yes', 'Maybe'], 'Yes')).toEqual({
16+
expect(List(mockSelf, 'entry', 'does it work?', ['Yes', 'Maybe'], 'Yes')).toEqual({
1517
choices: ['Yes', 'Maybe'],
1618
type: 'list',
1719
name: 'entry',
@@ -21,44 +23,44 @@ describe('utils', () => {
2123
});
2224

2325
it('should make default value for a List', () => {
24-
expect(List(this.mockSelf, 'entry', 'does it work?', ['Yes', 'Maybe'], 'Yes', true)).toEqual({
26+
expect(List(mockSelf, 'entry', 'does it work?', ['Yes', 'Maybe'], 'Yes', true)).toEqual({
2527
entry: 'Yes',
2628
});
2729
});
2830
it('should emulate a prompt for list input', () => {
29-
expect(Input(this.mockSelf, 'plugins', 'what is your plugin?', 'openJSF')).toEqual({
31+
expect(Input(mockSelf, 'plugins', 'what is your plugin?', 'openJSF')).toEqual({
3032
type: 'input',
3133
name: 'plugins',
3234
message: 'what is your plugin?',
3335
default: 'openJSF',
3436
});
3537
});
3638
it('should return a default Input object value', () => {
37-
expect(Input(this.mockSelf, 'plugins', 'what is your plugin?', 'my-plugin', true)).toEqual({
39+
expect(Input(mockSelf, 'plugins', 'what is your plugin?', 'my-plugin', true)).toEqual({
3840
plugins: 'my-plugin',
3941
});
4042
});
4143
it('should emulate a prompt for confirm', () => {
42-
expect(Confirm(this.mockSelf, 'context', 'what is your context?')).toEqual({
44+
expect(Confirm(mockSelf, 'context', 'what is your context?')).toEqual({
4345
name: 'context',
4446
default: true,
4547
message: 'what is your context?',
4648
type: 'confirm',
4749
});
4850
});
4951
it('should make a Confirm object with yes as default', () => {
50-
expect(Confirm(this.mockSelf, 'context', 'what is your context?', true, true)).toEqual({
52+
expect(Confirm(mockSelf, 'context', 'what is your context?', true, true)).toEqual({
5153
context: true,
5254
});
5355
});
5456
it('should make an Input object with validation', () => {
55-
expect(InputValidate(this.mockSelf, 'plugins', 'what is your plugin?', () => true)).toMatchSnapshot();
57+
expect(InputValidate(mockSelf, 'plugins', 'what is your plugin?', () => true)).toMatchSnapshot();
5658
});
5759
it('should make an Input object with validation and default value', () => {
58-
expect(InputValidate(this.mockSelf, 'plugins', 'what is your plugin?', () => true, 'my-plugin')).toMatchSnapshot();
60+
expect(InputValidate(mockSelf, 'plugins', 'what is your plugin?', () => true, 'my-plugin')).toMatchSnapshot();
5961
});
6062
it('should return a default Input object with validation and default value', () => {
61-
expect(InputValidate(this.mockSelf, 'plugins', 'what is your plugin?', () => true, 'my-plugin', true)).toEqual({
63+
expect(InputValidate(mockSelf, 'plugins', 'what is your plugin?', () => true, 'my-plugin', true)).toEqual({
6264
plugins: 'my-plugin',
6365
});
6466
});

packages/generators/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"log-symbols": "^4.0.0",
2222
"yeoman-environment": "^2.10.3",
2323
"yeoman-generator": "^4.12.0",
24-
"execa": "^4.1.0",
24+
"execa": "^5.0.0",
2525
"findup-sync": "^4.0.0",
2626
"global-modules": "^2.0.0",
2727
"got": "^11.8.0",
@@ -35,10 +35,8 @@
3535
"devDependencies": {
3636
"@types/yeoman-assert": "^3.1.1",
3737
"@types/yeoman-generator": "^4.11.3",
38-
"@types/yeoman-test": "^2.0.5",
3938
"rimraf": "^3.0.2",
4039
"yeoman-assert": "^3.1.1",
41-
"yeoman-test": "^2.3.0",
4240
"@types/got": "^9.6.11",
4341
"@types/prettier": "^2.1.5"
4442
},

packages/serve/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class ServeCommand {
9494
process.stdin.on('end', () => {
9595
Promise.all(
9696
servers.map((server) => {
97-
return new Promise((resolve) => {
97+
return new Promise<void>((resolve) => {
9898
server.close(() => {
9999
resolve();
100100
});

smoketests/missing-packages/webpack-dev-server.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const runTest = () => {
3333
setTimeout(() => {
3434
console.log(' timeout: killing process');
3535
proc.kill();
36-
}, 5000);
36+
}, 30000);
3737

3838
const logMessage = "For using 'serve' command you need to install: 'webpack-dev-server' package";
3939
const prompt = 'Would you like to install';

smoketests/missing-packages/webpack.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const runTest = () => {
3232
return new Promise((resolve) => {
3333
setTimeout(() => {
3434
proc.kill();
35-
}, 5000);
35+
}, 30000);
3636

3737
const logMessage = 'It looks like webpack is not installed.';
3838
const prompt = 'Would you like to install';

0 commit comments

Comments
 (0)