Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@
"@standardnotes/config": "^2.4.3",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"css-loader": "^6.7.1",
"eslint": "^8.17.0",
"husky": "^8.0.0",
"lint-staged": "^13.0.1",
"prettier": "^2.6.2",
"sass-loader": "^13.0.0",
"typescript": "^4.7.3",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@standardnotes/styles": "workspace:*",
"@svgr/webpack": "^6.2.1",
"babel-loader": "^8.2.5",
"css-loader": "^6.7.1",
"css-loader": "*",
"eslint": "*",
"eslint-plugin-react": "^7.30.0",
"html-webpack-plugin": "^5.5.0",
Expand All @@ -51,7 +51,7 @@
"react-beautiful-dnd": "^13.1.0",
"react-color": "^2.19.3",
"react-dom": "^18.2.0",
"sass-loader": "^13.0.0",
"sass-loader": "*",
"style-loader": "~3.3.1",
"svg-url-loader": "^7.1.1",
"terser-webpack-plugin": "^5.3.3",
Expand Down
18 changes: 13 additions & 5 deletions packages/components/src/packages/theme.webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts');
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts')

module.exports = {
mode: 'production',
Expand All @@ -20,15 +20,23 @@ module.exports = {
url: false,
},
},
'sass-loader',
{
loader: 'sass-loader',
options: {
sassOptions: {
outputStyle: 'expanded',
minimize: false,
},
},
},
],
},
],
},
plugins: [
new MiniCssExtractPlugin({
filename: "dist.css"
filename: 'dist.css',
}),
new RemoveEmptyScriptsPlugin(),
],
};
}
4 changes: 2 additions & 2 deletions packages/styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"lint": "prettier --check *.js"
},
"devDependencies": {
"css-loader": "~6.6.0",
"css-loader": "*",
"eslint": "*",
"mini-css-extract-plugin": "^2.5.3",
"node-sass": "*",
"prettier": "*",
"sass-loader": "^12.6.0",
"sass-loader": "*",
"style-loader": "~3.3.1",
"typescript": "*",
"webpack": "*"
Expand Down
4 changes: 2 additions & 2 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@types/wicg-file-system-access": "^2020.9.5",
"babel-loader": "^8.2.5",
"circular-dependency-plugin": "^5.2.2",
"css-loader": "^6.7.1",
"css-loader": "*",
"dotenv": "^16.0.0",
"eslint": "*",
"eslint-config-prettier": "^8.5.0",
Expand All @@ -44,7 +44,7 @@
"node-sass": "*",
"npm-check-updates": "^12.5.9",
"prettier": "*",
"sass-loader": "^12.6.0",
"sass-loader": "*",
"svg-jest": "^1.0.1",
"ts-jest": "^27.1.4",
"ts-loader": "^9.2.8",
Expand Down
118 changes: 51 additions & 67 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4948,10 +4948,12 @@ __metadata:
"@standardnotes/snjs": ^2.117.7
"@typescript-eslint/eslint-plugin": ^5.20.0
"@typescript-eslint/parser": ^5.20.0
css-loader: ^6.7.1
eslint: ^8.17.0
husky: ^8.0.0
lint-staged: ^13.0.1
prettier: ^2.6.2
sass-loader: ^13.0.0
typescript: ^4.7.3
webpack: ^5.72.0
webpack-cli: ^4.9.2
Expand Down Expand Up @@ -4984,7 +4986,7 @@ __metadata:
"@standardnotes/styles": "workspace:*"
"@svgr/webpack": ^6.2.1
babel-loader: ^8.2.5
css-loader: ^6.7.1
css-loader: "*"
eslint: "*"
eslint-plugin-react: ^7.30.0
html-webpack-plugin: ^5.5.0
Expand All @@ -5000,7 +5002,7 @@ __metadata:
react-beautiful-dnd: ^13.1.0
react-color: ^2.19.3
react-dom: ^18.2.0
sass-loader: ^13.0.0
sass-loader: "*"
style-loader: ~3.3.1
svg-url-loader: ^7.1.1
terser-webpack-plugin: ^5.3.3
Expand Down Expand Up @@ -5911,12 +5913,12 @@ __metadata:
version: 0.0.0-use.local
resolution: "@standardnotes/styles@workspace:packages/styles"
dependencies:
css-loader: ~6.6.0
css-loader: "*"
eslint: "*"
mini-css-extract-plugin: ^2.5.3
node-sass: "*"
prettier: "*"
sass-loader: ^12.6.0
sass-loader: "*"
style-loader: ~3.3.1
typescript: "*"
webpack: "*"
Expand Down Expand Up @@ -6008,7 +6010,7 @@ __metadata:
"@zip.js/zip.js": ^2.4.10
babel-loader: ^8.2.5
circular-dependency-plugin: ^5.2.2
css-loader: ^6.7.1
css-loader: "*"
dotenv: ^16.0.0
eslint: "*"
eslint-config-prettier: ^8.5.0
Expand All @@ -6030,7 +6032,7 @@ __metadata:
react-dnd-html5-backend: ^16.0.1
react-dnd-touch-backend: ^16.0.1
react-dom: ^18.1.0
sass-loader: ^12.6.0
sass-loader: "*"
styled-components: ^5.3.5
svg-jest: ^1.0.1
ts-jest: ^27.1.4
Expand Down Expand Up @@ -12049,41 +12051,41 @@ __metadata:
languageName: node
linkType: hard

"css-loader@npm:^5.0.1, css-loader@npm:^5.1.0, css-loader@npm:^5.1.3, css-loader@npm:^5.2.0, css-loader@npm:^5.2.6":
version: 5.2.7
resolution: "css-loader@npm:5.2.7"
"css-loader@npm:*, css-loader@npm:^6.5.1, css-loader@npm:^6.7.1":
version: 6.7.1
resolution: "css-loader@npm:6.7.1"
dependencies:
icss-utils: ^5.1.0
loader-utils: ^2.0.0
postcss: ^8.2.15
postcss: ^8.4.7
postcss-modules-extract-imports: ^3.0.0
postcss-modules-local-by-default: ^4.0.0
postcss-modules-scope: ^3.0.0
postcss-modules-values: ^4.0.0
postcss-value-parser: ^4.1.0
schema-utils: ^3.0.0
postcss-value-parser: ^4.2.0
semver: ^7.3.5
peerDependencies:
webpack: ^4.27.0 || ^5.0.0
checksum: fb0742b30ac0919f94b99a323bdefe6d48ae46d66c7d966aae59031350532f368f8bba5951fcd268f2e053c5e6e4655551076268e9073ccb58e453f98ae58f8e
webpack: ^5.0.0
checksum: 170fdbc630a05a43679ef60fa97694766b568dbde37adccc0faafa964fc675f08b976bc68837bb73b61d60240e8d2cbcbf51540fe94ebc9dafc56e7c46ba5527
languageName: node
linkType: hard

"css-loader@npm:^6.5.1, css-loader@npm:^6.7.1":
version: 6.7.1
resolution: "css-loader@npm:6.7.1"
"css-loader@npm:^5.0.1, css-loader@npm:^5.1.0, css-loader@npm:^5.1.3, css-loader@npm:^5.2.0, css-loader@npm:^5.2.6":
version: 5.2.7
resolution: "css-loader@npm:5.2.7"
dependencies:
icss-utils: ^5.1.0
postcss: ^8.4.7
loader-utils: ^2.0.0
postcss: ^8.2.15
postcss-modules-extract-imports: ^3.0.0
postcss-modules-local-by-default: ^4.0.0
postcss-modules-scope: ^3.0.0
postcss-modules-values: ^4.0.0
postcss-value-parser: ^4.2.0
postcss-value-parser: ^4.1.0
schema-utils: ^3.0.0
semver: ^7.3.5
peerDependencies:
webpack: ^5.0.0
checksum: 170fdbc630a05a43679ef60fa97694766b568dbde37adccc0faafa964fc675f08b976bc68837bb73b61d60240e8d2cbcbf51540fe94ebc9dafc56e7c46ba5527
webpack: ^4.27.0 || ^5.0.0
checksum: fb0742b30ac0919f94b99a323bdefe6d48ae46d66c7d966aae59031350532f368f8bba5951fcd268f2e053c5e6e4655551076268e9073ccb58e453f98ae58f8e
languageName: node
linkType: hard

Expand All @@ -12109,24 +12111,6 @@ __metadata:
languageName: node
linkType: hard

"css-loader@npm:~6.6.0":
version: 6.6.0
resolution: "css-loader@npm:6.6.0"
dependencies:
icss-utils: ^5.1.0
postcss: ^8.4.5
postcss-modules-extract-imports: ^3.0.0
postcss-modules-local-by-default: ^4.0.0
postcss-modules-scope: ^3.0.0
postcss-modules-values: ^4.0.0
postcss-value-parser: ^4.2.0
semver: ^7.3.5
peerDependencies:
webpack: ^5.0.0
checksum: cc4117320c2bfbbc3e84cdf811fb29219f1900cf4dcebb7dbf916b7cbdfc193cd9017d19b62be2d57d22baeb791919de52bf2e3086213d184875813817ac290f
languageName: node
linkType: hard

"css-minimizer-webpack-plugin@npm:^3.2.0":
version: 3.4.1
resolution: "css-minimizer-webpack-plugin@npm:3.4.1"
Expand Down Expand Up @@ -25322,7 +25306,7 @@ __metadata:
languageName: node
linkType: hard

"postcss@npm:^8.2.15, postcss@npm:^8.3.5, postcss@npm:^8.4.14, postcss@npm:^8.4.4, postcss@npm:^8.4.5, postcss@npm:^8.4.7":
"postcss@npm:^8.2.15, postcss@npm:^8.3.5, postcss@npm:^8.4.14, postcss@npm:^8.4.4, postcss@npm:^8.4.7":
version: 8.4.14
resolution: "postcss@npm:8.4.14"
dependencies:
Expand Down Expand Up @@ -28121,64 +28105,66 @@ __metadata:
languageName: node
linkType: hard

"sass-loader@npm:^10.1.1":
version: 10.2.1
resolution: "sass-loader@npm:10.2.1"
"sass-loader@npm:*, sass-loader@npm:^13.0.0":
version: 13.0.0
resolution: "sass-loader@npm:13.0.0"
dependencies:
klona: ^2.0.4
loader-utils: ^2.0.0
neo-async: ^2.6.2
schema-utils: ^3.0.0
semver: ^7.3.2
peerDependencies:
fibers: ">= 3.1.0"
node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0
node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
sass: ^1.3.0
webpack: ^4.36.0 || ^5.0.0
sass-embedded: "*"
webpack: ^5.0.0
peerDependenciesMeta:
fibers:
optional: true
node-sass:
optional: true
sass:
optional: true
checksum: e5bc4a230bfb9103dbd05f72e936e9e31cb35d09922fe90541ad71d0a64abce238b54069cfe51e67c045870093a8e9a218aff63d66468e36dc1cc3d5db4ee83b
sass-embedded:
optional: true
checksum: f7af03813dccf0405eb02917cd10c97571ab81f42e9ea1f3da6d9e96991e076521809a452ad319d57c1a63273ce07c23ddfdbda5cd071a56d261dc28913afdaa
languageName: node
linkType: hard

"sass-loader@npm:^11.0.1":
version: 11.1.1
resolution: "sass-loader@npm:11.1.1"
"sass-loader@npm:^10.1.1":
version: 10.2.1
resolution: "sass-loader@npm:10.2.1"
dependencies:
klona: ^2.0.4
loader-utils: ^2.0.0
neo-async: ^2.6.2
schema-utils: ^3.0.0
semver: ^7.3.2
peerDependencies:
fibers: ">= 3.1.0"
node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0
sass: ^1.3.0
webpack: ^5.0.0
webpack: ^4.36.0 || ^5.0.0
peerDependenciesMeta:
fibers:
optional: true
node-sass:
optional: true
sass:
optional: true
checksum: e969351003cfb2db09fea9100d6075cd4a188b04596e0c950dbd3b3367635d25f474ce06a15fb2b4e85e29f115ace49eaa3e0d4a1ab1c096f12c598b048b2963
checksum: e5bc4a230bfb9103dbd05f72e936e9e31cb35d09922fe90541ad71d0a64abce238b54069cfe51e67c045870093a8e9a218aff63d66468e36dc1cc3d5db4ee83b
languageName: node
linkType: hard

"sass-loader@npm:^12.3.0, sass-loader@npm:^12.6.0":
version: 12.6.0
resolution: "sass-loader@npm:12.6.0"
"sass-loader@npm:^11.0.1":
version: 11.1.1
resolution: "sass-loader@npm:11.1.1"
dependencies:
klona: ^2.0.4
neo-async: ^2.6.2
peerDependencies:
fibers: ">= 3.1.0"
node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0
sass: ^1.3.0
sass-embedded: "*"
webpack: ^5.0.0
peerDependenciesMeta:
fibers:
Expand All @@ -28187,15 +28173,13 @@ __metadata:
optional: true
sass:
optional: true
sass-embedded:
optional: true
checksum: 5d73a428588150f704016aa27397941bb9246cecd2ee083b573e95d969fc080ac6a16f2fe1cc64aca08f6e70da6f3c586ee68f0efc9f527fecc360e5f1c299ec
checksum: e969351003cfb2db09fea9100d6075cd4a188b04596e0c950dbd3b3367635d25f474ce06a15fb2b4e85e29f115ace49eaa3e0d4a1ab1c096f12c598b048b2963
languageName: node
linkType: hard

"sass-loader@npm:^13.0.0":
version: 13.0.0
resolution: "sass-loader@npm:13.0.0"
"sass-loader@npm:^12.3.0":
version: 12.6.0
resolution: "sass-loader@npm:12.6.0"
dependencies:
klona: ^2.0.4
neo-async: ^2.6.2
Expand All @@ -28214,7 +28198,7 @@ __metadata:
optional: true
sass-embedded:
optional: true
checksum: f7af03813dccf0405eb02917cd10c97571ab81f42e9ea1f3da6d9e96991e076521809a452ad319d57c1a63273ce07c23ddfdbda5cd071a56d261dc28913afdaa
checksum: 5d73a428588150f704016aa27397941bb9246cecd2ee083b573e95d969fc080ac6a16f2fe1cc64aca08f6e70da6f3c586ee68f0efc9f527fecc360e5f1c299ec
languageName: node
linkType: hard

Expand Down