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 unresolved dependencies #823

Merged
merged 4 commits into from
Jan 15, 2025
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"type": "module",
"devDependencies": {
"@rollup/plugin-eslint": "^9.0.5",
"@rollup/plugin-node-resolve": "^16.0.0",
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^12.1.0",
"@types/lodash": "^4.17.13",
Expand Down
16 changes: 13 additions & 3 deletions rollup-base.config.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
import process from 'process';
import path from 'path';

import eslint from '@rollup/plugin-eslint';
import nodeResolve from '@rollup/plugin-node-resolve';
import terser from '@rollup/plugin-terser';
import typescript from '@rollup/plugin-typescript';
import livereload from 'rollup-plugin-livereload';
import postcss from 'rollup-plugin-postcss';

const formats = ['esm'];
const rootDir = path.join(process.cwd(), '..');
const name = path.basename(process.cwd());

/** @type {import("rollup").RollupOptions} */
const generateRollupBaseConfig = (projectName, external) => ({
const generateRollupBaseConfig = () => ({
input: 'src/index.ts',
output: formats.map((format) => ({
file: `dist/index.${format}.js`,
format,
name: projectName,
name,
sourcemap: true,
})),
plugins: [
nodeResolve({ rootDir }),
eslint(),
typescript(),
postcss({
Expand All @@ -31,7 +36,12 @@ const generateRollupBaseConfig = (projectName, external) => ({
watch: 'dist',
}),
],
external,
external: (id, parent, isResolved) => {
if (!isResolved) return false;
const rel = path.relative(rootDir, id);
const filenames = rel.split(path.sep);
return filenames[0] === 'node_modules' || filenames[1] === 'dist';
},
});

export default generateRollupBaseConfig;
1 change: 1 addition & 0 deletions ui-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"react": ">=18.0"
},
"dependencies": {
"@osrd-project/ui-icons": "0.0.1-dev",
"classnames": "^2.5.1",
"tailwindcss": "^3.4.1"
},
Expand Down
3 changes: 2 additions & 1 deletion ui-core/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import generateBaseRollupConfig from '../rollup-base.config.js';
export default generateBaseRollupConfig('osrdcore', ['react']);

export default generateBaseRollupConfig();
3 changes: 2 additions & 1 deletion ui-manchette-with-spacetimechart/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import generateBaseRollupConfig from '../rollup-base.config.js';
export default generateBaseRollupConfig('osrdcore', ['react']);

export default generateBaseRollupConfig();
3 changes: 2 additions & 1 deletion ui-manchette/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import generateBaseRollupConfig from '../rollup-base.config.js';
export default generateBaseRollupConfig('osrdcore', ['react']);

export default generateBaseRollupConfig();
2 changes: 1 addition & 1 deletion ui-spacetimechart/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import generateBaseRollupConfig from '../rollup-base.config.js';

export default generateBaseRollupConfig('osrdcore', ['react']);
export default generateBaseRollupConfig();
2 changes: 1 addition & 1 deletion ui-speedspacechart/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import generateBaseRollupConfig from '../rollup-base.config.js';

export default generateBaseRollupConfig('osrdcore', ['react']);
export default generateBaseRollupConfig();
2 changes: 1 addition & 1 deletion ui-trackoccupancydiagram/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import generateBaseRollupConfig from '../rollup-base.config.js';

export default generateBaseRollupConfig('osrdTrackOccupancyDiagram', ['react']);
export default generateBaseRollupConfig();
19 changes: 2 additions & 17 deletions ui-warped-map/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
import typescript from '@rollup/plugin-typescript';
import terser from '@rollup/plugin-terser';
import eslint from '@rollup/plugin-eslint';
import generateBaseRollupConfig from '../rollup-base.config.js';

const formats = ['esm'];

/** @type {import('rollup').RollupOptions} */
export default {
input: 'src/index.ts',
output: formats.map((format) => ({
file: `dist/index.${format}.js`,
format,
name: 'osrdwarpedmap',
sourcemap: true,
})),
plugins: [eslint(), typescript(), terser()],
external: ['react'],
};
export default generateBaseRollupConfig();
Loading