Merge pull request #7800 from afshin/fix-example-icons

Fix icons in example applications
jupyterlab · Jan 20, 2020 · f17f59c · f17f59c
2 parents c1a277c + 5092ae9
commit f17f59c
Show file tree

Hide file tree

Showing 19 changed files with 125 additions and 443 deletions.
diff --git a/dev_mode/package.json b/dev_mode/package.json
@@ -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",

diff --git a/dev_mode/webpack.config.js b/dev_mode/webpack.config.js
@@ -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: {
@@ -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: {

diff --git a/examples/app/package.json b/examples/app/package.json
@@ -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",

diff --git a/examples/app/webpack.config.js b/examples/app/webpack.config.js
@@ -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'
+          }
         }
       ]
     }

diff --git a/examples/cell/package.json b/examples/cell/package.json
@@ -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",

diff --git a/examples/cell/webpack.config.js b/examples/cell/webpack.config.js
@@ -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])?$/,

diff --git a/examples/console/package.json b/examples/console/package.json
@@ -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",

diff --git a/examples/console/webpack.config.js b/examples/console/webpack.config.js
@@ -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])?$/,

diff --git a/examples/filebrowser/package.json b/examples/filebrowser/package.json
@@ -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",

diff --git a/examples/filebrowser/webpack.config.js b/examples/filebrowser/webpack.config.js
@@ -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])?$/,

diff --git a/examples/notebook/package.json b/examples/notebook/package.json
@@ -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",

diff --git a/examples/notebook/webpack.config.js b/examples/notebook/webpack.config.js
@@ -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])?$/,

diff --git a/examples/terminal/package.json b/examples/terminal/package.json
@@ -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",

diff --git a/examples/terminal/webpack.config.js b/examples/terminal/webpack.config.js
@@ -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])?$/,

diff --git a/jupyterlab/staging/package.json b/jupyterlab/staging/package.json
@@ -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",

diff --git a/jupyterlab/staging/webpack.config.js b/jupyterlab/staging/webpack.config.js
@@ -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: {
@@ -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: {