Skip to content

Commit 6184f67

Browse files
rvlbrvlb
authored
Merge pull request #92 from django-webpack/update-package
Update package for 1.0.0 release
2 parents 07ee268 + b0d68c0 commit 6184f67

File tree

6 files changed

+37
-7549
lines changed

6 files changed

+37
-7549
lines changed

‎.gitignore‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ coverage
2323
logs
2424
*.log
2525
npm-debug.log*
26-
yarn-debug.log*
27-
yarn-error.log*
2826

2927
# Dependency directories
3028
node_modules/
@@ -42,9 +40,6 @@ jspm_packages/
4240
# Output of 'npm pack'
4341
*.tgz
4442

45-
# Yarn Integrity file
46-
.yarn-integrity
47-
4843
# dotenv environment variables file
4944
.env
5045

‎README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ Spits out some stats about webpack compilation process to a file.
1010
npm install --save-dev webpack-bundle-tracker
1111
```
1212

13-
```bash
14-
yarn add --dev webpack-bundle-tracker
15-
```
16-
1713
<br>
1814

1915
## Usage

‎lib/index.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class BundleTrackerPlugin {
5858

5959
// Set output directories
6060
this.outputChunkDir = path.resolve(get(compiler.options, 'output.path', process.cwd()));
61+
// @ts-ignore: TS2345 this.options.filename can't be undefined here because we set a default value above
6162
this.outputTrackerFile = path.resolve(this.options.filename);
6263
this.outputTrackerDir = path.dirname(this.outputTrackerFile);
6364

@@ -84,6 +85,8 @@ class BundleTrackerPlugin {
8485
* @param {string} content
8586
*/
8687
_computeIntegrity(content) {
88+
// @ts-ignore: TS2532 this.options.integrityHashes can't be undefined here because
89+
// we set a default value on _setParamsFromCompiler
8790
return this.options.integrityHashes
8891
.map(algorithm => {
8992
const hash = crypto

‎package.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,50 +19,50 @@
1919
"scripts": {
2020
"pretty": "prettier --loglevel warn --write lib/*.js tests/*.js",
2121
"pretty-lint": "prettier --check lib/*.js tests/*.js",
22-
"pretest": "yarn pretty-lint",
22+
"pretest": "npm run pretty-lint",
2323
"test": "jest --runInBand --env node",
2424
"test-debug": "node --inspect-brk=0.0.0.0 node_modules/jest/bin/jest --runInBand --env node",
2525
"posttest": "tsc",
2626
"test-watch": "jest --runInBand --env node --watchAll",
27-
"travis": "yarn pretest && jest --runInBand --coverage --env node && codecov && yarn posttest"
27+
"travis": "npm pretest && jest --runInBand --coverage --env node && npm posttest"
2828
},
2929
"jest": {
3030
"setupFilesAfterEnv": [
3131
"jest-extended"
3232
]
3333
},
3434
"dependencies": {
35-
"@types/lodash.foreach": "^4.4.6",
35+
"@types/lodash.foreach": "^4.5.6",
3636
"@types/lodash.get": "^4.4.6",
3737
"lodash.assign": "^4.2.0",
3838
"lodash.defaults": "^4.2.0",
39-
"lodash.foreach": "^4.2.0",
39+
"lodash.foreach": "^4.5.0",
4040
"lodash.get": "^4.4.2",
4141
"strip-ansi": "^6.0.0"
4242
},
4343
"devDependencies": {
4444
"@types/lodash.assign": "^4.2.6",
4545
"@types/lodash.defaults": "^4.2.6",
46-
"@types/mkdirp": "^1.0.0",
47-
"@types/node": "^13.9.1",
48-
"@types/webpack": "^4.41.7",
49-
"@typescript-eslint/eslint-plugin": "^2.23.0",
50-
"@typescript-eslint/parser": "^2.23.0",
51-
"codecov": "^3.6.5",
52-
"commitizen": "^4.0.3",
53-
"css-loader": "^3.4.2",
54-
"cz-conventional-changelog": "3.1.0",
46+
"@types/mkdirp": "^1.0.1",
47+
"@types/node": "^13.13.52",
48+
"@types/webpack": "^4.41.28",
49+
"@typescript-eslint/eslint-plugin": "^2.34.0",
50+
"@typescript-eslint/parser": "^2.34.0",
51+
"commitizen": "^4.2.4",
52+
"compression-webpack-plugin": "^6.1.1",
53+
"css-loader": "^5.2.4",
54+
"cz-conventional-changelog": "3.3.0",
5555
"eslint": "^6.8.0",
5656
"file-loader": "^5.1.0",
57-
"jest": "^25.1.0",
57+
"jest": "^25.5.4",
5858
"jest-extended": "^0.11.5",
59-
"mini-css-extract-plugin": "^0.9.0",
59+
"mini-css-extract-plugin": "^0.12.0",
6060
"prettier": "^1.19.1",
61-
"standard-version": "^7.1.0",
62-
"style-loader": "^1.1.3",
61+
"standard-version": "^9.3.0",
62+
"style-loader": "^1.3.0",
6363
"tslint": "^6.1.0",
64-
"typescript": "^3.8.3",
65-
"webpack": "^4.42.0"
64+
"typescript": "^3.9.9",
65+
"webpack": "^4.46.0"
6666
},
6767
"config": {
6868
"commitizen": {

‎tests/base.test.js‎

Lines changed: 15 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ describe('BundleTrackerPlugin bases tests', () => {
3636
plugins: [
3737
new BundleTrackerPlugin({
3838
path: OUTPUT_DIR,
39+
filename: path.join(OUTPUT_DIR, 'webpack-stats.json'),
3940
}),
4041
],
4142
},
@@ -76,6 +77,7 @@ describe('BundleTrackerPlugin bases tests', () => {
7677
plugins: [
7778
new BundleTrackerPlugin({
7879
path: OUTPUT_DIR,
80+
filename: path.join(OUTPUT_DIR, 'webpack-stats.json'),
7981
logTime: true,
8082
}),
8183
],
@@ -108,6 +110,7 @@ describe('BundleTrackerPlugin bases tests', () => {
108110
plugins: [
109111
new BundleTrackerPlugin({
110112
path: OUTPUT_DIR,
113+
filename: path.join(OUTPUT_DIR, 'webpack-stats.json'),
111114
publicPath: 'https://test.org/statics/',
112115
}),
113116
],
@@ -152,7 +155,7 @@ describe('BundleTrackerPlugin bases tests', () => {
152155
plugins: [
153156
new BundleTrackerPlugin({
154157
path: OUTPUT_DIR,
155-
filename: filename,
158+
filename: path.join(OUTPUT_DIR, filename),
156159
}),
157160
],
158161
},
@@ -194,7 +197,7 @@ describe('BundleTrackerPlugin bases tests', () => {
194197
plugins: [
195198
new BundleTrackerPlugin({
196199
path: OUTPUT_DIR,
197-
filename: filename,
200+
filename: path.join(OUTPUT_DIR, filename),
198201
}),
199202
],
200203
},
@@ -237,6 +240,7 @@ describe('BundleTrackerPlugin bases tests', () => {
237240
new BundleTrackerPlugin({
238241
path: OUTPUT_DIR,
239242
publicPath: 'https://test.org/statics/',
243+
filename: path.join(OUTPUT_DIR, 'webpack-stats.json'),
240244
}),
241245
],
242246
},
@@ -271,6 +275,7 @@ describe('BundleTrackerPlugin bases tests', () => {
271275
new BundleTrackerPlugin({
272276
path: OUTPUT_DIR,
273277
relativePath: true,
278+
filename: path.join(OUTPUT_DIR, 'webpack-stats.json'),
274279
}),
275280
],
276281
},
@@ -339,21 +344,17 @@ describe('BundleTrackerPlugin bases tests', () => {
339344
path: OUTPUT_DIR,
340345
relativePath: true,
341346
includeParents: true,
347+
filename: path.join(OUTPUT_DIR, 'webpack-stats.json'),
342348
}),
343349
],
344350
},
345351
{
346352
status: 'done',
347353
chunks: {
348-
app1: ['js/vendors.js', 'js/commons.js', 'js/app1.js'],
349-
app2: ['js/vendors.js', 'js/commons.js', 'js/app2.js'],
354+
app1: ['js/commons.js', 'js/app1.js'],
355+
app2: ['js/commons.js', 'js/app2.js'],
350356
},
351357
assets: {
352-
'js/2.js': {
353-
name: 'js/2.js',
354-
path: 'js/2.js',
355-
publicPath: 'http://localhost:3000/assets/js/2.js',
356-
},
357358
'js/app1.js': {
358359
name: 'js/app1.js',
359360
path: 'js/app1.js',
@@ -369,11 +370,6 @@ describe('BundleTrackerPlugin bases tests', () => {
369370
path: 'js/commons.js',
370371
publicPath: 'http://localhost:3000/assets/js/commons.js',
371372
},
372-
'js/vendors.js': {
373-
name: 'js/vendors.js',
374-
path: 'js/vendors.js',
375-
publicPath: 'http://localhost:3000/assets/js/vendors.js',
376-
},
377373
},
378374
},
379375
'webpack-stats.json',
@@ -433,14 +429,15 @@ describe('BundleTrackerPlugin bases tests', () => {
433429
relativePath: true,
434430
includeParents: true,
435431
integrity: true,
432+
filename: path.join(OUTPUT_DIR, 'webpack-stats.json'),
436433
}),
437434
],
438435
},
439436
{
440437
status: 'done',
441438
chunks: {
442-
app1: ['js/vendors.js', 'js/commons.js', 'js/app1.js'],
443-
appWithAssets: ['js/vendors.js', 'js/commons.js', 'styles.css', 'js/appWithAssets.js'],
439+
app1: ['js/commons.js', 'js/app1.js'],
440+
appWithAssets: ['js/commons.js', 'styles.css', 'js/appWithAssets.js'],
444441
},
445442
publicPath: 'http://localhost:3000/assets/',
446443
assets: {
@@ -450,18 +447,6 @@ describe('BundleTrackerPlugin bases tests', () => {
450447
integrity: expect.stringMatching(/^^sha256-[\w+=/]+ sha384-[\w+=/]+ sha512-[\w+=/]+$/),
451448
publicPath: 'http://localhost:3000/assets/js/commons.js',
452449
},
453-
'js/vendors.js': {
454-
name: 'js/vendors.js',
455-
path: 'js/vendors.js',
456-
integrity: expect.stringMatching(/^^sha256-[\w+=/]+ sha384-[\w+=/]+ sha512-[\w+=/]+$/),
457-
publicPath: 'http://localhost:3000/assets/js/vendors.js',
458-
},
459-
'js/2.js': {
460-
name: 'js/2.js',
461-
path: 'js/2.js',
462-
integrity: expect.stringMatching(/^^sha256-[\w+=/]+ sha384-[\w+=/]+ sha512-[\w+=/]+$/),
463-
publicPath: 'http://localhost:3000/assets/js/2.js',
464-
},
465450
'js/app1.js': {
466451
name: 'js/app1.js',
467452
path: 'js/app1.js',
@@ -557,19 +542,15 @@ describe('BundleTrackerPlugin bases tests', () => {
557542
path: OUTPUT_DIR,
558543
relativePath: true,
559544
includeParents: true,
545+
filename: path.join(OUTPUT_DIR, 'webpack-stats.json'),
560546
}),
561547
],
562548
},
563549
{
564550
status: 'done',
565551
chunks: {
566-
app1: [
567-
expect.stringMatching(/^js\/vendors.js$/),
568-
expect.stringMatching(/^js\/commons.js$/),
569-
expect.stringMatching(/^js\/app1.js$/),
570-
],
552+
app1: [expect.stringMatching(/^js\/commons.js$/), expect.stringMatching(/^js\/app1.js$/)],
571553
appWithAssets: [
572-
expect.stringMatching(/^js\/vendors.js$/),
573554
expect.stringMatching(/^js\/commons.js$/),
574555
expect.stringMatching(/^css\/appWithAssets.css$/),
575556
expect.stringMatching(/^js\/appWithAssets.js$/),
@@ -581,16 +562,6 @@ describe('BundleTrackerPlugin bases tests', () => {
581562
path: 'js/commons.js',
582563
publicPath: 'http://localhost:3000/assets/js/commons.js',
583564
},
584-
'js/vendors.js': {
585-
name: 'js/vendors.js',
586-
path: 'js/vendors.js',
587-
publicPath: 'http://localhost:3000/assets/js/vendors.js',
588-
},
589-
'js/2.js': {
590-
name: 'js/2.js',
591-
path: 'js/2.js',
592-
publicPath: 'http://localhost:3000/assets/js/2.js',
593-
},
594565
'js/app1.js': {
595566
name: 'js/app1.js',
596567
path: 'js/app1.js',
@@ -611,16 +582,6 @@ describe('BundleTrackerPlugin bases tests', () => {
611582
path: 'js/commons.js.gz',
612583
publicPath: 'http://localhost:3000/assets/js/commons.js.gz',
613584
},
614-
'js/vendors.js.gz': {
615-
name: 'js/vendors.js.gz',
616-
path: 'js/vendors.js.gz',
617-
publicPath: 'http://localhost:3000/assets/js/vendors.js.gz',
618-
},
619-
'js/2.js.gz': {
620-
name: 'js/2.js.gz',
621-
path: 'js/2.js.gz',
622-
publicPath: 'http://localhost:3000/assets/js/2.js.gz',
623-
},
624585
'js/app1.js.gz': {
625586
name: 'js/app1.js.gz',
626587
path: 'js/app1.js.gz',
@@ -641,21 +602,11 @@ describe('BundleTrackerPlugin bases tests', () => {
641602
path: 'js/commons.js.br',
642603
publicPath: 'http://localhost:3000/assets/js/commons.js.br',
643604
},
644-
'js/2.js.br': {
645-
name: 'js/2.js.br',
646-
path: 'js/2.js.br',
647-
publicPath: 'http://localhost:3000/assets/js/2.js.br',
648-
},
649605
'css/appWithAssets.css.br': {
650606
name: 'css/appWithAssets.css.br',
651607
path: 'css/appWithAssets.css.br',
652608
publicPath: 'http://localhost:3000/assets/css/appWithAssets.css.br',
653609
},
654-
'js/vendors.js.br': {
655-
name: 'js/vendors.js.br',
656-
path: 'js/vendors.js.br',
657-
publicPath: 'http://localhost:3000/assets/js/vendors.js.br',
658-
},
659610
'js/app1.js.br': {
660611
name: 'js/app1.js.br',
661612
path: 'js/app1.js.br',

0 commit comments

Comments
 (0)