Skip to content

Commit e53bdf5

Browse files
committed
Update makefiles
1 parent 1259d5c commit e53bdf5

File tree

8 files changed

+14
-23
lines changed

8 files changed

+14
-23
lines changed

.eslintignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/artifacts/
2-
/dist/
32
/node_modules/
43
/website/

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
uses: actions/upload-artifact@v2
2525
with:
2626
name: dist
27-
path: dist
27+
path: artifacts/dist

.github/workflows/publish-package.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
uses: actions/upload-artifact@v2
3131
with:
3232
name: dist
33-
path: dist
33+
path: artifacts/dist

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/.makefiles/
22
/artifacts/
3-
/dist/
43
/node_modules/
54
/yarn-error.log
65
/yarn.lock

.size-limit.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module.exports = [
22
{
3-
path: 'dist/index.js',
3+
path: 'artifacts/dist/index.js',
44
limit: '100 B',
55
},
66
{
7-
path: 'dist/index.es.js',
7+
path: 'artifacts/dist/index.es.js',
88
limit: '100 B',
99
},
1010
]

Makefile

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
JS_SOURCE_FILES += $(shell find src -type f -iname "*.ts" 2> /dev/null)
2-
_JS_TEST_ASSETS := $(shell find test -type f -not -iname "*.ts" 2> /dev/null)
3-
4-
JS_SIZE_LIMIT_REQ += dist
1+
JS_SIZE_LIMIT_REQ += artifacts/dist
52

63
################################################################################
74

@@ -20,7 +17,7 @@ website-%:
2017

2118
################################################################################
2219

23-
dist: rollup.config.js tsconfig.json node_modules $(JS_SOURCE_FILES)
20+
artifacts/dist: rollup.config.js tsconfig.json node_modules $(JS_SOURCE_FILES)
2421
node_modules/.bin/rollup --config rollup.config.js
2522

2623
@touch "$@"

package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818
"publishConfig": {
1919
"access": "public"
2020
},
21-
"main": "dist/index.js",
22-
"module": "dist/index.es.js",
23-
"typings": "dist/index.d.ts",
21+
"main": "artifacts/dist/index.js",
22+
"module": "artifacts/dist/index.es.js",
23+
"typings": "artifacts/dist/index.d.ts",
2424
"exports": {
25-
"import": "./dist/index.es.js",
26-
"require": "./dist/index.js"
25+
"import": "./artifacts/dist/index.es.js",
26+
"require": "./artifacts/dist/index.js"
2727
},
2828
"sideEffects": false,
2929
"files": [
30-
"/dist/"
30+
"/artifacts/dist/"
3131
],
3232
"engines": {
3333
"node": ">=14"
3434
},
3535
"scripts": {
3636
"prepublishOnly": "rollup --config rollup.config.js",
3737
"size-limit-build": "rollup --config rollup.config.js",
38-
"size-limit-clean": "rm -rf dist"
38+
"size-limit-clean": "rm -rf artifacts/dist"
3939
},
4040
"devDependencies": {
4141
"@size-limit/preset-small-lib": "^5.0.3",

website/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
SOURCE_FILES += $(shell find src -type f 2> /dev/null)
2-
3-
################################################################################
4-
51
-include .makefiles/Makefile
62
-include .makefiles/pkg/js/v1/Makefile
73
-include .makefiles/pkg/js/v1/with-yarn.mk
@@ -26,7 +22,7 @@ ci:: artifacts/docusaurus/build
2622

2723
################################################################################
2824

29-
artifacts/docusaurus/build: node_modules $(SOURCE_FILES) $(JS_SOURCE_FILES)
25+
artifacts/docusaurus/build: node_modules $(wildcard *.js) $(shell PATH="$(PATH)" git-find static) $(JS_SOURCE_FILES)
3026
@rm -rf "$@"
3127
@mkdir -p "$@"
3228

0 commit comments

Comments
 (0)