Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
b667bc9
v3 makefile and other publish changes
LFDanLu Sep 17, 2019
aefdaba
adding lerna filter options so build step doesn't break
LFDanLu Sep 17, 2019
66f5199
temp npmrc file change for local testing
LFDanLu Sep 17, 2019
76e8393
Adding spectrum icons to lerna json
LFDanLu Sep 17, 2019
924ed4f
updating more things for local lerna testing
LFDanLu Sep 17, 2019
6b5351b
changin lerna version to hardcoded 3.0.0
LFDanLu Sep 17, 2019
c53cc57
Merge branch 'rm-v2' of https://github.com/adobe/react-spectrum-v3 in…
LFDanLu Sep 17, 2019
2d3cbe9
modifying well package.json for test run
LFDanLu Sep 17, 2019
a1eb112
chore(release): publish
LFDanLu Sep 17, 2019
aa792b0
adding index.ts file to well root
LFDanLu Sep 17, 2019
630990c
first batch of modified package.jsons for testing
LFDanLu Sep 18, 2019
f317b40
Revert "chore(release): publish"
LFDanLu Sep 18, 2019
2adc2f5
chore(release): publish
LFDanLu Sep 18, 2019
16598e5
adding files section to spectrum icon ui
LFDanLu Sep 18, 2019
8899eb9
changing lerna version to minor for testing
LFDanLu Sep 18, 2019
de22cf4
Revert "chore(release): publish"
LFDanLu Sep 18, 2019
9e70042
fixing well index.ts
LFDanLu Sep 18, 2019
8c525fc
testing first time publish
LFDanLu Sep 18, 2019
827e352
making react-aria/utils public
LFDanLu Sep 18, 2019
9e293ed
modifying babel command to also run on js files in src
LFDanLu Sep 18, 2019
ae6f384
chore(release): publish
LFDanLu Sep 18, 2019
cbeebc6
modifiying spectrum-icons ui package main
LFDanLu Sep 18, 2019
7cf17ff
Revert "chore(release): publish"
LFDanLu Sep 18, 2019
71df3f7
Modifying the rest of the alpha 1 components package.jsons
LFDanLu Sep 18, 2019
eece4c9
Modifying babel call to also copy files
LFDanLu Sep 18, 2019
3873a85
more package json modification for dependencies
LFDanLu Sep 18, 2019
2910925
Forgot to unprivate stately utils
LFDanLu Sep 18, 2019
eb58ace
more dependecy package json modification
LFDanLu Sep 19, 2019
8efa395
more dependecy package json changes
LFDanLu Sep 19, 2019
ec95343
so many dep package json changes
LFDanLu Sep 19, 2019
2fe3d35
fixing spinbutton package json
LFDanLu Sep 19, 2019
caba014
buncha hacks to make css work?
LFDanLu Sep 19, 2019
fe7684f
adding postcss dev dep to spectrum-css
LFDanLu Sep 19, 2019
16fe654
Adding icons package npmignore
LFDanLu Sep 20, 2019
55ddfea
Updating storybook 3 webpack config for new postcss config location
LFDanLu Sep 20, 2019
8b7ac7a
doing version upgrade test runs
LFDanLu Sep 20, 2019
cea1994
cleaning up lint/tsc issues
LFDanLu Sep 20, 2019
c3c6826
git action deploy workflow
LFDanLu Sep 20, 2019
6eb295a
Merge branch 'rm-v2' of https://github.com/adobe/react-spectrum-v3 in…
LFDanLu Sep 21, 2019
c986df1
changing publish branch to next and moving postcss stuff to spectrum-…
LFDanLu Sep 21, 2019
f4fd326
Merge branch 'master' of https://github.com/adobe/react-spectrum-v3 i…
LFDanLu Sep 24, 2019
5a14cc4
Removing instances of localhost from makefile and npmrc
LFDanLu Sep 24, 2019
eb80beb
Modifying plop stuff so that it has the proper source/main fields
LFDanLu Sep 24, 2019
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
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
packages/@spectrum-icons/color/**
packages/@spectrum-icons/ui/**
packages/@spectrum-icons/workflow/**
packages/@adobe/spectrum-css-temp/lib
packages/@adobe/spectrum-css-temp/postcss.config.js
node_modules
37 changes: 37 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Deploy

on:
push:
branches:
- next

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Use Node 12
uses: actions/setup-node@v1
with:
node_version: 12.x
- name: Write npmrc
env:
NPMRC: ${{ secrets.NPMRC }}
run: echo "$NPMRC" > .npmrc
- name: install
run: yarn install
- name: Configure CI Git User
run: |
git remote rm origin
git remote add origin "https://github-actions:[email protected]/adobe/react-spectrum-v3.git"
git fetch
git config --global user.email [email protected]
git config --global user.name GitHub Actions
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: deploy
run: |
git reset --hard
git checkout next
git reset --hard origin/next
make ci
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ storybook-static

#allow
!.storybook-v3/lib
!packages/@adobe/spectrum-css-temp/lib
2 changes: 1 addition & 1 deletion .storybook-v3/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ module.exports = ({config}, env) => {
loader: 'postcss-loader',
options: {
ident: 'postcss',
plugins: require('./postcss')(true)
plugins: require('../packages/@adobe/spectrum-css-temp/postcss.config').plugins
}
}
],
Expand Down
32 changes: 10 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,28 +74,16 @@ ci-deploy:
$(MAKE) deploy; \
fi

# Run this as make version VERSION={patch|minor|major}
version:
lerna version ${VERSION} --yes --no-commit-hooks -m "chore(release): publish"
cp src/package.json dist/package.json

ci-version:
if [ "$$VERSION" != "publish only" ]; then \
$(MAKE) version; \
fi
# for now doesn't have deploy since v3 doesn't have a place for docs and stuff yet
ci:
$(MAKE) publish

publish: build ci-version
lerna publish from-git --yes --registry $(NPM_REGISTRY) --contents dist
publish: build version
lerna publish from-git --yes --registry $(NPM_REGISTRY)

ci-publish:
@if [ "$$VERSION" != "website only" ]; then \
$(MAKE) publish; \
fi
build:
lerna exec --parallel --ignore "@adobe/*" --ignore "@spectrum-icons/*" --no-private 'BUILD_ENV=production NODE_ENV=production babel --root-mode upward src --out-dir dist --extensions .ts,.tsx,.js --no-comments --copy-files'

# Run this on Jenkins with VERSION={patch|minor|major} as an argument, this will bump all the changed packages
# So major bumps everything as major, minor bumps everything as minor, ...
ci:
@if [ ! -z "$$VERSION" ] && [ "$$VERSION" != "noop" ]; then \
$(MAKE) ci-deploy; \
$(MAKE) ci-publish; \
fi
# For first publish go with hard coded 3.0.0. Will eventually replace with conventional commits version bump determination?
version:
lerna version 3.0.0 --no-commit-hooks -m "chore(release): publish" --yes
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"command": {
"publish": {
"allowBranch": [
"master"
"next"
]
}
}
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"jest": "NODE_ICU_DATA=node_modules/full-icu jest",
"copyrights": "babel-node --presets @babel/env ./scripts/addHeaders.js",
"clean:icons": "babel-node --presets @babel/env ./scripts/cleanIcons.js",
"postinstall": "test -n \"$NOYARNPOSTINSTALL\" || ( (yarn wsrun --exclude-missing make-icons || true) && yarn wsrun --exclude-missing build )",
"postinstall": "test -n \"$NOYARNPOSTINSTALL\" || ( (yarn wsrun --exclude-missing make-icons || true) && yarn wsrun --exclude-missing build)",
"plop": "plop",
"chromatic": "CHROMATIC_APP_CODE=qx7a91v30wc chromatic test --build-script-name build-storybook"
},
Expand Down Expand Up @@ -94,6 +94,7 @@
"nyc": "^10.2.0",
"plop": "^2.4.0",
"postcss-calc": "^6.0.0",
"postcss-cli": "^6.1.3",
"postcss-custom-properties": "6.3.1",
"postcss-dir-pseudo-class": "^5.0.0",
"postcss-focus-ring": "^1.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import './index.css';
@import './skin.css';
/* @import './skin.css'; */
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ governing permissions and limitations under the License.
@import '../commons/index.css';
@import 'font.css';

@mixin typography .spectrum-Body1 {}
/* @mixin typography .spectrum-Body1 {}
@mixin typography .spectrum-Body2 {}
@mixin typography .spectrum-Body3 {}
@mixin typography .spectrum-Body4 {}
Expand Down Expand Up @@ -128,7 +128,7 @@ governing permissions and limitations under the License.
}
@mixin typography .spectrum-Code5, body-code-5, true {
font-family: var(--spectrum-body-code-5-text-font-family);
}
} */

/* topdoc
{{ typography/typography.yml }}
Expand All @@ -154,7 +154,7 @@ governing permissions and limitations under the License.
.spectrum-Body--italic {
font-style: var(--spectrum-body-4-emphasis-text-font-style);
}

/*
.spectrum-Body--large {
@extend .spectrum-Body2;
}
Expand Down Expand Up @@ -185,4 +185,4 @@ governing permissions and limitations under the License.

.spectrum-Heading--subtitle3 {
@extend .spectrum-Subheading;
}
} */
File renamed without changes.
9 changes: 7 additions & 2 deletions packages/@adobe/spectrum-css-temp/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"name": "@adobe/spectrum-css-temp",
"private": true,
"version": "3.0.0"
"version": "3.0.0",
"scripts": {
"prepublishOnly": "postcss ./components/**/*.css -d dist --base components && rm -rf components && mv dist components"
},
"devDependencies": {
"postcss-cli": "^6.1.3"
}
}
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
module.exports = function (keepVars = false) {
return [
module.exports = {
plugins: [
require('postcss-import'),
require('postcss-nested'),
require('postcss-inherit'),
require('postcss-logical')(),
require('postcss-dir-pseudo-class')(),
require('postcss-custom-properties')({
noValueNotifications: 'error',
warnings: !keepVars
warnings: false
}),
// require('./lib/postcss-custom-properties-passthrough')(),
require('postcss-calc'),
keepVars ? require('./lib/postcss-custom-properties-mapping') : null,
keepVars ? require('./lib/postcss-notnested')({ replace: '.spectrum' }) : null,
require('./lib/postcss-custom-properties-mapping'),
require('./lib/postcss-notnested')({replace: '.spectrum'}),
require('postcss-svg'),
require('postcss-functions')({
functions: {
noscale: function(value) {
noscale: function (value) {
return value.toString().toUpperCase();
},
percent: function(value) {
percent: function (value) {
return parseInt(value, 10) / 100;
}
}
}),
// require('./lib/postcss-strip-comments')({ preserveTopdoc: false }),
require('postcss-focus-ring'),
require('postcss-focus-ring')
// require('autoprefixer')({
// 'browsers': [
// 'IE >= 10',
Expand All @@ -35,5 +35,5 @@ module.exports = function (keepVars = false) {
// 'last 2 iOS versions'
// ]
// })
].filter(Boolean);
}
]
};
1 change: 1 addition & 0 deletions packages/@react-aria/button/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/index';
7 changes: 5 additions & 2 deletions packages/@react-aria/button/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "@react-aria/button",
"version": "3.0.0",
"private": true,
"main": "src/index.ts",
"main": "dist/index.js",
"source": "src/index.ts",
"files": [
"dist"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/calendar/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/index';
8 changes: 6 additions & 2 deletions packages/@react-aria/calendar/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"name": "@react-aria/calendar",
"version": "3.0.0",
"private": true,
"main": "src/index.ts",
"main": "dist/index.js",
"source": "src/index.ts",
"files": [
"dist",
"intl"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/checkbox/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/index';
7 changes: 5 additions & 2 deletions packages/@react-aria/checkbox/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "@react-aria/checkbox",
"version": "3.0.0",
"private": true,
"main": "src/index.ts",
"main": "dist/index.js",
"source": "src/index.ts",
"files": [
"dist"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/datepicker/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/index';
8 changes: 6 additions & 2 deletions packages/@react-aria/datepicker/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"name": "@react-aria/datepicker",
"version": "3.0.0",
"private": true,
"main": "src/index.ts",
"main": "dist/index.js",
"source": "src/index.ts",
"files": [
"dist",
"intl"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/dialog/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/index';
7 changes: 5 additions & 2 deletions packages/@react-aria/dialog/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "@react-aria/dialog",
"private": true,
"version": "3.0.0",
"main": "src/index.ts",
"main": "dist/index.js",
"source": "src/index.ts",
"files": [
"dist"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/focus/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/index';
7 changes: 5 additions & 2 deletions packages/@react-aria/focus/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "@react-aria/focus",
"version": "3.0.0",
"private": true,
"main": "src/index.ts",
"main": "dist/index.js",
"source": "src/index.ts",
"files": [
"dist"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/i18n/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/index';
7 changes: 5 additions & 2 deletions packages/@react-aria/i18n/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "@react-aria/i18n",
"version": "3.0.0",
"private": true,
"main": "src/index.ts",
"main": "dist/index.js",
"source": "src/index.ts",
"files": [
"dist"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/interactions/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/index';
7 changes: 5 additions & 2 deletions packages/@react-aria/interactions/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "@react-aria/interactions",
"private": true,
"version": "3.0.0",
"main": "src/index.ts",
"main": "dist/index.js",
"source": "src/index.ts",
"files": [
"dist"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/label/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/useLabel';
7 changes: 5 additions & 2 deletions packages/@react-aria/label/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "@react-aria/label",
"version": "3.0.0",
"main": "src/useLabel.ts",
"private": true,
"main": "dist/useLabel.js",
"source": "src/useLabel.ts",
"files": [
"dist"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/live-announcer/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/LiveAnnouncer';
7 changes: 5 additions & 2 deletions packages/@react-aria/live-announcer/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "@react-aria/live-announcer",
"version": "3.0.0",
"private": true,
"main": "src/LiveAnnouncer.tsx",
"main": "dist/LiveAnnouncer.js",
"source": "src/LiveAnnouncer.tsx",
"files": [
"dist"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/@react-aria/overlays/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/index';
7 changes: 5 additions & 2 deletions packages/@react-aria/overlays/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "@react-aria/overlays",
"private": true,
"version": "3.0.0",
"main": "src/index.ts",
"main": "dist/index.js",
"source": "src/index.ts",
"files": [
"dist"
],
"description": "Spectrum UI components in React",
"repository": {
"type": "git",
Expand Down
Loading