Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade webpack-glsl-loader. #737

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Upgrade webpack-glsl-loader. #737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffe52c7
Upgrade webpack-glsl-loader.
millette Oct 25, 2023
c2078a1
Replace webpack-glsl-loader with ts-shader-loader.
millette Oct 25, 2023
d3493ca
Fix yarn.lock paths (after verdaccio).
millette Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/transition-frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@
"webpack": "^4.43.0",
"webpack-cdn-plugin": "^3.3.1",
"webpack-cli": "^3.3.12",
"webpack-glsl-loader": "^1.0.1"
"@davcri/webpack-glsl-loader": "^1.0.2"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why @davcri loader? It has only 7 weekly downloads. Would https://www.npmjs.com/package/ts-shader-loader do the same job and fix the issue this fixes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

J'ai regardé le code, rien de louche. C'est un fork à partir de grieve/webpack-glsl-loader#9

https://www.npmjs.com/package/ts-shader-loader pourrait être une bonne option, j'ai pas trop d'opinion, j'ai pas d'expérience avec glsl.

}
}
2 changes: 1 addition & 1 deletion packages/transition-frontend/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ module.exports = (env) => {
},
{
test: /\.glsl$/,
loader: 'webpack-glsl-loader'
loader: '@davcri/webpack-glsl-loader'
},
{
test: /\.s?css$/,
Expand Down
23 changes: 5 additions & 18 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,11 @@
enabled "2.0.x"
kuler "^2.0.0"

"@davcri/webpack-glsl-loader@^1.0.2":
version "1.0.2"
resolved "http://localhost:4873/@davcri/webpack-glsl-loader/-/webpack-glsl-loader-1.0.2.tgz#657b0919bc3f9ceb6bc4cfaee2ef7db8c18bcb61"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

localhost?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah oui, c'est à cause que j'utilise verdaccio, un cache npm local. Ça change rien, yarn (et autres npm/pnpm, etc.) ne regardent pas ce champ là pour la source. Sinon je peux rouler un script pour corriger l'URL. Comme tu préfères.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ça a l'air que ça change tout, dans le yarn.lock c'est localhost qu'il écrit! verdaccio ne devrait-il pas y mettre l'url upstream?

integrity sha512-6E2C2qHEchwQb1SswWG2Lapsl1WvNZ+EDz5d7F+v4ZBmymZFr/kPMHG/9sBhURpAunn9Gs/KMIJWUPHDdZvcxg==

"@emotion/babel-plugin@^11.10.5":
version "11.10.5"
resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c"
Expand Down Expand Up @@ -7434,11 +7439,6 @@ fs.realpath@^1.0.0:
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

fs@0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/fs/-/fs-0.0.2.tgz#e1f244ef3933c1b2a64bd4799136060d0f5914f8"
integrity sha512-YAiVokMCrSIFZiroB1oz51hPiPRVcUtSa4x2U5RYXyhS9VAPdiFigKbPTnOSq7XY8wd3FIVPYmXpo5lMzFmxgg==

fsevents@^1.2.7:
version "1.2.13"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
Expand Down Expand Up @@ -11363,11 +11363,6 @@ path-type@^4.0.0:
resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==

path@^0.11.14:
version "0.11.14"
resolved "https://registry.yarnpkg.com/path/-/path-0.11.14.tgz#cbc7569355cb3c83afeb4ace43ecff95231e5a7d"
integrity sha512-CzEXTDgcEfa0yqMe+DJCSbEB5YCv4JZoic5xulBNFF2ifIMjNrTWbNSPNhgKfSo0MjneGIx9RLy4pCFuZPaMSQ==

pause@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
Expand Down Expand Up @@ -14881,14 +14876,6 @@ webpack-cli@^3.3.12:
v8-compile-cache "^2.1.1"
yargs "^13.3.2"

webpack-glsl-loader@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/webpack-glsl-loader/-/webpack-glsl-loader-1.0.1.tgz#72a0e30192bd57947d60d6d505c915be680d0acc"
integrity sha512-bFtjj+sOGECMKQ+o8V4Y0TdrIxiua6ykVAncj5ccws8ezZBhhz+9wdrQqSgawm2IS3SPjoVaF7yxSAS8naNirg==
dependencies:
fs "0.0.2"
path "^0.11.14"

webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
version "1.4.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
Expand Down