Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update e2e dependencies resource #1155

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ jobs:
node_modules
test/e2e/miniprogram-project/node_modules
test/e2e/plugin-project/node_modules
packages/webpack-plugin/node_modules
packages/core/node_modules
packages/api-proxy/node_modules

key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
Expand All @@ -36,7 +34,7 @@ jobs:

- name: install deps
if: steps.cache.outputs.cache-hit != 'true'
run: npm i && npm i --prefix test/e2e/miniprogram-project && npm i --prefix test/e2e/plugin-project && npx lerna bootstrap --no-ci
run: npm i && npm i --prefix test/e2e/miniprogram-project && npm i --prefix test/e2e/plugin-project && npx lerna bootstrap --no-ci

- name: copy-webpack-plugin
run: npm run copyPlugin --prefix test/e2e/miniprogram-project && npm run copyPlugin --prefix test/e2e/plugin-project
Expand Down
7 changes: 7 additions & 0 deletions test/e2e/copyWebpackPlugin.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
echo "start copy webpackPlugin"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

写个逻辑吧packages下面的所有包都copy了吧


cp -r ../../../packages/* ./node_modules/@mpxjs/

rm -rf ./node_modules/@mpxjs/webpack-plugin/node_modules/webpack

echo "end copy webpackPlugin"
7 changes: 0 additions & 7 deletions test/e2e/miniprogram-project/copyWebpackPlugin.sh

This file was deleted.

9 changes: 6 additions & 3 deletions test/e2e/miniprogram-project/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"build:dev": "node ./build/build.js",
"watch:cross": "npm run watch --modes=wx,ali,web",
"build:cross": "npm run build --modes=wx,ali,tt,swan",
"copyPlugin": "sh ./copyWebpackPlugin.sh",
"copyPlugin": "sh ../copyWebpackPlugin.sh",
"watch:web:serve": "npx npm-run-all --parallel watch:web serve",
"watch:web": "npm run watch --mode=web",
"serve": "npx http-server dist/web",
Expand All @@ -25,6 +25,7 @@
"dependencies": {
"@mpxjs/api-proxy": "^2.7.1",
"@mpxjs/core": "^2.9.1",
"@mpxjs/store": "^2.9.9",
"@mpxjs/utils": "^2.9.1",
"semver": "^7.5.4",
"vue": "^2.6.10",
Expand All @@ -39,11 +40,13 @@
"@babel/plugin-transform-runtime": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"@babel/runtime-corejs3": "^7.10.4",
"@mpxjs/babel-plugin-inject-page-events": "^2.8.0",
"@mpxjs/miniprogram-simulate": "1.4.9",
"@mpxjs/mpx-jest": "0.0.27",
"@mpxjs/webpack-plugin": "^2.7.2",
"@mpxjs/webpack-plugin": "^2.9.21",
"@typescript-eslint/eslint-plugin": "^5.2.0",
"@typescript-eslint/parser": "^5.2.0",
"async": "^3.2.4",
"babel-eslint": "^10.0.1",
"babel-jest": "^25.3.0",
"babel-loader": "^8.1.0",
Expand Down Expand Up @@ -82,7 +85,7 @@
"vue-router": "^3.1.3",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.10",
"webpack": "^5.48.0",
"webpack": "^5.75.0",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.9.2",
"webpack-merge": "^5.8.0"
Expand Down
9 changes: 0 additions & 9 deletions test/e2e/miniprogram-wxss-loader/.editorconfig

This file was deleted.

8 changes: 0 additions & 8 deletions test/e2e/miniprogram-wxss-loader/.gitignore

This file was deleted.

71 changes: 0 additions & 71 deletions test/e2e/miniprogram-wxss-loader/README.md

This file was deleted.

33 changes: 0 additions & 33 deletions test/e2e/miniprogram-wxss-loader/babel.config.json

This file was deleted.

142 changes: 0 additions & 142 deletions test/e2e/miniprogram-wxss-loader/build/build.js

This file was deleted.

Loading
Loading