chore: update reshadow

This commit is contained in:
Wroud
2020-05-13 19:16:34 +03:00
parent c93b3304c2
commit 950580b8d0
21 changed files with 65 additions and 72 deletions
+6 -13
View File
@@ -28,9 +28,10 @@ class IgnoreNotFoundExportPlugin {
module.exports = (env, argv) => {
function generateStyleLoaders(options = { hasModule: false, hasReshadow: false }) {
function generateStyleLoaders(options = { hasModule: false }) {
const moduleScope = options.hasModule ? 'local' : 'global';
const modules = {
mode: options.hasModule ? 'local' : 'global',
mode: moduleScope,
localIdentName: '[local]___[hash:base64:5]',
};
@@ -40,12 +41,9 @@ module.exports = (env, argv) => {
includePaths: ['node_modules', path.resolve('../../node_modules')],
}),
require('postcss-discard-comments'),
require('reshadow/postcss')({ scopeBehaviour: moduleScope })
];
if (options.hasReshadow) {
postCssPlugins.push(require('reshadow/postcss'));
}
// 'use' clause in webpack rules
return [
{
@@ -114,12 +112,7 @@ module.exports = (env, argv) => {
// css-module files ( should have *.module mask )
{
test: /\.module\.(css|scss|sass)$/,
use: generateStyleLoaders({ hasModule: true, hasReshadow: true }),
},
// not css-module files - 3 ways to treat them
{
test: /\.raw\.(css|scss|sass)$/,
use: generateStyleLoaders({ hasModule: false, hasReshadow: false }),
use: generateStyleLoaders({ hasModule: true }),
},
{
include: /node_modules/,
@@ -134,7 +127,7 @@ module.exports = (env, argv) => {
]
},
{
use: generateStyleLoaders({ hasModule: false, hasReshadow: true }),
use: generateStyleLoaders({ hasModule: false }),
}
]
},
@@ -25,7 +25,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
+1 -1
View File
@@ -18,7 +18,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
+1 -1
View File
@@ -32,7 +32,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
@@ -9,7 +9,7 @@
import { ThemeSelector } from '@dbeaver/core/theming';
export const agGridStyles: ThemeSelector = async (theme) => {
const baseStyles = await import('./base.raw.scss');
const baseStyles = await import('./base.scss');
let styles: any;
switch (theme) {
@@ -27,7 +27,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
+1 -1
View File
@@ -43,7 +43,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
},
"buildVersion": "0.13.0",
@@ -8,10 +8,10 @@
import { action, computed, observable } from 'mobx';
import './styles/main/normalize.raw.css';
import './styles/main/elevation.raw.scss';
import './styles/main/typography.raw.scss';
import './styles/main/color.raw.scss';
import './styles/main/normalize.css';
import './styles/main/elevation.scss';
import './styles/main/typography.scss';
import './styles/main/color.scss';
import { injectable } from '@dbeaver/core/di';
import { DbeaverError, NotificationService } from '@dbeaver/core/eventsLog';
import { SettingsService } from '@dbeaver/core/settings';
@@ -27,7 +27,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
@@ -19,7 +19,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
@@ -28,7 +28,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
+1 -1
View File
@@ -53,7 +53,7 @@
"react-dom": "^16.13.1",
"reakit": "1.0.0-beta.11",
"reflect-metadata": "^0.1.13",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
},
"buildVersion": "0.13.0",
@@ -27,7 +27,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
@@ -26,7 +26,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
+1 -1
View File
@@ -29,7 +29,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"reakit": "^1.0.0-beta.11",
"reshadow": "0.0.1-alpha.75",
"reshadow": "0.0.1-alpha.77",
"rxjs": "^6.5.5"
}
}
+42 -42
View File
@@ -2354,17 +2354,17 @@
dependencies:
"@types/node" ">= 8"
"@reshadow/babel@^0.0.1-alpha.75":
version "0.0.1-alpha.75"
resolved "https://registry.yarnpkg.com/@reshadow/babel/-/babel-0.0.1-alpha.75.tgz#4bbb4f7f18d84bd20b8d2201aa3d71c85f0dbbb2"
integrity sha512-5ShaqT9C3o/E49J6B5OKQiTN0B1X1GOaI0doKeiVlXqs7kteeQvf+M+TDyJZb9rJXEkwQatqKLbj60HjDwCbdw==
"@reshadow/babel@^0.0.1-alpha.76":
version "0.0.1-alpha.76"
resolved "https://registry.yarnpkg.com/@reshadow/babel/-/babel-0.0.1-alpha.76.tgz#de1e103f015743cc6afa7786b0f255a1fa45677e"
integrity sha512-+BNbDkV6sQJQWEpWVNFEA0B6kiwIZgXf9t7WcvCEEVp7ckb57gapNV18MRxZX7ADVKchlXatyo8V015oqpHbDw==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
"@babel/plugin-syntax-jsx" "^7.2.0"
"@babel/template" "^7.2.2"
"@babel/types" "^7.5.5"
"@reshadow/core" "^0.0.1-alpha.74"
"@reshadow/postcss" "^0.0.1-alpha.72"
"@reshadow/postcss" "^0.0.1-alpha.76"
"@reshadow/utils" "^0.0.1-alpha.75"
common-tags "1.8.0"
css-modules-loader-core "^1.1.0"
@@ -2390,27 +2390,27 @@
resolved "https://registry.yarnpkg.com/@reshadow/core/-/core-0.0.1-alpha.74.tgz#57ea3249ad8162306d0d83e5446a5e7774b81f3e"
integrity sha512-oYATyZXe0gLbOnqDa01T5HeivUiEY7LxyfbTYVX6Q8pIWvfBJE0ftrrJkeKA2PW5HilE7qWxn7tmlX2YQFowSg==
"@reshadow/eslint@^0.0.1-alpha.75":
version "0.0.1-alpha.75"
resolved "https://registry.yarnpkg.com/@reshadow/eslint/-/eslint-0.0.1-alpha.75.tgz#df9d1ddbe81098da144c205184beb1db19ea567b"
integrity sha512-J/4/tvZJAl6uY7eqKbB6/KhATJ9v44Z0YYzoOHd9UXFxFEi69nNBE4NDnT0ypuLNoCWX+9RrdOoEtsG+Okuy6g==
"@reshadow/eslint@^0.0.1-alpha.76":
version "0.0.1-alpha.76"
resolved "https://registry.yarnpkg.com/@reshadow/eslint/-/eslint-0.0.1-alpha.76.tgz#9146e67aedf9f8d37543fbac23429395bbb6da01"
integrity sha512-fdAWBBRzR1xiBxiyMzF3sX5E+KgwUYHOSj/00ue/iVJ0xNhdd/C42FcnFZ/galqNumBcHfVxauVrjWJ0oV5Y1Q==
dependencies:
"@babel/types" "^7.5.5"
"@reshadow/utils" "^0.0.1-alpha.75"
"@reshadow/macro@^0.0.1-alpha.75":
version "0.0.1-alpha.75"
resolved "https://registry.yarnpkg.com/@reshadow/macro/-/macro-0.0.1-alpha.75.tgz#15a847a55844650ab505de58583652ed29e9181b"
integrity sha512-1GE52iOpYyv4ziAX9XRioKQIc8uWQ2RYXBDuhwlcGnWnBp02qLELn74uOJQ62DZDoU2oTnK/MxDzFBqIJnerzA==
"@reshadow/macro@^0.0.1-alpha.76":
version "0.0.1-alpha.76"
resolved "https://registry.yarnpkg.com/@reshadow/macro/-/macro-0.0.1-alpha.76.tgz#f11d75015639b69440bc15fc1947c0b8141b4975"
integrity sha512-g6Qt2mBWijMSxwWhX9gixE6RdNKs80FnmIy3zfndeEE0SqUv27FK4t8Q3Yp0oolIyPqPJkvNANVZ3RxRTbLUIw==
dependencies:
"@reshadow/babel" "^0.0.1-alpha.75"
"@reshadow/babel" "^0.0.1-alpha.76"
"@reshadow/core" "^0.0.1-alpha.74"
babel-plugin-macros "2.5.1"
"@reshadow/postcss@^0.0.1-alpha.72":
version "0.0.1-alpha.72"
resolved "https://registry.yarnpkg.com/@reshadow/postcss/-/postcss-0.0.1-alpha.72.tgz#b1994cc8f4dcf5f1291a336be8b7aafd5b4983bc"
integrity sha512-qLViy0rMF7nJv2PdnRT9NmNlBwAAjpSkGOQEl6iED4SyHj7zeifyLuCYwl4XYSMZSU50lFY1cL1l8WGP29zydA==
"@reshadow/postcss@^0.0.1-alpha.76":
version "0.0.1-alpha.76"
resolved "https://registry.yarnpkg.com/@reshadow/postcss/-/postcss-0.0.1-alpha.76.tgz#0957b1f87134dd0f8dea6660b8359eb96fef97c4"
integrity sha512-VYqh1z6fytNpu1ENA/KfO18IqBSkOeyDLckuWpVPo3fvIXIc+6AQWgRGYv+3P5UQ0eDwcNVzmgZUZZ+/tX7Tag==
dependencies:
postcss "7.0.17"
postcss-selector-parser "6.0.2"
@@ -2422,10 +2422,10 @@
dependencies:
prettier "1.18.2"
"@reshadow/react@^0.0.1-alpha.75":
version "0.0.1-alpha.75"
resolved "https://registry.yarnpkg.com/@reshadow/react/-/react-0.0.1-alpha.75.tgz#1a40bd615e1aa9d3bcc1a56acf426a1ba6172b86"
integrity sha512-tgLf98mkMsOFtISMkX4AVU2F0k4E/qsrPwD7unrIzpwzhHidMADI9MyxlB7teu85MS26IoyotajuyOrhJwxVSQ==
"@reshadow/react@^0.0.1-alpha.77":
version "0.0.1-alpha.77"
resolved "https://registry.yarnpkg.com/@reshadow/react/-/react-0.0.1-alpha.77.tgz#b520b74d801b933d254b7e1233ab711e3b996118"
integrity sha512-jOYsBIRNBnE9kkyil/H10y3frDyaSIGKRtbCHbHJJ5v7Vtog0p1J4W+yw7lroc34v/i333XJuyc7YIAHQuIgow==
dependencies:
"@reshadow/core" "^0.0.1-alpha.74"
"@reshadow/runtime" "^0.0.1-alpha.74"
@@ -2443,16 +2443,16 @@
"@reshadow/core" "^0.0.1-alpha.74"
string-hash "^1.1.3"
"@reshadow/svelte@^0.0.1-alpha.75":
version "0.0.1-alpha.75"
resolved "https://registry.yarnpkg.com/@reshadow/svelte/-/svelte-0.0.1-alpha.75.tgz#a80d08b41911ba9940f4c211cc2e32efc95a66d0"
integrity sha512-Yi6wqAd9Rzhg25ngHYek010DgxLmSTdjpKCTiu+HpBxa0Rfhz36ht3AB9Cs5Nnf0KaqBYnq0s3aXAh8puAYDZg==
"@reshadow/svelte@^0.0.1-alpha.76":
version "0.0.1-alpha.76"
resolved "https://registry.yarnpkg.com/@reshadow/svelte/-/svelte-0.0.1-alpha.76.tgz#3a4c1b524aa9bd3d06a84f5e01df8a94a823964e"
integrity sha512-I32evIUABRy+g5S34VLHg8tnHpR4SVD4l8mzkZNCngOEh0rWY8Nf8cm8uVERa54nu5+hZRYdgsVQ0WUxsvfwzw==
dependencies:
"@babel/generator" "^7.5.5"
"@babel/parser" "^7.5.5"
"@babel/traverse" "^7.5.5"
"@babel/types" "^7.5.5"
"@reshadow/babel" "^0.0.1-alpha.75"
"@reshadow/babel" "^0.0.1-alpha.76"
"@reshadow/core" "^0.0.1-alpha.74"
common-tags "1.8.0"
svelte "^3.6.7"
@@ -2474,10 +2474,10 @@
dependencies:
"@reshadow/core" "^0.0.1-alpha.74"
"@reshadow/webpack@^0.0.1-alpha.75":
version "0.0.1-alpha.75"
resolved "https://registry.yarnpkg.com/@reshadow/webpack/-/webpack-0.0.1-alpha.75.tgz#6691f05441b7ded1bfff4dd90177a44a4171af07"
integrity sha512-dzP0LUaRWSpGsYRbaaU5EmpSqiEScdguVDmD5QDQl+gbOzjy2HnyGJ3IbEWeg4dqJMXImldVBF4kJkd0JNdoHQ==
"@reshadow/webpack@^0.0.1-alpha.77":
version "0.0.1-alpha.77"
resolved "https://registry.yarnpkg.com/@reshadow/webpack/-/webpack-0.0.1-alpha.77.tgz#725a39e79c39c519cf31e650f7fb7d5c62badec7"
integrity sha512-8Y05FyO/iRmJ32isvR5C5jsno/Wkiq9gmCPlzUDKQNAYA92ZAeqhHvx1byS8G8v6Vh1iHbyAKFrqySK8TgoOVw==
dependencies:
"@reshadow/utils" "^0.0.1-alpha.75"
find-cache-dir "^3.0.0"
@@ -11592,21 +11592,21 @@ requires-port@^1.0.0:
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
reshadow@0.0.1-alpha.75:
version "0.0.1-alpha.75"
resolved "https://registry.yarnpkg.com/reshadow/-/reshadow-0.0.1-alpha.75.tgz#f8ba5345b8f5856c71fa04fabc2e9161cb374cad"
integrity sha512-KqhA1Xr8KcC/PxJdI2fFXv1g59P6Ki7peLXtnlP2mPQ0ZxLjt96LnQmMQp55NZvZOB3rCqYcDhGizMRHSNK+Qg==
reshadow@0.0.1-alpha.77:
version "0.0.1-alpha.77"
resolved "https://registry.yarnpkg.com/reshadow/-/reshadow-0.0.1-alpha.77.tgz#7958e5f17a9595f7517de95c540d6428707fe645"
integrity sha512-tsJjExIvn/DCT/lv+Bm35e+7MWuPV/HcsB70+xz1oCLCKmFUDlDp/43pTMfF070OLzB5fwWHV8caNyPPUxMOjg==
dependencies:
"@reshadow/babel" "^0.0.1-alpha.75"
"@reshadow/babel" "^0.0.1-alpha.76"
"@reshadow/core" "^0.0.1-alpha.74"
"@reshadow/eslint" "^0.0.1-alpha.75"
"@reshadow/macro" "^0.0.1-alpha.75"
"@reshadow/postcss" "^0.0.1-alpha.72"
"@reshadow/eslint" "^0.0.1-alpha.76"
"@reshadow/macro" "^0.0.1-alpha.76"
"@reshadow/postcss" "^0.0.1-alpha.76"
"@reshadow/prettier" "0.0.1-alpha.70"
"@reshadow/react" "^0.0.1-alpha.75"
"@reshadow/svelte" "^0.0.1-alpha.75"
"@reshadow/react" "^0.0.1-alpha.77"
"@reshadow/svelte" "^0.0.1-alpha.76"
"@reshadow/vue" "^0.0.1-alpha.74"
"@reshadow/webpack" "^0.0.1-alpha.75"
"@reshadow/webpack" "^0.0.1-alpha.77"
resolve-cwd@^2.0.0:
version "2.0.0"