Skip to content

Commit 162feb4

Browse files
Integrate Lerna for multipackage repo support (#496)
* Integrated Lerna Co-authored-by: Nikola Metulev <[email protected]>
1 parent db95d6d commit 162feb4

File tree

121 files changed

+28803
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+28803
-120
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ jobs:
2525
with:
2626
node-version: ${{ matrix.node-version }}
2727
- run: npm i
28-
- run: npm pack
28+
- run: npm run prepare
29+
- run: npm run pack
2930
- name: Upload a Build Artifact - package
3031
uses: actions/upload-artifact@v2
3132
with:
3233
name: npm-package
33-
path: microsoft-mgt-*.tgz
34+
path: packages/mgt/microsoft-mgt-*.tgz
3435
- name: Upload a Build Artifact - bundle
3536
uses: actions/upload-artifact@v2
3637
with:
3738
name: bundle
38-
path: dist/bundle
39+
path: packages/mgt/dist/bundle

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ coverage/
3333
*.tgz
3434
testResults/junit.xml
3535

36-
package-lock.json
37-
3836
*-css.ts
3937

4038
# storybook

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*-css.ts
2-
*.md
2+
*.md
3+
**/dist

.storybook/addons/signInAddon/signInAddon.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import addons, { makeDecorator } from '@storybook/addons';
2-
import { Providers } from '../../../dist/es6/Providers';
3-
import { ProviderState } from '../../../dist/es6/providers/IProvider';
4-
import { MsalProvider } from '../../../dist/es6/providers/MsalProvider';
5-
import { MockProvider } from '../../../dist/es6/mock/MockProvider';
2+
import { Providers } from '../../../packages/mgt/dist/es6/Providers';
3+
import { ProviderState } from '../../../packages/mgt/dist/es6/providers/IProvider';
4+
import { MsalProvider } from '../../../packages/mgt/dist/es6/providers/MsalProvider';
5+
import { MockProvider } from '../../../packages/mgt/dist/es6/mock/MockProvider';
66
import { CLIENTID, SETPROVIDER_EVENT, GETPROVIDER_EVENT } from '../../env';
77

88
const _allow_signin = false;

.storybook/manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { addons, types } from '@storybook/addons';
1010
import { STORIES_CONFIGURED, STORY_MISSING } from '@storybook/core-events';
1111
import { AddonPanel } from '@storybook/components';
1212
import { useParameter, useChannel } from '@storybook/api';
13-
import { Providers, MsalProvider, LoginType } from '../dist/commonjs';
13+
import { Providers, MsalProvider, LoginType } from '../packages/mgt/dist/commonjs';
1414
import { CLIENTID, GETPROVIDER_EVENT, SETPROVIDER_EVENT } from './env';
1515

1616
const PARAM_KEY = 'signInAddon';

.storybook/preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { configure, addParameters, setCustomElements } from '@storybook/web-comp
1111
import customElements from '../custom-elements.json';
1212
import '../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js';
1313
import theme from './theme';
14-
import '../dist/es6/components/mgt-login/mgt-login.js';
14+
import '../packages/mgt/dist/es6/components/mgt-login/mgt-login.js';
1515

1616
setCustomElements(customElements);
1717

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Clone the repo and run the following in the terminal/command line/powershell:
3232

3333
```bash
3434
npm install
35+
npm run prepare
36+
npm run build
3537
npm start
3638
```
3739

azure-pipelines.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ steps:
2323
inputs:
2424
verbose: false
2525

26+
- task: Npm@1
27+
displayName: 'npm run prepare'
28+
inputs:
29+
verbose: false
30+
2631
- task: Npm@1
2732
displayName: 'npm run build'
2833
inputs:

launch.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

lerna.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"packages": ["packages/mgt"],
3+
"version": "1.3.0"
4+
}

0 commit comments

Comments
 (0)