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.

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

Fix icons in example applications #7800

Merged
merged 10 commits into from Jan 20, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions dev_mode/package.json
Expand Up @@ -75,8 +75,6 @@
"source-map-loader": "~0.2.4",
"style-loader": "~1.0.1",
"svg-url-loader": "~3.0.3",
"svgo": "~1.3.2",
"svgo-loader": "~2.2.1",
"terser-webpack-plugin": "^2.3.0",
"url-loader": "~3.0.0",
"webpack": "^4.41.2",
Expand Down
6 changes: 3 additions & 3 deletions dev_mode/webpack.config.js
Expand Up @@ -193,7 +193,7 @@ module.exports = [
},
{ test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, use: 'file-loader' },
{
// in css files, svg is loaded as a url formatted string
// In .css files, svg is loaded as a data URI.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.css$/ },
use: {
Expand All @@ -202,8 +202,8 @@ module.exports = [
}
},
{
// in ts and tsx files (both of which compile to js),
// svg is loaded as a raw string
// In .ts and .tsx files (both of which compile to .js), svg files
// must be loaded as a raw string instead of data URIs.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.js$/ },
use: {
Expand Down
2 changes: 0 additions & 2 deletions examples/app/package.json
Expand Up @@ -53,8 +53,6 @@
"rimraf": "~3.0.0",
"style-loader": "~1.0.1",
"svg-url-loader": "~3.0.3",
"svgo": "~1.3.2",
"svgo-loader": "~2.2.1",
"url-loader": "~3.0.0",
"watch": "~1.0.2",
"webpack": "^4.41.2",
Expand Down
16 changes: 15 additions & 1 deletion examples/app/webpack.config.js
Expand Up @@ -47,8 +47,22 @@ module.exports = [
},
{ test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, use: 'file-loader' },
{
// In .css files, svg is loaded as a data URI.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
use: 'url-loader?limit=10000&mimetype=image/svg+xml'
issuer: { test: /\.css$/ },
use: {
loader: 'svg-url-loader',
options: { encoding: 'none', limit: 10000 }
}
},
{
// In .ts and .tsx files (both of which compile to .js), svg files
// must be loaded as a raw string instead of data URIs.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.js$/ },
use: {
loader: 'raw-loader'
}
}
]
}
Expand Down
2 changes: 0 additions & 2 deletions examples/cell/package.json
Expand Up @@ -27,8 +27,6 @@
"rimraf": "~3.0.0",
"style-loader": "~1.0.1",
"svg-url-loader": "~3.0.3",
"svgo": "~1.3.2",
"svgo-loader": "~2.2.1",
"typescript": "~3.7.3",
"url-loader": "~3.0.0",
"watch": "~1.0.2",
Expand Down
21 changes: 16 additions & 5 deletions examples/cell/webpack.config.js
Expand Up @@ -14,11 +14,22 @@ module.exports = {
{ test: /\.md$/, use: 'raw-loader' },
{ test: /\.js.map$/, use: 'file-loader' },
{
test: /\.svg/,
use: [
{ loader: 'svg-url-loader', options: {} },
{ loader: 'svgo-loader', options: { plugins: [] } }
]
// In .css files, svg is loaded as a data URI.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.css$/ },
use: {
loader: 'svg-url-loader',
options: { encoding: 'none', limit: 10000 }
}
},
{
// In .ts and .tsx files (both of which compile to .js), svg files
// must be loaded as a raw string instead of data URIs.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.js$/ },
use: {
loader: 'raw-loader'
}
},
{
test: /\.(png|jpg|gif|ttf|woff|woff2|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
Expand Down
3 changes: 0 additions & 3 deletions examples/console/package.json
Expand Up @@ -25,9 +25,6 @@
"raw-loader": "~4.0.0",
"rimraf": "~3.0.0",
"style-loader": "~1.0.1",
"svg-url-loader": "~3.0.3",
"svgo": "~1.3.2",
"svgo-loader": "~2.2.1",
"typescript": "~3.7.3",
"url-loader": "~3.0.0",
"watch": "~1.0.2",
Expand Down
21 changes: 16 additions & 5 deletions examples/console/webpack.config.js
Expand Up @@ -14,11 +14,22 @@ module.exports = {
{ test: /\.md$/, use: 'raw-loader' },
{ test: /\.js.map$/, use: 'file-loader' },
{
test: /\.svg/,
use: [
{ loader: 'svg-url-loader', options: {} },
{ loader: 'svgo-loader', options: { plugins: [] } }
]
// In .css files, svg is loaded as a data URI.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.css$/ },
use: {
loader: 'svg-url-loader',
options: { encoding: 'none', limit: 10000 }
}
},
{
// In .ts and .tsx files (both of which compile to .js), svg files
// must be loaded as a raw string instead of data URIs.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.js$/ },
use: {
loader: 'raw-loader'
}
},
{
test: /\.(png|jpg|gif|ttf|woff|woff2|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
Expand Down
2 changes: 0 additions & 2 deletions examples/filebrowser/package.json
Expand Up @@ -30,8 +30,6 @@
"rimraf": "~3.0.0",
"style-loader": "~1.0.1",
"svg-url-loader": "~3.0.3",
"svgo": "~1.3.2",
"svgo-loader": "~2.2.1",
"typescript": "~3.7.3",
"url-loader": "~3.0.0",
"watch": "~1.0.2",
Expand Down
21 changes: 16 additions & 5 deletions examples/filebrowser/webpack.config.js
Expand Up @@ -14,11 +14,22 @@ module.exports = {
{ test: /\.md$/, use: 'raw-loader' },
{ test: /\.js.map$/, use: 'file-loader' },
{
test: /\.svg/,
use: [
{ loader: 'svg-url-loader', options: {} },
{ loader: 'svgo-loader', options: { plugins: [] } }
]
// In .css files, svg is loaded as a data URI.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.css$/ },
use: {
loader: 'svg-url-loader',
options: { encoding: 'none', limit: 10000 }
}
},
{
// In .ts and .tsx files (both of which compile to .js), svg files
// must be loaded as a raw string instead of data URIs.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.js$/ },
use: {
loader: 'raw-loader'
}
},
{
test: /\.(png|jpg|gif|ttf|woff|woff2|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
Expand Down
2 changes: 0 additions & 2 deletions examples/notebook/package.json
Expand Up @@ -31,8 +31,6 @@
"rimraf": "~3.0.0",
"style-loader": "~1.0.1",
"svg-url-loader": "~3.0.3",
"svgo": "~1.3.2",
"svgo-loader": "~2.2.1",
"typescript": "~3.7.3",
"url-loader": "~3.0.0",
"watch": "~1.0.2",
Expand Down
23 changes: 17 additions & 6 deletions examples/notebook/webpack.config.js
Expand Up @@ -6,19 +6,30 @@ module.exports = {
},
bail: true,
devtool: 'cheap-source-map',
mode: 'production',
mode: 'development',
module: {
rules: [
{ test: /\.css$/, use: ['style-loader', 'css-loader'] },
{ test: /\.html$/, use: 'file-loader' },
{ test: /\.md$/, use: 'raw-loader' },
{ test: /\.js.map$/, use: 'file-loader' },
{
test: /\.svg/,
use: [
{ loader: 'svg-url-loader', options: {} },
{ loader: 'svgo-loader', options: { plugins: [] } }
]
// In .css files, svg is loaded as a data URI.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.css$/ },
use: {
loader: 'svg-url-loader',
options: { encoding: 'none', limit: 10000 }
}
},
{
// In .ts and .tsx files (both of which compile to .js), svg files
// must be loaded as a raw string instead of data URIs.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.js$/ },
use: {
loader: 'raw-loader'
}
},
{
test: /\.(png|jpg|gif|ttf|woff|woff2|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
Expand Down
2 changes: 0 additions & 2 deletions examples/terminal/package.json
Expand Up @@ -22,8 +22,6 @@
"rimraf": "~3.0.0",
"style-loader": "~1.0.1",
"svg-url-loader": "~3.0.3",
"svgo": "~1.3.2",
"svgo-loader": "~2.2.1",
"typescript": "~3.7.3",
"url-loader": "~3.0.0",
"watch": "~1.0.2",
Expand Down
22 changes: 16 additions & 6 deletions examples/terminal/webpack.config.js
Expand Up @@ -12,13 +12,23 @@ module.exports = {
{ test: /\.css$/, use: ['style-loader', 'css-loader'] },
{ test: /\.html$/, use: 'file-loader' },
{ test: /\.md$/, use: 'raw-loader' },
{ test: /\.js.map$/, use: 'file-loader' },
{
test: /\.svg/,
use: [
{ loader: 'svg-url-loader', options: {} },
{ loader: 'svgo-loader', options: { plugins: [] } }
]
// In .css files, svg is loaded as a data URI.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.css$/ },
use: {
loader: 'svg-url-loader',
options: { encoding: 'none', limit: 10000 }
}
},
{
// In .ts and .tsx files (both of which compile to .js), svg files
// must be loaded as a raw string instead of data URIs.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.js$/ },
use: {
loader: 'raw-loader'
}
},
{
test: /\.(png|jpg|gif|ttf|woff|woff2|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
Expand Down
2 changes: 0 additions & 2 deletions jupyterlab/staging/package.json
Expand Up @@ -75,8 +75,6 @@
"source-map-loader": "~0.2.4",
"style-loader": "~1.0.1",
"svg-url-loader": "~3.0.3",
"svgo": "~1.3.2",
"svgo-loader": "~2.2.1",
"terser-webpack-plugin": "^2.3.0",
"url-loader": "~3.0.0",
"webpack": "^4.41.2",
Expand Down
6 changes: 3 additions & 3 deletions jupyterlab/staging/webpack.config.js
Expand Up @@ -196,7 +196,7 @@ module.exports = [
},
{ test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, use: 'file-loader' },
{
// in css files, svg is loaded as a url formatted string
// In .css files, svg is loaded as a data URI.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.css$/ },
use: {
Expand All @@ -205,8 +205,8 @@ module.exports = [
}
},
{
// in ts and tsx files (both of which compile to js),
// svg is loaded as a raw string
// In .ts and .tsx files (both of which compile to .js), svg files
// must be loaded as a raw string instead of data URIs.
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
issuer: { test: /\.js$/ },
use: {
Expand Down