Skip to content

Commit

Permalink
fix(loader): support octet-stream jsonp content (#499)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhoushaw committed May 31, 2022
1 parent 3854817 commit 47d5c62
Show file tree
Hide file tree
Showing 73 changed files with 6,929 additions and 3,547 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [16.10.0]
node-version: [16.14.0]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
- name: install dependency
run: pnpm install --filter=\!garfish-docs --filter=\!@garfish-dev/\*
- name: Run unit tests
run: pnpm run test
run: pnpm run test:coverage
- name: Collect coverage
uses: codecov/codecov-action@v2
with:
Expand All @@ -54,7 +54,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [16.10.0]
node-version: [16.14.0]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/documentation.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [16.10.0]
node-version: [16.14.0]
steps:
- uses: actions/checkout@v2
with:
Expand Down
1 change: 0 additions & 1 deletion .npmrc
@@ -1,2 +1 @@
registry=https://registry.npmjs.org
auto-install-peers=true
8 changes: 0 additions & 8 deletions .pnpmfile.cjs
Expand Up @@ -11,14 +11,6 @@ function readPackage(pkg, context) {
context.log('vue => vue@2 in dependencies of vue-template-compiler');
}

if (pkg.name === 'swiper') {
pkg.dependencies = {
...pkg.dependencies,
react: '^17',
'react-dom': '^17',
}
context.log('swiper => swiper in dependencies of react^17');
}
return pkg;
}

Expand Down
22 changes: 11 additions & 11 deletions dev/app-angular/package.json
Expand Up @@ -2,16 +2,16 @@
"name": "@garfish-dev/angular",
"private": true,
"dependencies": {
"@angular/animations": "^13.1.1",
"@angular/common": "^13.1.1",
"@angular/animations": "13.2.4",
"@angular/common": "13.2.4",
"@angular/core": "13.2.4",
"@angular/forms": "^13.1.1",
"@angular/platform-browser": "^13.1.1",
"@angular/platform-browser-dynamic": "^13.1.1",
"@angular/router": "^13.1.1",
"rxjs": "^6.6.7",
"tslib": "^2.3.1",
"zone.js": "^0.10.3"
"@angular/forms": "13.2.4",
"@angular/platform-browser": "13.2.4",
"@angular/platform-browser-dynamic": "13.2.4",
"@angular/router": "13.2.4",
"rxjs": "6.6.7",
"tslib": "2.3.1",
"zone.js": "0.10.3"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^13.0.0",
Expand All @@ -24,13 +24,13 @@
"@types/node": "^12.20.36",
"codelyzer": "^6.0.2",
"html-webpack-plugin": "^5.3.1",
"jasmine-core": "^3.6.0",
"jasmine-core": "3.6.0",
"jasmine-spec-reporter": "^5.0.2",
"karma": "^5.0.9",
"karma-chrome-launcher": "^3.1.0",
"karma-coverage-istanbul-reporter": "^3.0.3",
"karma-jasmine": "^4.0.1",
"karma-jasmine-html-reporter": "^1.7.0",
"karma-jasmine-html-reporter": "1.7.0",
"protractor": "^7.0.0",
"ts-node": "^8.3.0",
"tslint": "^6.1.3",
Expand Down
2 changes: 1 addition & 1 deletion dev/app-esm/package.json
Expand Up @@ -2,7 +2,7 @@
"name": "@garfish-dev/esm",
"private": true,
"scripts": {
"start": "http-server ./src --cors -p 2999",
"start": "http-server ./src --cors -p 8099",
"build": "cp -r src/. dist"
},
"publishConfig": {
Expand Down
9 changes: 1 addition & 8 deletions dev/app-react-16/package.json
Expand Up @@ -61,13 +61,6 @@
},
"scripts": {
"start": "cross-env NODE_ENV=development webpack-dev-server --hot",
"build": "wireit"
},
"wireit": {
"build": {
"command": "cross-env NODE_ENV=production webpack --progress",
"files": ["src/**/*", "tsconfig.json","../../packages/bridge/dist/**/*","webpack.config.js"],
"output": ["dist/**"]
}
"build": "cross-env NODE_ENV=production webpack --progress"
}
}
11 changes: 2 additions & 9 deletions dev/app-react-17/package.json
Expand Up @@ -51,7 +51,7 @@
"webpack": "^5.35.0",
"webpack-cli": "^4.6.0",
"webpack-dev-server": "^4.2.1",
"@uiw/react-md-editor": "^3.9.3",
"@uiw/react-md-editor": "3.9.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
"react-refresh": "^0.11.0"
},
Expand All @@ -62,13 +62,6 @@
},
"scripts": {
"start": "cross-env NODE_ENV=development webpack-dev-server --hot",
"build": "wireit"
},
"wireit": {
"build": {
"command": "cross-env NODE_ENV=production webpack --progress",
"files": ["src/**/*", "tsconfig.json","../../packages/bridge/dist/**/*","webpack.config.js"],
"output": ["dist/**"]
}
"build": "cross-env NODE_ENV=production webpack --progress"
}
}
2 changes: 1 addition & 1 deletion dev/app-react-17/webpack.config.js
Expand Up @@ -34,7 +34,7 @@ const webpackConfig = {
// },
node: false, // 避免 global 逃逸
resolve: {
extensions: ['.tsx', '.ts', '.js', '.json']
extensions: ['.tsx', '.ts', '.js', '.json'],
},
module: {
rules: [
Expand Down
11 changes: 2 additions & 9 deletions dev/app-react-18/package.json
Expand Up @@ -51,19 +51,12 @@
"webpack": "^5.35.0",
"webpack-cli": "^4.6.0",
"webpack-dev-server": "^4.2.1",
"@uiw/react-md-editor": "^3.9.3",
"@uiw/react-md-editor": "3.9.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
"react-refresh": "^0.11.0"
},
"scripts": {
"start": "cross-env NODE_ENV=development webpack-dev-server --hot",
"build": "wireit"
},
"wireit": {
"build": {
"command": "cross-env NODE_ENV=production webpack --progress",
"files": ["src/**/*", "tsconfig.json","../../packages/bridge/dist/**/*","webpack.config.js"],
"output": ["dist/**"]
}
"build": "cross-env NODE_ENV=production webpack --progress"
}
}
9 changes: 1 addition & 8 deletions dev/app-vue-2/package.json
Expand Up @@ -46,14 +46,7 @@
],
"scripts": {
"start": "vue-cli-service serve",
"build": "wireit",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"wireit": {
"build": {
"command": "vue-cli-service build",
"files": ["src/**/*", "tsconfig.json","../../tsconfig.json","../../tsup.config.ts","../../packages/bridge-vue-v2/src/**/*","../../packages/bridge/src/**/*"],
"output": ["dist/**"]
}
}
}
37 changes: 15 additions & 22 deletions dev/app-vue-3/package.json
Expand Up @@ -3,23 +3,23 @@
"private": true,
"dependencies": {
"@garfish/bridge-vue-v3": "workspace:*",
"core-js": "^3.6.5",
"mobx-vue": "^2.1.0",
"vue": "^3.2.21",
"vue-router": "^4.0.12",
"vuex": "^3.6.2",
"core-js": "3.21.1",
"mobx-vue": "2.2.0",
"vue": "3.2.31",
"vue-router": "4.0.12",
"vuex": "3.6.2",
"@garfish/remote-module": "workspace:*",
"sass-loader": "^10"
"sass-loader": "10.2.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/compiler-sfc": "^3.0.0",
"babel-eslint": "^10.1.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^7.0.0",
"url-loader": "^4.1.1"
"@vue/cli-plugin-babel": "4.5.15",
"@vue/cli-plugin-eslint": "4.5.15",
"@vue/cli-service": "4.5.15",
"@vue/compiler-sfc": "3.2.31",
"babel-eslint": "10.1.0",
"eslint": "6.8.0",
"eslint-plugin-vue": "7.20.0",
"url-loader": "4.1.1"
},
"eslintConfig": {
"root": true,
Expand All @@ -42,14 +42,7 @@
],
"scripts": {
"start": "vue-cli-service serve",
"build": "wireit",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"wireit": {
"build": {
"command": "vue-cli-service build",
"files": ["src/**/*", "tsconfig.json","../../tsconfig.json","../../tsup.config.ts","../../packages/bridge-vue-v3/src/**/*","../../packages/bridge/src/**/*"],
"output": ["dist/**"]
}
}
}
11 changes: 2 additions & 9 deletions dev/app-vue-vite/package.json
Expand Up @@ -2,7 +2,7 @@
"name": "@garfish-dev/vite",
"private": true,
"dependencies": {
"vue": "^3.2.23",
"vue": "3.2.31",
"@garfish/bridge-vue-v3": "workspace:*"
},
"devDependencies": {
Expand All @@ -11,14 +11,7 @@
},
"scripts": {
"start": "vite",
"build": "wireit",
"build": "rimraf dist && vite build",
"preview": "vite preview"
},
"wireit": {
"build": {
"command": "vite build",
"files": ["src/**/*","../../tsconfig.json","../../tsup.config.ts","../../packages/bridge-vue-v2/src/**/*","../../packages/bridge/src/**/*"],
"output": ["dist/**"]
}
}
}
2 changes: 1 addition & 1 deletion dev/app-vue-vite/vite.config.ts
Expand Up @@ -12,7 +12,7 @@ export default ({ mode }) => {
};

return defineConfig({
base: process.env.VITE_APP_BASE,
base: `http://localhost:${port}`,
server: {
port,
cors: true,
Expand Down
9 changes: 1 addition & 8 deletions dev/app-vue/package.json
Expand Up @@ -50,14 +50,7 @@
],
"scripts": {
"start": "vue-cli-service serve",
"build": "wireit",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"wireit": {
"build": {
"command": "vue-cli-service build",
"files": ["src/**/*", "tsconfig.json","../../tsconfig.json","../../tsup.config.ts","../../packages/bridge-vue-v2/src/**/*","../../packages/bridge/src/**/*"],
"output": ["dist/**"]
}
}
}
4 changes: 4 additions & 0 deletions dev/config.json
Expand Up @@ -34,5 +34,9 @@
"dev/angular": {
"pkgName": "@garfish-dev/angular",
"port": 8097
},
"dev/esm": {
"pkgName": "@garfish-dev/esm",
"port": 8099
}
}

1 comment on commit 47d5c62

@vercel
Copy link

@vercel vercel bot commented on 47d5c62 May 31, 2022

Choose a reason for hiding this comment

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

Please sign in to comment.