Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari committed Jul 1, 2020
1 parent 13d0ad9 commit e9d0101
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 40 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ module.exports = {
'react-hooks/exhaustive-deps': ['error', { additionalHooks: 'useEnhancedEffect' }],

'import/no-unresolved': 'off',
'import/no-extraneous-dependencies': 'off',
},
overrides: [],
};
3 changes: 0 additions & 3 deletions packages/demo-app/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ const CopyPlugin = require('copy-webpack-plugin');
module.exports = {
context: __dirname,
entry: ['./src/index.tsx'],
optimization: {
usedExports: true,
},
resolve: {
modules: [
path.resolve(__dirname, 'node_modules'),
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/data-grid/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import resolve from '@rollup/plugin-node-resolve';
import typescript from 'rollup-plugin-typescript2';
import pkg from './package.json';
import cleaner from 'rollup-plugin-cleaner';
import sourceMaps from 'rollup-plugin-sourcemaps';
import { terser } from 'rollup-plugin-terser';
import dts from 'rollup-plugin-dts';
import command from 'rollup-plugin-command';
import pkg from './package.json';

// dev build if watching, prod build if not
const production = !process.env.ROLLUP_WATCH;
Expand All @@ -28,7 +28,7 @@ export default [
external: [...Object.keys(pkg.peerDependencies || {})],
plugins: [
resolve({
resolveOnly: [/^@material-ui\/x\-.*$/], //we bundle x-license and x-grid-modules
resolveOnly: [/^@material-ui\/x-.*$/], // we bundle x-license and x-grid-modules
}),
production &&
cleaner({
Expand Down
5 changes: 2 additions & 3 deletions packages/grid/x-grid-data-generator/bin/data-gen-script.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env node

require = require('esm')(module /*, options*/);

// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line no-global-assign
require = require('esm')(module);

require('../dist/index-cjs').datagenCli(process.argv);
22 changes: 0 additions & 22 deletions packages/grid/x-grid-data-generator/bin/data-gen-script_BAK.js

This file was deleted.

2 changes: 1 addition & 1 deletion packages/grid/x-grid-data-generator/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import typescript from 'rollup-plugin-typescript2';
import pkg from './package.json';
import cleaner from 'rollup-plugin-cleaner';
import sourceMaps from 'rollup-plugin-sourcemaps';
import { terser } from 'rollup-plugin-terser';
import css from 'rollup-plugin-css-only';
import commonjs from 'rollup-plugin-commonjs';
import postcss from 'rollup-plugin-postcss';
import dts from 'rollup-plugin-dts';
import pkg from './package.json';

// dev build if watching, prod build if not
const production = !process.env.ROLLUP_WATCH;
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-grid-modules/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import typescript from 'rollup-plugin-typescript2';
import pkg from './package.json';
import cleaner from 'rollup-plugin-cleaner';
import sourceMaps from 'rollup-plugin-sourcemaps';
import { terser } from 'rollup-plugin-terser';
import dts from 'rollup-plugin-dts';
import pkg from './package.json';

// dev build if watching, prod build if not
const production = !process.env.ROLLUP_WATCH;
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/x-grid/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import typescript from 'rollup-plugin-typescript2';
import { generateReleaseInfo } from '@material-ui/x-license';
import pkg from './package.json';
import cleaner from 'rollup-plugin-cleaner';
import sourceMaps from 'rollup-plugin-sourcemaps';
import { terser } from 'rollup-plugin-terser';
import replace from '@rollup/plugin-replace';
import resolve from '@rollup/plugin-node-resolve';
import dts from 'rollup-plugin-dts';
import command from 'rollup-plugin-command';
import pkg from './package.json';

// dev build if watching, prod build if not
const production = !process.env.ROLLUP_WATCH;
Expand All @@ -33,7 +33,7 @@ export default [
__RELEASE_INFO__: generateReleaseInfo(),
}),
resolve({
resolveOnly: [/^@material-ui\/x\-.*$/], //we bundle x-license and x-grid-modules
resolveOnly: [/^@material-ui\/x-.*$/], // we bundle x-license and x-grid-modules
}),
production &&
cleaner({
Expand Down
5 changes: 2 additions & 3 deletions packages/license/bin/license-gen-script.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env node

require = require('esm')(module /*, options*/);

// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line no-global-assign
require = require('esm')(module);

require('../dist/cjs/license-cli').licenseGenCli(process.argv);
2 changes: 1 addition & 1 deletion packages/license/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import typescript from 'rollup-plugin-typescript2';
import pkg from './package.json';
import cleaner from 'rollup-plugin-cleaner';
import sourceMaps from 'rollup-plugin-sourcemaps';
import { terser } from 'rollup-plugin-terser';
import commonjs from 'rollup-plugin-commonjs';
import dts from 'rollup-plugin-dts';
import pkg from './package.json';

// dev build if watching, prod build if not
const production = !process.env.ROLLUP_WATCH;
Expand Down
2 changes: 1 addition & 1 deletion packages/panel/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import typescript from 'rollup-plugin-typescript2';
import pkg from './package.json';
import cleaner from 'rollup-plugin-cleaner';
import sourceMaps from 'rollup-plugin-sourcemaps';
import { terser } from 'rollup-plugin-terser';
import pkg from './package.json';

// dev build if watching, prod build if not
const production = !process.env.ROLLUP_WATCH;
Expand Down
2 changes: 1 addition & 1 deletion packages/splitter/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import typescript from 'rollup-plugin-typescript2';
import pkg from './package.json';
import cleaner from 'rollup-plugin-cleaner';
import sourceMaps from 'rollup-plugin-sourcemaps';
import { terser } from 'rollup-plugin-terser';
import pkg from './package.json';

// dev build if watching, prod build if not
const production = !process.env.ROLLUP_WATCH;
Expand Down
1 change: 1 addition & 0 deletions packages/storybook/integration/setup/setupTests.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { toMatchImageSnapshot } = require('jest-image-snapshot');

// eslint-disable-next-line no-undef
expect.extend({ toMatchImageSnapshot });

0 comments on commit e9d0101

Please sign in to comment.