Skip to content

Commit

Permalink
fix: merge and node
Browse files Browse the repository at this point in the history
  • Loading branch information
glitchgirl committed Feb 20, 2024
2 parents ac317a8 + 8a08491 commit 01a76b1
Show file tree
Hide file tree
Showing 577 changed files with 2,902 additions and 40,320 deletions.
1 change: 0 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"updateInternalDependencies": "patch",
"ignore": [
"@phase2/outline-core-accordion",
"@phase2/outline-core-alert",
"@phase2/outline-core-breadcrumb",
"@phase2/outline-core-card",
"@phase2/outline-core-container",
Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ storybook-static/
.yarn/
project/
*.d.ts
packages/tools/outline-cli/
packages/deprecated
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
{
"argsIgnorePattern": "^_"
}
]
],
"lit-plugin/no-invalid-css": "off"
},
"overrides": [
{
Expand Down
65 changes: 30 additions & 35 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,19 @@ jobs:
setup:
name: Install & Lint Codebase
runs-on: ubuntu-latest
container:
image: node:lts
# The steps for the setup job.
steps:
# @see https://github.com/marketplace/actions/checkout
- name: Checkout Codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use local Yarn version
run: echo "$(pwd)/.yarn/releases" >> $GITHUB_PATH

# @see https://github.com/marketplace/actions/setup-node-js-environment
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand All @@ -54,31 +59,11 @@ jobs:
registry-url: 'https://npm.pkg.github.com'
# Defaults to the user or organization that owns the workflow file
scope: '@phase2'

- name: Initialize .npmrc
run: cp $NPM_CONFIG_USERCONFIG .npmrc

# # @see https://github.com/marketplace/actions/cache
# # node_modules caching is validated by always running yarn install.
# # Turborepo cache lives inside node_modules/.cache/turbo
# - name: Get yarn cache directory path
# id: yarn-cache-dir-path
# run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

# - name: Setup Cache
# id: cache-yarn
# uses: actions/cache@v3
# env:
# cache-name: cache-node-modules
# with:
# path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
# key: ${{ runner.os }}-node-yarn-18-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
# restore-keys:
# ${{ runner.os }}-node-yarn-18-${{ env.cache-name }}-
# ${{ runner.os }}-node-yarn-${{ env.cache-name }}-
# ${{ runner.os }}-node-yarn-

- name: Install
- name: Install Dependencies
run: yarn install
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_GITHUB_PACKAGES }}
Expand All @@ -92,15 +77,20 @@ jobs:
build_outline:
name: Build Outline Codebase
runs-on: ubuntu-latest
container:
image: node:lts
needs: ['setup']
# The steps for the setup job.
steps:
# @see https://github.com/marketplace/actions/checkout
- name: Checkout Codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use local Yarn version
run: echo "$(pwd)/.yarn/releases" >> $GITHUB_PATH

# @see https://github.com/marketplace/actions/setup-node-js-environment
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand All @@ -114,11 +104,11 @@ jobs:
# Defaults to the user or organization that owns the workflow file
scope: '@phase2'

- name: Install
- name: Install Dependencies
run: yarn install

- name: Build Turborepo Packages
run: yarn build
- name: Build Packages
run: yarn build --force

- name: Build Storybook
run: yarn storybook:build
Expand All @@ -128,16 +118,21 @@ jobs:
name: "Publish: GitHub Pages"
if: github.ref == 'refs/heads/next'
runs-on: ubuntu-latest
container:
image: node:lts
needs: ['setup', 'build_outline']

# The steps for the setup job.
steps:
# @see https://github.com/marketplace/actions/checkout
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use local Yarn version
run: echo "$(pwd)/.yarn/releases" >> $GITHUB_PATH

# @see https://github.com/marketplace/actions/setup-node-js-environment
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand All @@ -150,11 +145,11 @@ jobs:
registry-url: 'https://npm.pkg.github.com'
# Defaults to the user or organization that owns the workflow file
scope: '@phase2'

- name: Install
- name: Install Dependencies
run: yarn install

- name: Build Outline
- name: Build Packages
run: yarn build

- name: Build Storybook
Expand All @@ -180,7 +175,7 @@ jobs:

# @see https://github.com/marketplace/actions/upload-a-build-artifact
- name: Upload Storybook artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: storybook-latest
path: storybook-static/
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ node_modules/
mutagen.yml.lock
www/
.turbo
.turbo-cookie

# Outline specific
custom-elements.json
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
changeset/
dist/
www/
dev/
Expand Down Expand Up @@ -31,3 +32,4 @@ outline.theme.css

# Ignore all stories (Storybook) files:
**/*.stories.ts
storybook.main.css
21 changes: 6 additions & 15 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,16 @@ import { dirname, join } from 'path';
module.exports = {
stories: [
// Intentionally ordering welcome page first.
'../packages/documentation/outline-docs/src/guides/welcome.mdx',
'../packages/documentation/outline-docs/src/guides/welcome/00-welcome.mdx',
'../packages/documentation/outline-docs/src/guides/welcome/more-information/*.mdx',
// Tooling usage guides.
'../packages/documentation/outline-docs/src/guides/development/tooling/**/*.mdx',
// Component development guides.
'../packages/documentation/outline-docs/src/guides/development/component-development/**/*.mdx',
// Component usage guides.
'../packages/documentation/outline-docs/src/guides/consumers/**/*.mdx',
// QA/UAT usage guides.
'../packages/documentation/outline-docs/src/guides/qa-uat/**/*.mdx',
// Tooling usage guides.
'../packages/documentation/outline-docs/src/guides/tooling/**/*.mdx',
// Documentation stories.
'../packages/documentation/outline-docs/src/guides/**/*.@(js|ts|mdx)',
// Modern component stories.
'../packages/**/docs/*.mdx',
// Old component stories.
'../packages/documentation/outline-storybook/stories/**/*.stories.@(js|ts|mdx)',
],
typescript: {
check: false,
Expand All @@ -32,18 +27,14 @@ module.exports = {
storyStoreV7: true,
postcss: true,
buildStoriesJson: true,
modernInlineRender: true,
modernInlineRender: false,
},
framework: {
name: getAbsolutePath('@storybook/web-components-vite'),
name: '@storybook/web-components-vite',
options: {},
},
docs: {
autodocs: true,
defaultName: 'Documentation', // set to change the name of generated docs entries
},
};

function getAbsolutePath(value) {
return dirname(require.resolve(join(value, 'package.json')));
}
6 changes: 2 additions & 4 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ export const parameters = {
options: {
storySort: {
order: [
'Getting Started',
'Documentation',
'Design Tokens',
'Welcome Guide',
'Coding Guide',
'Media',
'Navigation',
'Content',
'Templates',
'Pages',
'Code Examples',
'Utility Components',
],
},
Expand Down
4 changes: 1 addition & 3 deletions .storybook/storybook.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url('https://rsms.me/inter/inter.css');
/* Outline */
@import '../packages/outline-templates/default/outline.theme.css';
/* Global Tailwind Utilities */
@import '../packages/outline-templates/default/tailwind.css';
@import '../outline.theme.css';
5 changes: 0 additions & 5 deletions .yarnrc

This file was deleted.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-1.22.19.cjs
32 changes: 0 additions & 32 deletions docs/README.md

This file was deleted.

7 changes: 5 additions & 2 deletions lefthook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ pre-commit:
parallel: true
commands:
eslint:
glob: '*.{js,ts,jsx,tsx,mdx,cjs,mjs}'
run: yarn eslint {staged_files}
run: yarn lint:eslint
# tsc:
# run: yarn lint:tsc
prettier:
run: yarn lint:prettier
Loading

0 comments on commit 01a76b1

Please sign in to comment.