mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge pull request #5361 from MetaMask/firefox-fixes
Mozilla addon linter + Firefox builds passing
This commit is contained in:
commit
667470c07a
@ -39,6 +39,10 @@ workflows:
|
|||||||
- test-unit:
|
- test-unit:
|
||||||
requires:
|
requires:
|
||||||
- prep-deps-npm
|
- prep-deps-npm
|
||||||
|
- test-mozilla-lint:
|
||||||
|
requires:
|
||||||
|
- prep-deps-npm
|
||||||
|
- prep-build
|
||||||
- test-integration-mascara-chrome:
|
- test-integration-mascara-chrome:
|
||||||
requires:
|
requires:
|
||||||
- prep-deps-npm
|
- prep-deps-npm
|
||||||
@ -59,6 +63,7 @@ workflows:
|
|||||||
requires:
|
requires:
|
||||||
- test-lint
|
- test-lint
|
||||||
- test-unit
|
- test-unit
|
||||||
|
- test-mozilla-lint
|
||||||
- test-e2e-chrome
|
- test-e2e-chrome
|
||||||
- test-e2e-firefox
|
- test-e2e-firefox
|
||||||
- test-e2e-beta-chrome
|
- test-e2e-beta-chrome
|
||||||
@ -313,6 +318,16 @@ jobs:
|
|||||||
- run:
|
- run:
|
||||||
name: test:coverage
|
name: test:coverage
|
||||||
command: npm run test:coverage
|
command: npm run test:coverage
|
||||||
|
test-mozilla-lint:
|
||||||
|
docker:
|
||||||
|
- image: circleci/node:8.11.3-browsers
|
||||||
|
steps:
|
||||||
|
- checkout
|
||||||
|
- attach_workspace:
|
||||||
|
at: .
|
||||||
|
- run:
|
||||||
|
name: test:mozilla-lint
|
||||||
|
command: npm run mozilla-lint
|
||||||
|
|
||||||
test-integration-flat-firefox:
|
test-integration-flat-firefox:
|
||||||
docker:
|
docker:
|
||||||
|
10
gulpfile.js
10
gulpfile.js
@ -229,11 +229,12 @@ function createScssBuildTask ({ src, dest, devMode, pattern }) {
|
|||||||
await endOfStream(stream)
|
await endOfStream(stream)
|
||||||
livereload.changed(event.path)
|
livereload.changed(event.path)
|
||||||
})
|
})
|
||||||
|
return buildScssWithSourceMaps()
|
||||||
}
|
}
|
||||||
return buildScss()
|
return buildScss()
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildScss () {
|
function buildScssWithSourceMaps () {
|
||||||
return gulp.src(src)
|
return gulp.src(src)
|
||||||
.pipe(sourcemaps.init())
|
.pipe(sourcemaps.init())
|
||||||
.pipe(sass().on('error', sass.logError))
|
.pipe(sass().on('error', sass.logError))
|
||||||
@ -241,6 +242,13 @@ function createScssBuildTask ({ src, dest, devMode, pattern }) {
|
|||||||
.pipe(autoprefixer())
|
.pipe(autoprefixer())
|
||||||
.pipe(gulp.dest(dest))
|
.pipe(gulp.dest(dest))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function buildScss () {
|
||||||
|
return gulp.src(src)
|
||||||
|
.pipe(sass().on('error', sass.logError))
|
||||||
|
.pipe(autoprefixer())
|
||||||
|
.pipe(gulp.dest(dest))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
gulp.task('lint-scss', function () {
|
gulp.task('lint-scss', function () {
|
||||||
|
2715
package-lock.json
generated
2715
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -41,6 +41,7 @@
|
|||||||
"sentry:publish": "node ./development/sentry-publish.js",
|
"sentry:publish": "node ./development/sentry-publish.js",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"lint:fix": "eslint . --fix",
|
"lint:fix": "eslint . --fix",
|
||||||
|
"mozilla-lint": "addons-linter dist/firefox",
|
||||||
"ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
|
"ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
|
||||||
"mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
|
"mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
|
||||||
"watch": "mocha watch --recursive \"test/unit/**/*.js\"",
|
"watch": "mocha watch --recursive \"test/unit/**/*.js\"",
|
||||||
@ -230,6 +231,7 @@
|
|||||||
"@storybook/addon-info": "^3.4.2",
|
"@storybook/addon-info": "^3.4.2",
|
||||||
"@storybook/addon-knobs": "^3.4.2",
|
"@storybook/addon-knobs": "^3.4.2",
|
||||||
"@storybook/react": "^3.4.2",
|
"@storybook/react": "^3.4.2",
|
||||||
|
"addons-linter": "^1.3.4",
|
||||||
"babel-core": "^6.24.1",
|
"babel-core": "^6.24.1",
|
||||||
"babel-eslint": "^8.0.0",
|
"babel-eslint": "^8.0.0",
|
||||||
"babel-plugin-transform-async-to-generator": "^6.24.1",
|
"babel-plugin-transform-async-to-generator": "^6.24.1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user