From 4deebb0185fd60bfa5629ea5ad25d25b581a8d06 Mon Sep 17 00:00:00 2001 From: Mariusz Kogut Date: Fri, 27 Oct 2017 21:06:41 +0200 Subject: [PATCH 1/7] Integrate sass --- .npmrc | 2 ++ packages/react-scripts/.npmrc | 2 ++ .../config/webpack.config.dev.js | 18 ++++++++++++- packages/react-scripts/package.json | 4 ++- packages/react-scripts/template/.npmrc | 2 ++ .../react-scripts/template/public/favicon.ico | Bin 3870 -> 6083 bytes packages/react-scripts/template/src/App.css | 24 ------------------ packages/react-scripts/template/src/App.tsx | 8 +++--- .../template/src/theme/styles.scss | 3 +++ 9 files changed, 33 insertions(+), 30 deletions(-) create mode 100644 .npmrc create mode 100644 packages/react-scripts/.npmrc create mode 100644 packages/react-scripts/template/.npmrc delete mode 100644 packages/react-scripts/template/src/App.css create mode 100644 packages/react-scripts/template/src/theme/styles.scss diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..fd8c09f54 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +registry=https://swisslife.pkgs.visualstudio.com/_packaging/NpmMain/npm/registry +always-auth=true \ No newline at end of file diff --git a/packages/react-scripts/.npmrc b/packages/react-scripts/.npmrc new file mode 100644 index 000000000..fd8c09f54 --- /dev/null +++ b/packages/react-scripts/.npmrc @@ -0,0 +1,2 @@ +registry=https://swisslife.pkgs.visualstudio.com/_packaging/NpmMain/npm/registry +always-auth=true \ No newline at end of file diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js index 07c0a3adf..977c084ad 100644 --- a/packages/react-scripts/config/webpack.config.dev.js +++ b/packages/react-scripts/config/webpack.config.dev.js @@ -170,6 +170,22 @@ module.exports = { include: paths.appSrc, loader: require.resolve('ts-loader'), }, + // [f2c] add scss loader + { + test: /\.scss$/, + include: paths.appSrc, + use: [ + { + loader: require.resolve('style-loader') + }, + { + loader: require.resolve('css-loader'), + }, + { + loader: require.resolve('sass-loader'), + } + ] + }, // "postcss" loader applies autoprefixer to our CSS. // "css" loader resolves paths in CSS and adds assets as dependencies. // "style" loader turns CSS into JS modules that inject