Skip to content

Commit 8312a34

Browse files
committed
Merge branch 'master' into component-css-packages
# Conflicts: # package.json # packages/@react-spectrum/icon/package.json # yarn.lock
2 parents 31c9655 + 9f99e53 commit 8312a34

File tree

1,067 files changed

+3479
-92370
lines changed

Some content is hidden

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

1,067 files changed

+3479
-92370
lines changed

.github/actions/comment/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: 'PR Comment'
2+
description: 'Comment on the PR attached to a commit'
3+
runs:
4+
using: 'node12'
5+
main: 'index.js'

.github/actions/comment/index.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
const core = require('@actions/core');
2+
const github = require('@actions/github');
3+
4+
const octokit = new github.GitHub(process.env.GITHUB_TOKEN);
5+
run();
6+
7+
async function run() {
8+
try {
9+
let {data: prs} = await octokit.repos.listPullRequestsAssociatedWithCommit({
10+
...github.context.repo,
11+
commit_sha: github.context.sha
12+
});
13+
14+
if (!prs) {
15+
return;
16+
}
17+
18+
await octokit.issues.createComment({
19+
...github.context.repo,
20+
issue_number: prs[0].number,
21+
body: `Build successful! [View the storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${github.context.sha}/index.html)`
22+
});
23+
} catch (error) {
24+
core.setFailed(error.message);
25+
}
26+
}

.github/workflows/test.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Test
2+
on: [push]
3+
jobs:
4+
build:
5+
runs-on: ubuntu-latest
6+
7+
steps:
8+
- uses: actions/checkout@master
9+
- name: Use Node 12
10+
uses: actions/setup-node@v1
11+
with:
12+
node_version: 12.x
13+
- name: Write npmrc
14+
env:
15+
NPMRC: ${{ secrets.NPMRC }}
16+
run: echo "$NPMRC" > .npmrc
17+
- name: yarn install
18+
run: |
19+
make clean_node_modules
20+
make install_no_postinstall
21+
- name: build
22+
run: |
23+
make clean
24+
make -B
25+
- name: test
26+
run: make ci-test
27+
- name: build storybook
28+
run: make storybook
29+
- name: deploy storybook
30+
env:
31+
AZURE_STORAGE_SAS_TOKEN: ${{ secrets.AZURE_STORAGE_SAS_TOKEN }}
32+
run: |
33+
az storage blob upload-batch -d reactspectrum -s storybook-static --account-name reactspectrum
34+
- name: comment on PR
35+
uses: ./.github/actions/comment
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ dist
1010
.package-lock.json
1111
.cache
1212

13-
documentation/public
14-
documentation/yarn.lock
1513
dist
1614
public
15+
storybook-static
1716

1817

1918
#allow

.npmignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
.editorconfig
44
.nycrc
55
.nyc_output
6-
src
7-
test
8-
stories
96
coverage
107
Makefile
118
yarn.lock

.npmrc

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
@spectrum:registry=https://artifactory.corp.adobe.com:443/artifactory/api/npm/npm-spectrum-release/
2-
//artifactory.corp.adobe.com:443/artifactory/api/npm/npm-spectrum-release/:always-auth=true
3-
4-
@react:registry=https://artifactory.corp.adobe.com:443/artifactory/api/npm/npm-react-release/
5-
//artifactory.corp.adobe.com:443/artifactory/api/npm/npm-react-release/:always-auth=false
6-
7-
@a4u:registry=https://artifactory.corp.adobe.com:443/artifactory/api/npm/npm-a4u-release/
8-
//artifactory.corp.adobe.com:443/artifactory/api/npm/npm-a4u-release/:always-auth=false
9-
10-
@kadira:registry=https://registry.npmjs.org/
11-
//registry.npmjs.org/:always-auth=false
12-
13-
@types:registry=https://registry.npmjs.org/
14-
//registry.npmjs.org/:always-auth=false
1+
registry=https://registry.npmjs.com/
2+
always-auth=false
3+
4+
@react:registry=https://artifactory-uw2.adobeitc.com/artifactory/api/npm/npm-react-release/
5+
//artifactory-uw2.adobeitc.com/artifactory/api/npm/npm-react-release/:always-auth=true
6+
7+
@a4u:registry=https://artifactory-uw2.adobeitc.com/artifactory/api/npm/npm-rsp-tmp-release/
8+
@react-aria:registry=https://artifactory-uw2.adobeitc.com/artifactory/api/npm/npm-rsp-tmp-release/
9+
@react-spectrum:registry=https://artifactory-uw2.adobeitc.com/artifactory/api/npm/npm-rsp-tmp-release/
10+
@react-stately:registry=https://artifactory-uw2.adobeitc.com/artifactory/api/npm/npm-rsp-tmp-release/
11+
@react-types:registry=https://artifactory-uw2.adobeitc.com/artifactory/api/npm/npm-rsp-tmp-release/
12+
@spectrum-icons:registry=https://artifactory-uw2.adobeitc.com/artifactory/api/npm/npm-rsp-tmp-release/
13+
//artifactory-uw2.adobeitc.com/artifactory/api/npm/npm-rsp-tmp-release/:always-auth=true
1514

1615
package-lock=false

.storybook-v2/addons.js

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

.storybook-v2/config.js

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

.storybook-v2/layout.js

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

.storybook-v2/theme.js

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

.storybook-v2/webpack.config.js

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

.storybook-v3/webpack.config.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ const generateScopedName = (localName, resourcePath) => {
2323
};
2424

2525
module.exports = ({config}, env) => {
26-
// Hack to get icons loading in the storybook without copying them over, these need to stay in for as long as we are using V2 components
27-
// in the v3 storybook. only use right now is the Provider selection menus in the top right for scale, theme, etc
28-
config.plugins.push(new webpack.NormalModuleReplacementPlugin(/Icon\/(core\/)?([^\/\.]+)$/, function (resource) {
29-
resource.request = '@react/react-spectrum-icons/dist/' + (/core/.test(resource.request) ? 'core/' : '') + path.basename(resource.request);
30-
}));
31-
config.plugins.push(new webpack.NormalModuleReplacementPlugin(/\.\/js\/Icon/, path.resolve(__dirname + '/../src/Icon/js/Icon.js')));
32-
config.plugins.push(new webpack.NormalModuleReplacementPlugin(/\.\/focus-ring-polyfill/, '@adobe/focus-ring-polyfill'));
33-
3426
if (env === 'PRODUCTION') {
3527
// see https://github.com/storybooks/storybook/issues/1570
3628
config.plugins = config.plugins.filter(plugin => plugin.constructor.name !== 'UglifyJsPlugin')
@@ -69,7 +61,7 @@ module.exports = ({config}, env) => {
6961
set: {
7062
'include css': true
7163
},
72-
use: [require('svg-stylus')(), require('nib')()]
64+
use: [require('svg-stylus')()]
7365
}
7466
}
7567
],

0 commit comments

Comments
 (0)