-
Notifications
You must be signed in to change notification settings - Fork 376
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
Blackgan3
wants to merge
15
commits into
master
Choose a base branch
from
fix-e2e-bug
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
f0586e5
修复miniprogram project test 相关配置
Blackgan3 9b84a08
fix:修复e2e相关配置
Blackgan3 d75a6e6
feat:调整copyPlugin脚本
Blackgan3 b8dc0cd
调整testyml 脚本
Blackgan3 4de328a
fix: 调整验证copyPlugin.sh脚本中的copy packages 文件夹逻辑，对packages中
Blackgan3 f79fac3
Merge branch 'master' into fix-e2e-bug
Blackgan3 272be0a
fix: 调整e2e测试脚本
Blackgan3 77635d1
fix: change package.json content
Blackgan3 6b89a8d
fix: some fix
Blackgan3 c7f17e8
test delete cache dir
Blackgan3 de178ad
fix: update package.json
Blackgan3 23e22b9
fix: change
Blackgan3 524a5eb
fix: change
Blackgan3 5e603cd
fix:change
Blackgan3 0487ddf
feat: convert cache action
Blackgan3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| echo "start copy webpackPlugin" | ||
|
|
||
| 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 | ||
|
|
||
|
|
||
| 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" | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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", | ||
|
|
@@ -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", | ||
|
|
@@ -37,11 +41,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.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", | ||
| "async": "^3.2.4", | ||
| "babel-eslint": "^10.0.1", | ||
| "babel-jest": "^25.3.0", | ||
| "babel-loader": "^8.1.0", | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,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", | ||
|
|
@@ -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", | ||
|
|
@@ -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", | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
| "watch:prod": "node ./build/build.js -w -p", | ||
| "build": "node ./build/build.js -p", | ||
| "build:dev": "node ./build/build.js", | ||
| "copyPlugin": "sh ./copyWebpackPlugin.sh", | ||
| "copyPlugin": "sh ../copyWebpackPlugin.sh", | ||
| "watch:cross": "npm run watch --modes=wx,ali,web", | ||
| "build:cross": "npm run build --modes=wx,ali,web", | ||
| "watch:web:serve": "npx npm-run-all --parallel watch:web serve", | ||
|
|
@@ -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", | ||
|
|
@@ -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", | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
写个逻辑吧packages下面的所有包都copy了吧