Skip to content

Commit

Permalink
Revert "Remove yarn"
Browse files Browse the repository at this point in the history
This reverts commit 602c1ed.
  • Loading branch information
lancepioch committed May 11, 2024
1 parent b18ebee commit b32f896
Show file tree
Hide file tree
Showing 6 changed files with 9,671 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
cache: "yarn"

- name: Install dependencies
run: npm install
run: yarn install --frozen-lockfile

- name: Build
run: npm build:production
run: yarn build:production
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ node_modules
_ide_helper.php
_ide_helper_models.php
.phpstorm.meta.php
.yarn
public/assets/manifest.json

# For local development with docker
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine
WORKDIR /app
COPY . ./
RUN npm install --frozen-lockfile \
&& npm run build:production
RUN yarn install --frozen-lockfile \
&& yarn run build:production

# Stage 1:
# Build the actual container with all of the needed PHP dependencies that will run the application.
Expand Down
2 changes: 1 addition & 1 deletion app/Exceptions/Solutions/ManifestDoesNotExistSolution.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public function getSolutionTitle(): string

public function getSolutionDescription(): string
{
return 'Run npm run build:production to build the frontend first.';
return 'Run yarn run build:production to build the frontend first.';
}

public function getDocumentationLinks(): array
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,17 @@
"webpack-assets-manifest": "^3.1.1",
"webpack-bundle-analyzer": "^3.8.0",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0"
"webpack-dev-server": "^3.11.0",
"yarn-deduplicate": "^1.1.1"
},
"scripts": {
"clean": "cd public/assets && find . \\( -name \"*.js\" -o -name \"*.map\" \\) -type f -delete",
"test": "jest",
"lint": "eslint ./resources/scripts/**/*.{ts,tsx} --ext .ts,.tsx",
"watch": "cross-env NODE_ENV=development ./node_modules/.bin/webpack --watch --progress",
"build": "cross-env NODE_ENV=development ./node_modules/.bin/webpack --progress",
"build:production": "npm run clean && cross-env NODE_ENV=production ./node_modules/.bin/webpack --mode production"
"build:production": "yarn run clean && cross-env NODE_ENV=production ./node_modules/.bin/webpack --mode production",
"serve": "yarn run clean && cross-env WEBPACK_PUBLIC_PATH=/webpack@hmr/ NODE_ENV=development webpack-dev-server --host 0.0.0.0 --port 8080 --public https://panel.test --hot"
},
"browserslist": [
"> 0.5%",
Expand Down
Loading

0 comments on commit b32f896

Please sign in to comment.