Skip to content

Commit c91f736

Browse files
authored
Merge pull request #35 from davidjoy/main
Point in time merge: CLI and Header work
2 parents 6d0ae1c + a8bcd7a commit c91f736

201 files changed

Lines changed: 6764 additions & 21775 deletions

File tree

Some content is hidden

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

.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ module.exports = merge(config, {
1010
'.eslintrc.js',
1111
'frontend-base.d.ts',
1212
'coverage',
13-
'example',
14-
'example-plugin-app',
1513
'tools',
1614
'config',
15+
'dist',
1716
],
1817
parserOptions: {
1918
project: path.resolve(__dirname, './tsconfig.json'),

.npmignore

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
1+
__mocks__
12
.eslintignore
2-
.eslintrc.json
3+
./.eslintrc.js
4+
.github
35
.gitignore
4-
.travis.yml
5-
docker-compose.yml
6-
Dockerfile
7-
Makefile
8-
npm-debug.log
9-
6+
*.test.js
7+
*.test.jsx
8+
*.test.ts
9+
*.test.tsx
10+
./babel.config.js
11+
catalog-info.yaml
1012
coverage
13+
docs
14+
./jest.config.js
15+
jsdoc.json
16+
renovate.json
17+
service-interface.png
18+
Makefile
1119
node_modules
12-
public
20+
npm-debug.log
21+
openedx-frontend-base-*.tgz
22+
test-project
23+
.nvmrc

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,18 @@ doc_command = ./node_modules/.bin/documentation build src -g -c ./docs/documenta
1111
cat_docs_command = cat ./docs/_API-header.md ./docs/_API-body.md > ./docs/API.md
1212

1313
build:
14-
rm -rf ./config ./dist
15-
tsc --project tsconfig.build.json
14+
rm -rf ./config ./tools/dist
15+
tsc --project ./tsconfig.json
1616
mkdir -p ./config
1717
cp tools/typescript/tsconfig.json config/tsconfig.json
1818
tsc --project ./tools/tsconfig.json
19-
cp -prf ./tools/dist ./dist
20-
mv ./dist/dist ./dist/tools
2119
cp -prf ./tools/dist/config-helpers ./config/config-helpers
20+
cp -prf ./tools/dist/defaultConfigPaths.js ./config/defaultConfigPaths.js
21+
cp -prf ./tools/dist/types.js ./config/types.js
2222
cp -prf ./tools/dist/eslint ./config/eslint
2323
cp -prf ./tools/dist/jest ./config/jest
2424
cp -prf ./tools/dist/webpack ./config/webpack
25+
cp -prf ./tools/dist/babel ./config/babel
2526
cp -prf ./tools/dist/index.js ./config/index.js
2627

2728
docs-build:

0 commit comments

Comments
 (0)