Skip to content

Commit 61692a3

Browse files
authored
feat: Replace browserify with webpack 4 (isomorphic-git#142)
1 parent 945af5a commit 61692a3

File tree

11 files changed

+8720
-5820
lines changed

11 files changed

+8720
-5820
lines changed

.babelrc

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
{
2-
"presets": [
3-
["env", {
4-
"targets": {
5-
"node": "current"
6-
}
7-
}]
8-
],
9-
"plugins": ["transform-es2015-modules-commonjs", "transform-object-rest-spread"],
10-
}
2+
"plugins": ["transform-object-rest-spread"],
3+
"env": {
4+
"browser": {
5+
"plugins": [
6+
"transform-async-to-generator"
7+
]
8+
},
9+
"jest": {
10+
"presets": [
11+
["env", {
12+
"targets": {
13+
"node": "current"
14+
},
15+
"debug": true
16+
}]
17+
]
18+
}
19+
}
20+
}

.browserslistrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

__tests__/__helpers__/FixtureFS.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-env node, browser, jasmine */
22
const path = require('path')
3-
const _fs = require('fs')
43
const pify = require('pify')
54
const setTestTimeout = require('./set-test-timeout')
65
setTestTimeout(60000)
@@ -59,6 +58,7 @@ async function makeBrowserFixture (dir) {
5958
}
6059

6160
async function makeNodeFixture (fixture) {
61+
const fs = require('fs')
6262
const {
6363
getFixturePath,
6464
createTempDir,
@@ -71,7 +71,7 @@ async function makeNodeFixture (fixture) {
7171
let gitdir = (await getFixturePath(testsDir, `${fixture}.git`))
7272
? await copyFixtureIntoTempDir(testsDir, `${fixture}.git`)
7373
: await createTempDir()
74-
return { fs: _fs, dir, gitdir }
74+
return { fs, dir, gitdir }
7575
}
7676

7777
module.exports.makeFixture = makeFixture

dist/README.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

karma.conf.js

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// Karma configuration
2+
const path = require('path')
3+
const webpack = require('webpack')
24

35
module.exports = function (config) {
46
const options = {
@@ -9,7 +11,7 @@ module.exports = function (config) {
911
basePath: '',
1012
// frameworks to use
1113
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
12-
frameworks: ['browserify', 'jasmine'],
14+
frameworks: ['jasmine'],
1315
beforeMiddleware: ['git-http-server'],
1416
gitHttpServer: {
1517
root: '__tests__/__fixtures__',
@@ -36,7 +38,7 @@ module.exports = function (config) {
3638
// preprocess matching files before serving them to the browser
3739
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
3840
preprocessors: {
39-
'__tests__/test-*.js': ['browserify']
41+
'__tests__/test-*.js': ['webpack']
4042
},
4143
// web server port
4244
port: 9876,
@@ -70,19 +72,19 @@ module.exports = function (config) {
7072
},
7173
sl_ios_safari: {
7274
base: 'SauceLabs',
73-
deviceName: 'iPhone Simulator',
75+
deviceName: 'iPhone X Simulator',
7476
platformName: 'iOS',
75-
platformVersion: '11.0',
77+
platformVersion: '11.2',
7678
browserName: 'Safari',
77-
appiumVersion: '1.7.1'
79+
appiumVersion: '1.7.2'
7880
},
7981
sl_android_chrome: {
8082
base: 'SauceLabs',
81-
deviceName: 'Android Emulator',
83+
deviceName: 'Android GoogleAPI Emulator',
8284
platformName: 'Android',
83-
platformVersion: '6.0',
85+
platformVersion: '7.1',
8486
browserName: 'Chrome',
85-
appiumVersion: '1.7.1'
87+
appiumVersion: '1.7.2'
8688
},
8789
FirefoxHeadless: {
8890
base: 'Firefox',
@@ -108,6 +110,25 @@ module.exports = function (config) {
108110
// Replace process.env.CI
109111
'envify'
110112
]
113+
},
114+
webpack: {
115+
mode: 'development',
116+
devtool: 'inline-source-map',
117+
plugins: [new webpack.IgnorePlugin(/^(fs|jest-fixtures)$/)],
118+
resolve: {
119+
alias: {
120+
'isomorphic-git/internal-apis': path.resolve(
121+
__dirname,
122+
'dist/internal.umd.min.js'
123+
// 'src/internal-apis.js'
124+
),
125+
'isomorphic-git': path.resolve(
126+
__dirname,
127+
'dist/bundle.umd.min.js'
128+
// 'src/index.js'
129+
)
130+
}
131+
}
111132
}
112133
}
113134

0 commit comments

Comments
 (0)