Skip to content

Commit fabfdef

Browse files
Update dependency eslint-plugin-compat to v4.1.0 (#781)
1 parent 97db5dc commit fabfdef

File tree

6 files changed

+646
-2058
lines changed

6 files changed

+646
-2058
lines changed

.circleci/config.yml

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ jobs:
2020
- run:
2121
name: pwa
2222
command: yarn pwa
23-
- run:
24-
name: optisize
25-
command: yarn optisize
2623
- run:
2724
name: prod
2825
command: yarn prod

.github/workflows/build.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
strategy:
1010
matrix:
11-
node-version: [14.x, 16.x]
11+
node-version: [18.x]
1212

1313
steps:
1414
- uses: actions/checkout@v3
@@ -19,5 +19,4 @@ jobs:
1919
- run: yarn
2020
- run: yarn lint
2121
- run: yarn pwa
22-
- run: yarn optisize
2322
- run: yarn prod

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ install:
77
script:
88
- yarn lint
99
- yarn pwa
10-
- yarn optisize
1110
- yarn prod

README.md

+7-11
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,7 @@ npm run build
208208
npm start --env server
209209
```
210210

211-
5. Images optimization using [Optisize](https://github.com/three11/optisize)
212-
213-
6. SVG Sprite generating using [spritesh](https://www.npmjs.com/package/spritesh)
211+
5. SVG Sprite generating using [spritesh](https://www.npmjs.com/package/spritesh)
214212

215213
All svg files located in `assets/images/svg` are merged into a single `sprite.svg` file in `dist` directory.
216214

@@ -234,7 +232,7 @@ npm run build
234232
</svg>
235233
```
236234

237-
7. All front-end assets are stored in an auto-generated `dist` folder.
235+
6. All front-end assets are stored in an auto-generated `dist` folder.
238236

239237
## Assets
240238

@@ -274,7 +272,6 @@ There are several scripts defined in the `package.json` file:
274272
{
275273
"build": "webpack --mode=production",
276274
"start": "webpack --watch --mode=development",
277-
"optisize": "optisize --src=\"./assets/images\"",
278275
"html": "php index.php > index.html",
279276
"critical": "critical index.html > assets/dist/critical.css",
280277
"rm-html": "rm index.html",
@@ -287,12 +284,11 @@ Here is a bit more about what each script does:
287284

288285
1. `build`: Builds the production version of the javascript and css bundles, regenerates PNG and SVG sprites.
289286
2. `start`: Starts the development sequence, regenerates PNG and SVG sprites, opens your default browser and watches for changes.
290-
3. `optisize`: Optimizes your PNG, JPG and GIF images.
291-
4. `html`: Converts your `index.php` file to `index.html`.
292-
5. `critical`: Using the `index.html` extracts the critical css and generates a `critical.css` file in the `assets/dist` folder which is then inlined in the `index.php` file.
293-
6. `rm-html`: Deletes the `index.html` file.
294-
7. `pwa`: Generates boilerplate files for a PWA. More info [here](https://github.com/scriptex/create-pwa).
295-
8. `prod`: Runs 1, 4, 5, 6. (In this exact order).
287+
3. `html`: Converts your `index.php` file to `index.html`.
288+
4. `critical`: Using the `index.html` extracts the critical css and generates a `critical.css` file in the `assets/dist` folder which is then inlined in the `index.php` file.
289+
5. `rm-html`: Deletes the `index.html` file.
290+
6. `pwa`: Generates boilerplate files for a PWA. More info [here](https://github.com/scriptex/create-pwa).
291+
7. `prod`: Runs 1, 4, 5, 6. (In this exact order).
296292

297293
In order to use the ability to generate critical CSS you must have the `php` binary exposed in your bash terminal.
298294
More about PHP's commandline usage can be found [here](http://php.net/manual/en/features.commandline.php).

package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webpack-mpa-next",
3-
"version": "3.12.0",
3+
"version": "4.0.0",
44
"description": "Multi page app setup with webpack",
55
"keywords": [
66
"MPA",
@@ -29,7 +29,6 @@
2929
"scripts": {
3030
"build": "webpack --mode=production",
3131
"start": "webpack --watch --mode=development",
32-
"optisize": "optisize --src=\"./assets/images\"",
3332
"html": "php index.php > index.html",
3433
"critical": "node critical.mjs",
3534
"rm-html": "rm index.html",
@@ -45,7 +44,6 @@
4544
"devDependencies": {
4645
"@babel/core": "7.20.12",
4746
"@babel/preset-env": "7.20.2",
48-
"@three11/optisize": "3.0.1",
4947
"autoprefixer": "10.4.13",
5048
"babel-loader": "9.1.2",
5149
"browser-sync": "2.27.11",
@@ -88,6 +86,12 @@
8886
"webpack-shell-plugin-next": "2.3.1",
8987
"webpack-spritesmith": "1.1.0"
9088
},
89+
"resolutions": {
90+
"got": "^11.8.5",
91+
"http-cache-semantics": "^4.1.1",
92+
"semver-regex": "^3.1.4",
93+
"ua-parser-js": "^1.0.33"
94+
},
9195
"bin": {
9296
"wmpan": "./bin/cli.js"
9397
},

0 commit comments

Comments
 (0)