Skip to content

Commit 4d7d66d

Browse files
authored
Merge pull request #1 from edx/master
Merge from edx/frontend-component-header
2 parents 90df9fe + 14fe2d9 commit 4d7d66d

22 files changed

+9590
-5944
lines changed

.env.development

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ REFRESH_ACCESS_TOKEN_ENDPOINT=http://localhost:18000/login_refresh
1313
SEGMENT_KEY=null
1414
SITE_NAME=Open edX
1515
USER_INFO_COOKIE_NAME=edx-user-info
16+
LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
17+
LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
18+
LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
19+
FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico

.github/workflows/ci.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Default CI
2+
on: [push, pull_request]
3+
jobs:
4+
build:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- name: Checkout
8+
uses: actions/checkout@v2
9+
with:
10+
fetch-depth: 0
11+
- name: Setup Nodejs
12+
uses: actions/setup-node@v1
13+
with:
14+
node-version: 12
15+
- name: Install dependencies
16+
run: npm ci
17+
- name: Validate package-lock.json changes
18+
run: make validate-no-uncommitted-package-lock-changes
19+
- name: Lint
20+
run: npm run lint
21+
- name: Test
22+
run: npm run test
23+
- name: i18n_extract
24+
run: npm run i18n_extract
25+
- name: Coverage
26+
uses: codecov/codecov-action@v1

.github/workflows/release.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Release CI
2+
on:
3+
push:
4+
branches:
5+
- master
6+
jobs:
7+
release:
8+
name: Release
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v2
13+
with:
14+
fetch-depth: 0
15+
- name: Setup Node.js
16+
uses: actions/setup-node@v1
17+
with:
18+
node-version: 12
19+
- name: Install dependencies
20+
run: npm ci
21+
- name: Validate package-lock.json changes
22+
run: make validate-no-uncommitted-package-lock-changes
23+
- name: Lint
24+
run: npm run lint
25+
- name: Test
26+
run: npm run test
27+
- name: i18n_extract
28+
run: npm run i18n_extract
29+
- name: Coverage
30+
uses: codecov/codecov-action@v1
31+
- name: Build
32+
run: npm run build
33+
- name: Release
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
36+
NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
37+
run: npx semantic-release

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ dist
55
node_modules
66
temp
77
src/i18n/transifex_input.json
8+
module.config.js

.travis.yml

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

example/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import React from 'react';
44
import ReactDOM from 'react-dom';
55
import { initialize, getConfig, subscribe, APP_READY } from '@edx/frontend-platform';
66
import { AppContext, AppProvider } from '@edx/frontend-platform/react';
7+
import Header from '@edx/frontend-component-header';
8+
79
import './index.scss';
8-
import Header from '../src/';
910

1011
subscribe(APP_READY, () => {
1112
ReactDOM.render(

example/index.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
@import "~@edx/paragon/scss/core/core.scss";
2-
@import '../src/index.scss';
1+
@import "@edx/brand/paragon/fonts";
2+
@import "@edx/brand/paragon/variables";
3+
@import "@edx/paragon/scss/core/core";
4+
@import "@edx/brand/paragon/overrides";
5+
6+
@import "@edx/frontend-component-header/index";

0 commit comments

Comments
 (0)