Skip to content

Commit

Permalink
refactor: reorganize monorepo to distinguish apps and standalone modules
Browse files Browse the repository at this point in the history
  • Loading branch information
jleveugle authored and jleveugle committed Jan 10, 2019
1 parent 9a1d509 commit cc6afbc
Show file tree
Hide file tree
Showing 920 changed files with 21 additions and 19 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ module.exports = {
settings: {
'import/resolver': {
'eslint-import-resolver-lerna': {
packages: path.resolve(__dirname, 'packages/manager'),
packages: [
path.resolve(__dirname, 'packages/manager/apps'),
path.resolve(__dirname, 'packages/manager/modules'),
]
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"lerna": "3.4.3",
"packages": [
"packages/manager/*",
"packages/manager/**/app"
"packages/manager/apps/*",
"packages/manager/modules/*"
],
"npmClient": "yarn",
"useWorkspaces": true,
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"description": "OVH Control Panel also known as Manager",
"license": "BSD-3-Clause",
"workspaces": [
"packages/manager/*",
"packages/manager/**/app"
"packages/manager/apps/*",
"packages/manager/modules/*"
],
"scripts": {
"build": "lerna run build --stream",
Expand Down Expand Up @@ -34,7 +34,7 @@
"conventional-recommended-bump": "^4.0.4",
"eslint": "^5.8.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-import-resolver-lerna": "^1.0.0",
"eslint-import-resolver-lerna": "jleveugle/eslint-import-resolver-lerna",
"execa": "^1.0.0",
"find-free-port": "^2.0.0",
"htmlhint": "^0.10.0",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = (env = {}) => {
modules: [
'./node_modules',
path.resolve(__dirname, 'node_modules'),
path.resolve(__dirname, '../../node_modules'),
path.resolve(__dirname, '../../../node_modules'),
],
mainFields: ['module', 'browser', 'main'],
},
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = (env = {}) => {
resolve: {
modules: [
path.resolve(process.cwd(), './node_modules'),
path.resolve(process.cwd(), '../../../../node_modules'),
path.resolve(process.cwd(), '../../../node_modules'),
],
mainFields: ['module', 'browser', 'main'],
},
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = (env = {}) => {
resolve: {
modules: [
path.resolve(process.cwd(), './node_modules'),
path.resolve(process.cwd(), '../../../../node_modules'),
path.resolve(process.cwd(), '../../../node_modules'),
],
mainFields: ['module', 'browser', 'main'],
},
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
"ovh-api-services": "^3.24.0",
"ovh-ui-angular": "^2.21.4"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const config = rollupConfig({
lessTildeImporter: {
paths: [
path.resolve(__dirname, 'node_modules'),
path.resolve(__dirname, '../../../node_modules'),
path.resolve(__dirname, '../../../../node_modules'),
],
},
});
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import rollupConfig from '@ovh-ux/component-rollup-config';
import path from 'path';
import rollupConfig from '@ovh-ux/component-rollup-config';

const config = rollupConfig({
input: 'src/index.js',
}, {
lessTildeImporter: {
paths: [
path.resolve(__dirname, 'node_modules'),
path.resolve(__dirname, '../../../node_modules'),
path.resolve(__dirname, '../../../../node_modules'),
],
},
});
Expand Down
File renamed without changes.
Loading

0 comments on commit cc6afbc

Please sign in to comment.