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
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ jobs:
test/e2e/plugin-project/node_modules
packages/webpack-plugin/node_modules
packages/core/node_modules
packages/store/node_modules
packages/pinia/node_modules
packages/fetch/node_modules
packages/utils/node_modules
packages/api-proxy/node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
restore-keys: |
Expand Down
10 changes: 8 additions & 2 deletions test/e2e/miniprogram-project/copyWebpackPlugin.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
echo "start copy webpackPlugin"

rm -rf ./node_modules/@mpxjs/webpack-plugin/lib
rm -rf ./node_modules/@mpxjs/webpack-plugin/lib ./node_modules/@mpxjs/utils/src ./node_modules/@mpxjs/store/src ./node_modules/@mpxjs/pinia/src ./node_modules/@mpxjs/core/src ./node_modules/@mpxjs/fetch/src ./node_modules/@mpxjs/api-proxy/src

scp -r ../../../packages/webpack-plugin/lib/ ./node_modules/@mpxjs/webpack-plugin/lib/
cp -r ../../../packages/webpack-plugin/lib/ ./node_modules/@mpxjs/webpack-plugin/lib/
cp -r ../../../packages/utils/src/ ./node_modules/@mpxjs/utils/src/
cp -r ../../../packages/store/src/ ./node_modules/@mpxjs/store/src/
cp -r ../../../packages/pinia/src/ ./node_modules/@mpxjs/pinia/src/
cp -r ../../../packages/core/src/ ./node_modules/@mpxjs/core/src/
cp -r ../../../packages/fetch/src/ ./node_modules/@mpxjs/fetch/src/
cp -r ../../../packages/api-proxy/src/ ./node_modules/@mpxjs/api-proxy/src/

echo "end copy webpackPlugin"
11 changes: 8 additions & 3 deletions test/e2e/miniprogram-project/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,14 @@
"author": "xuegan <[email protected]>",
"license": "ISC",
"dependencies": {
"@mpxjs/api-proxy": "^2.7.1",
"vue": "^2.6.10",
"vue-i18n": "^8.15.3",
"@mpxjs/core": "^2.7.2"
"@mpxjs/api-proxy": "^2.8.0",
"@mpxjs/core": "^2.8.0",
"@mpxjs/fetch": "^2.8.0",
"@mpxjs/pinia": "^2.8.0",
"@mpxjs/store": "^2.8.0",
"@mpxjs/utils": "^2.8.0"
},
"browserslist": [
"ios >= 9",
Expand All @@ -39,7 +43,8 @@
"@babel/runtime-corejs3": "^7.10.4",
"@mpxjs/miniprogram-simulate": "1.4.9",
"@mpxjs/mpx-jest": "0.0.16",
"@mpxjs/webpack-plugin": "^2.7.2",
"@mpxjs/babel-plugin-inject-page-events": "^2.8.0",
"@mpxjs/webpack-plugin": "^2.8.0",
"@typescript-eslint/eslint-plugin": "^5.2.0",
"@typescript-eslint/parser": "^5.2.0",
"babel-eslint": "^10.0.1",
Expand Down
10 changes: 8 additions & 2 deletions test/e2e/miniprogram-wxss-loader/copyWebpackPlugin.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
echo "start copy webpackPlugin"

rm -rf ./node_modules/@mpxjs/webpack-plugin/lib
rm -rf ./node_modules/@mpxjs/webpack-plugin/lib ./node_modules/@mpxjs/utils/src ./node_modules/@mpxjs/store/src ./node_modules/@mpxjs/pinia/src ./node_modules/@mpxjs/core/src ./node_modules/@mpxjs/fetch/src ./node_modules/@mpxjs/api-proxy/src

scp -r ../../../packages/webpack-plugin/lib/ ./node_modules/@mpxjs/webpack-plugin/lib/
Copy link
Collaborator

Choose a reason for hiding this comment

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

抽一个公用文件啊,为啥要到处维护?

cp -r ../../../packages/webpack-plugin/lib/ ./node_modules/@mpxjs/webpack-plugin/lib/
cp -r ../../../packages/utils/src/ ./node_modules/@mpxjs/utils/src/
cp -r ../../../packages/store/src/ ./node_modules/@mpxjs/store/src/
cp -r ../../../packages/pinia/src/ ./node_modules/@mpxjs/pinia/src/
cp -r ../../../packages/core/src/ ./node_modules/@mpxjs/core/src/
cp -r ../../../packages/fetch/src/ ./node_modules/@mpxjs/fetch/src/
cp -r ../../../packages/api-proxy/src/ ./node_modules/@mpxjs/api-proxy/src/

echo "end copy webpackPlugin"
12 changes: 8 additions & 4 deletions test/e2e/miniprogram-wxss-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@
"author": "octoberluobin <[email protected]>",
"license": "ISC",
"dependencies": {
"@mpxjs/api-proxy": "^2.7.1",
"@mpxjs/core": "^2.7.2",
"vue": "^2.6.10",
"vue-i18n": "^8.15.3"
"vue-i18n": "^8.15.3",
"@mpxjs/api-proxy": "^2.8.0",
"@mpxjs/core": "^2.8.0",
"@mpxjs/fetch": "^2.8.0",
"@mpxjs/pinia": "^2.8.0",
"@mpxjs/store": "^2.8.0",
"@mpxjs/utils": "^2.8.0"
},
"browserslist": [
"ios >= 9",
Expand All @@ -41,7 +45,7 @@
"@babel/runtime-corejs3": "^7.10.4",
"@mpxjs/miniprogram-simulate": "1.4.9",
"@mpxjs/mpx-jest": "0.0.16",
"@mpxjs/webpack-plugin": "^2.7.55",
"@mpxjs/webpack-plugin": "^2.8.0",
"@typescript-eslint/eslint-plugin": "^5.2.0",
"@typescript-eslint/parser": "^5.2.0",
"babel-eslint": "^10.0.1",
Expand Down
10 changes: 8 additions & 2 deletions test/e2e/plugin-project/copyWebpackPlugin.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
echo "start copy webpackPlugin"

rm -rf ./node_modules/@mpxjs/webpack-plugin/lib
rm -rf ./node_modules/@mpxjs/webpack-plugin/lib ./node_modules/@mpxjs/utils/src ./node_modules/@mpxjs/store/src ./node_modules/@mpxjs/pinia/src ./node_modules/@mpxjs/core/src ./node_modules/@mpxjs/fetch/src ./node_modules/@mpxjs/api-proxy/src

scp -r ../../../packages/webpack-plugin/lib/ ./node_modules/@mpxjs/webpack-plugin/lib/
cp -r ../../../packages/webpack-plugin/lib/ ./node_modules/@mpxjs/webpack-plugin/lib/
cp -r ../../../packages/utils/src/ ./node_modules/@mpxjs/utils/src/
cp -r ../../../packages/store/src/ ./node_modules/@mpxjs/store/src/
cp -r ../../../packages/pinia/src/ ./node_modules/@mpxjs/pinia/src/
cp -r ../../../packages/core/src/ ./node_modules/@mpxjs/core/src/
cp -r ../../../packages/fetch/src/ ./node_modules/@mpxjs/fetch/src/
cp -r ../../../packages/api-proxy/src/ ./node_modules/@mpxjs/api-proxy/src/

echo "end copy webpackPlugin"
10 changes: 7 additions & 3 deletions test/e2e/plugin-project/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@
"author": "xuegan <[email protected]>",
"license": "ISC",
"dependencies": {
"@mpxjs/api-proxy": "^2.7.1",
"vue": "^2.6.10",
"vue-i18n": "^8.15.3",
"@mpxjs/core": "^2.7.2"
"@mpxjs/api-proxy": "^2.8.0",
"@mpxjs/core": "^2.8.0",
"@mpxjs/fetch": "^2.8.0",
"@mpxjs/pinia": "^2.8.0",
"@mpxjs/store": "^2.8.0",
"@mpxjs/utils": "^2.8.0"
},
"browserslist": [
"ios >= 9",
Expand All @@ -40,7 +44,7 @@
"@babel/runtime-corejs3": "^7.10.4",
"@mpxjs/miniprogram-simulate": "1.4.9",
"@mpxjs/mpx-jest": "0.0.16",
"@mpxjs/webpack-plugin": "^2.7.2",
"@mpxjs/webpack-plugin": "^2.8.0",
"@typescript-eslint/eslint-plugin": "^5.2.0",
"@typescript-eslint/parser": "^5.2.0",
"autoprefixer": "^6.3.1",
Expand Down