Skip to content

Commit b3a50b9

Browse files
nmetulevnmetulev
authored
fixed mgt-element exports and updated npm modules (#786)
1 parent e7c3b08 commit b3a50b9

File tree

25 files changed

+68
-164
lines changed

25 files changed

+68
-164
lines changed

‎.storybook/addons/localizeAddon/localizationAddon.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import addons, { makeDecorator } from '@storybook/addons';
2-
import { LocalizationHelper } from '../../../packages/mgt-element/dist/utils/LocalizationHelper';
2+
import { LocalizationHelper } from '../../../packages/mgt-element/dist/es6/utils/LocalizationHelper';
33
import { withKnobs, text, object, select } from '@storybook/addon-knobs';
44
import { STORY_CHANGED, STORY_INIT, FORCE_RE_RENDER } from '@storybook/core-events';
55

‎.storybook/addons/signInAddon/signInAddon.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import addons, { makeDecorator } from '@storybook/addons';
2-
import { Providers } from '../../../packages/mgt-element/dist/providers/Providers';
3-
import { ProviderState } from '../../../packages/mgt-element/dist/providers/IProvider';
2+
import { Providers } from '../../../packages/mgt-element/dist/es6/providers/Providers';
3+
import { ProviderState } from '../../../packages/mgt-element/dist/es6/providers/IProvider';
44
import { MsalProvider } from '../../../packages/providers/mgt-msal-provider/dist/es6/MsalProvider';
5-
import { MockProvider } from '../../../packages/mgt-element/dist/mock/MockProvider';
5+
import { MockProvider } from '../../../packages/mgt-element/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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +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 { MsalProvider } from '../packages/mgt/dist/es6';
14-
import { Providers, LoginType } from '../packages/mgt-element/dist';
13+
import { Providers, LoginType, MsalProvider } from '../packages/mgt/dist/es6';
1514
import { CLIENTID, GETPROVIDER_EVENT, SETPROVIDER_EVENT } from './env';
1615

1716
const PARAM_KEY = 'signInAddon';

‎index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<!-- <script src="./packages/mgt/dist/bundle/mgt-loader.js"></script> -->
1515

1616
<script type="module" src="./packages/mgt/dist/es6/index.js"></script>
17-
<script type="module" src="./packages/mgt-element/dist/mock/mgt-mock-provider.js"></script>
1817
</head>
1918

2019
<body>

‎package.json‎

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,47 +53,60 @@
5353
"@storybook/cli": "^5.3.17",
5454
"@storybook/storybook-deployer": "^2.8.5",
5555
"@storybook/web-components": "^5.3.17",
56-
"lerna": "^3.22.0",
57-
"lit-element": "^2.3.1",
56+
"lerna": "^3.22.1",
57+
"lit-element": "^2.4.0",
5858
"monaco-editor": "^0.19.3",
5959
"monaco-editor-webpack-plugin": "^1.8.2",
6060
"storybook-addon-web-components-knobs": "^0.2.7",
61-
"@babel/core": "^7.9.0",
62-
"@babel/plugin-proposal-class-properties": "^7.8.3",
63-
"@babel/plugin-proposal-decorators": "^7.8.3",
64-
"@babel/plugin-proposal-object-rest-spread": "^7.9.0",
65-
"@babel/preset-env": "^7.9.0",
66-
"@babel/preset-react": "^7.9.4",
67-
"@babel/preset-typescript": "^7.9.0",
61+
"cpx": "^1.5.0",
62+
"@babel/core": "^7.12.8",
63+
"@babel/plugin-proposal-class-properties": "^7.12.1",
64+
"@babel/plugin-proposal-decorators": "^7.12.1",
65+
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
66+
"@babel/preset-env": "^7.12.7",
67+
"@babel/preset-react": "^7.12.7",
68+
"@babel/preset-typescript": "^7.12.7",
6869
"@types/jest": "^24.9.1",
6970
"@types/node": "12.12.22",
70-
"@types/react": "^16.9.32",
71-
"@types/react-dom": "^16.9.6",
72-
"@webcomponents/webcomponentsjs": "^2.4.3",
73-
"babel-loader": "^8.1.0",
74-
"core-js": "^3.6.4",
75-
"es-dev-server": "^1.45.3",
71+
"@types/react": "^17.0.00",
72+
"@types/react-dom": "^17.0.0",
73+
"@webcomponents/webcomponentsjs": "^2.5.0",
74+
"babel-loader": "^8.2.1",
75+
"core-js": "^3.7.0",
76+
"es-dev-server": "^1.57.8",
7677
"gulp": "^4.0.2",
7778
"gulp-append-prepend": "^1.0.8",
78-
"gulp-header-license": "^1.0.9",
79+
"gulp-clean-css": "4.3.0",
80+
"gulp-header-license": "^1.0.10",
7981
"gulp-rename": "^2.0.0",
80-
"gulp-sass": "^4.0.2",
82+
"gulp-sass": "^4.1.0",
8183
"gulp-util": "^3.0.8",
82-
"husky": "^3.1.0",
84+
"husky": "^4.3.0",
8385
"jest": "^24.5.0",
8486
"jest-junit": "^6.3.0",
8587
"npm-run-all": "^4.1.5",
8688
"prettier": "1.17.0",
87-
"regenerator-runtime": "^0.13.5",
88-
"sass": "^1.26.3",
89-
"shx": "^0.3.2",
89+
"regenerator-runtime": "^0.13.7",
90+
"sass": "^1.29.0",
91+
"shx": "^0.3.3",
9092
"ts-jest": "^24.3.0",
91-
"whatwg-fetch": "^3.0.0",
92-
"fs-extra": "^9.0.0",
93-
"react": "^16.13.1",
94-
"react-dom": "^16.13.1",
93+
"whatwg-fetch": "^3.5.0",
94+
"fs-extra": "^9.0.1",
95+
"react": "^17.0.1",
96+
"react-dom": "^17.0.1",
97+
"rollup": "^2.33.3",
98+
"rollup-plugin-babel": "^4.4.0",
99+
"rollup-plugin-babel-minify": "^10.0.0",
100+
"rollup-plugin-commonjs": "^10.1.0",
101+
"rollup-plugin-json": "^4.0.0",
102+
"rollup-plugin-node-resolve": "^5.2.0",
103+
"rollup-plugin-postcss": "^3.1.8",
104+
"rollup-plugin-terser": "^7.0.2",
105+
"rollup-plugin-typescript": "^1.0.1",
95106
"typescript": "^3.7.5",
96-
"web-component-analyzer": "^1.1.6"
107+
"web-component-analyzer": "^1.1.6",
108+
"tslint": "^6.1.3",
109+
"tslint-config-prettier": "^1.18.0"
97110
},
98111
"husky": {
99112
"hooks": {

‎packages/mgt-components/package.json‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,11 @@
3737
"setLicense": "gulp setLicense --cwd ."
3838
},
3939
"dependencies": {
40-
"@microsoft/microsoft-graph-types": "^1.22.0",
40+
"@microsoft/microsoft-graph-types": "^1.27.0",
4141
"@microsoft/microsoft-graph-types-beta": "github:microsoftgraph/msgraph-typescript-typings#beta",
4242
"@microsoft/mgt-element": "*",
4343
"office-ui-fabric-core": "11.0.0"
4444
},
45-
"devDependencies": {
46-
"cpx": "^1.5.0",
47-
"gulp": "^4.0.2",
48-
"gulp-append-prepend": "^1.0.8",
49-
"gulp-header-license": "^1.0.9",
50-
"gulp-rename": "^2.0.0",
51-
"gulp-sass": "^4.0.2",
52-
"gulp-util": "^3.0.8",
53-
"npm-run-all": "^4.1.5",
54-
"shx": "^0.3.2",
55-
"tslint": "^5.20.1",
56-
"tslint-config-prettier": "^1.18.0",
57-
"typescript": "^3.7.5"
58-
},
5945
"publishConfig": {
6046
"directory": "dist"
6147
}

‎packages/mgt-element/package.json‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
},
1313
"author": "Microsoft",
1414
"license": "MIT",
15-
"main": "./dist/index.js",
16-
"types": "./dist/index.d.ts",
17-
"module": "./dist/index.js",
15+
"main": "./dist/es6/index.js",
16+
"types": "./dist/es6/index.d.ts",
17+
"module": "./dist/es6/index.js",
1818
"files": [
1919
"dist",
2020
"src"
@@ -32,21 +32,9 @@
3232
"postpack": "cpx *.tgz ../../artifacts"
3333
},
3434
"dependencies": {
35-
"@microsoft/microsoft-graph-client": "^2.0.0",
35+
"@microsoft/microsoft-graph-client": "^2.1.1",
3636
"lit-element": "^2.4.0",
37-
"idb": "^5.0.6"
38-
},
39-
"devDependencies": {
40-
"cpx": "^1.5.0",
41-
"gulp": "^4.0.2",
42-
"gulp-append-prepend": "^1.0.8",
43-
"gulp-header-license": "^1.0.9",
44-
"gulp-rename": "^2.0.0",
45-
"gulp-sass": "^4.0.2",
46-
"gulp-util": "^3.0.8",
47-
"shx": "^0.3.2",
48-
"tslint": "^5.20.1",
49-
"typescript": "^3.7.5"
37+
"idb": "^5.0.7"
5038
},
5139
"publishConfig": {
5240
"directory": "dist"

‎packages/mgt-element/src/index.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ export * from './IBatch';
99
export * from './IGraph';
1010
export * from './Graph';
1111
export * from './BetaGraph';
12+
1213
export * from './components/baseComponent';
1314
export * from './components/baseProvider';
1415
export * from './components/templatedComponent';
16+
1517
export * from './providers/IProvider';
1618
export * from './providers/Providers';
19+
export * from './providers/SimpleProvider';
20+
1721
export * from './utils/Cache';
1822
export * from './utils/EventDispatcher';
1923
export * from './utils/equals';
@@ -23,5 +27,6 @@ export * from './utils/TemplateContext';
2327
export * from './utils/TemplateHelper';
2428
export * from './utils/GraphPageIterator';
2529
export * from './utils/LocalizationHelper';
30+
2631
export * from './mock/MockProvider';
2732
export * from './mock/mgt-mock-provider';

‎packages/mgt-element/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"outDir": "dist",
4+
"outDir": "dist/es6",
55
"sourceRoot": "src",
66
"rootDir": "src",
77
"composite": true

‎packages/mgt-react/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"dependencies": {
3434
"@microsoft/mgt": "*",
3535
"@microsoft/mgt-element": "*",
36-
"@microsoft/microsoft-graph-types": "^1.12.0",
36+
"@microsoft/microsoft-graph-types": "^1.27.0",
3737
"@microsoft/microsoft-graph-types-beta": "github:microsoftgraph/msgraph-typescript-typings#beta",
3838
"wc-react": "^0.3.1"
3939
},

0 commit comments

Comments
 (0)