diff --git a/.drone.yml b/.drone.yml index fdef536..e0ff725 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,12 +3,12 @@ name: default steps: - name: build - image: cupcakearmy/pnpm + image: node:12-alpine pull: always commands: - node -v - - pnpm --shamefully-flatten i - - pnpm run build:prod + - yarn + - yarn run build - name: deploy image: cupcakearmy/drone-deploy @@ -22,7 +22,7 @@ steps: port: 1312 target: /srv/web/home sources: - - ./public + - ./dist - ./docker-compose.prod.yml - ./nginx.conf commands: diff --git a/.gitignore b/.gitignore index 43c88e0..d211d6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ node_modules package-lock.json +yarn.lock public +.cache +dist .idea .vscode \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e81a62e..85c54f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,4 +8,4 @@ services: - 3000:80 volumes: - ./nginx.conf:/usr/local/nginx/conf/sites/default.conf:ro - - ./public:/srv:ro \ No newline at end of file + - ./dist:/srv:ro \ No newline at end of file diff --git a/package.json b/package.json index 5170239..42f43bb 100755 --- a/package.json +++ b/package.json @@ -1,35 +1,22 @@ { "private": true, "scripts": { - "build:dev": "webpack -d", - "build:dev:watch": "webpack -d -w", - "build:prod": "webpack -p", - "build:prod:watch": "webpack -p -w", - "dev": "webpack-dev-server -d" + "build": "parcel build ./src/index.html", + "dev": "parcel ./src/index.html" }, "dependencies": { - "animejs": "~3", - "react": "~16", - "react-dom": "~16", - "react-router-dom": "~5" + "animejs": "3.x", + "parcel-bundler": "1.x", + "react": "16.12.x", + "react-dom": "16.12.x", + "react-router-dom": "5.x" }, "devDependencies": { - "@types/animejs": "3", - "@types/react": "~16", - "@types/react-dom": "~16", - "@types/react-router-dom": "~4", - "awesome-typescript-loader": "~5", - "copy-webpack-plugin": "~5", - "css-loader": "~3", - "file-loader": "~4", - "html-webpack-plugin": "~3", - "mini-css-extract-plugin": "~0", - "style-loader": "~1", - "stylus": "~0", - "stylus-loader": "~3", - "typescript": "~3", - "webpack": "~4", - "webpack-cli": "~3", - "webpack-dev-server": "~3" + "@types/animejs": "3.x", + "@types/react": "16.9.x", + "@types/react-dom": "16.9.x", + "@types/react-router-dom": "5.x", + "stylus": "0.54.x", + "typescript": "3.7.x" } -} +} \ No newline at end of file diff --git a/src/Assets/site.webmanifest b/src/Assets/site.webmanifest index 8d243e0..38cf3f1 100644 --- a/src/Assets/site.webmanifest +++ b/src/Assets/site.webmanifest @@ -3,12 +3,12 @@ "short_name": "nicco.io", "icons": [ { - "src": "/android-chrome-192x192.png", + "src": "./android-chrome-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/android-chrome-512x512.png", + "src": "./android-chrome-512x512.png", "sizes": "512x512", "type": "image/png" } @@ -16,4 +16,4 @@ "theme_color": "#16b4e9", "background_color": "#16b4e9", "display": "standalone" -} +} \ No newline at end of file diff --git a/src/index.html b/src/index.html index cc5cb78..98448f5 100755 --- a/src/index.html +++ b/src/index.html @@ -7,18 +7,19 @@ - - - - - + + + + +
- + +