Skip to content

Commit 646e8e3

Browse files
committed
Merge branch 'feature/vite' into develop
2 parents 9e90678 + 0f49803 commit 646e8e3

File tree

87 files changed

+1232
-16937
lines changed

Some content is hidden

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

87 files changed

+1232
-16937
lines changed

buildchain/.eslintrc

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

buildchain/.stylelintrc.json

Lines changed: 0 additions & 14 deletions
This file was deleted.
File renamed without changes.

Makefile renamed to buildchain/Makefile

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
TAG?=14-alpine
2-
CONTAINER?=$(shell basename $(CURDIR))-buildchain
2+
CONTAINER?=$(shell basename $(dir $(CURDIR)))-buildchain
33
DOCKERRUN=docker container run \
44
--name ${CONTAINER} \
55
--rm \
66
-t \
77
--network plugindev_default \
8-
-p 8080:8080 \
9-
-v `pwd`:/app \
8+
-p 3001:3001 \
9+
-v `pwd`/../:/app \
1010
${CONTAINER}:${TAG}
11-
DOCSDEST?=../../sites/nystudio107/web/docs/transcoder
1211

13-
.PHONY: build dev docker docs install npm
12+
.PHONY: build dev docker install npm
1413

1514
build: docker install
1615
${DOCKERRUN} \
@@ -24,23 +23,9 @@ docker:
2423
-t ${CONTAINER}:${TAG} \
2524
--build-arg TAG=${TAG} \
2625
--no-cache
27-
docs: docker
28-
${DOCKERRUN} \
29-
run docs
30-
rm -rf ${DOCSDEST}
31-
mv ./docs/docs/.vuepress/dist ${DOCSDEST}
3226
install: docker
3327
${DOCKERRUN} \
3428
install
35-
update: docker
36-
rm -f buildchain/package-lock.json
37-
${DOCKERRUN} \
38-
install
39-
update-clean: docker
40-
rm -f buildchain/package-lock.json
41-
rm -rf buildchain/node_modules/
42-
${DOCKERRUN} \
43-
install
4429
npm: docker
4530
${DOCKERRUN} \
4631
$(filter-out $@,$(MAKECMDGOALS))

buildchain/dist/assets/app.12ac0918.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

buildchain/dist/assets/app.12ac0918.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

buildchain/dist/assets/dynamic-import-polyfill.09faaa08.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

buildchain/dist/assets/dynamic-import-polyfill.09faaa08.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

buildchain/dist/assets/vendor.f30ede7f.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)