Skip to content

Commit 11e72f9

Browse files
Merge branch 'master' into fix-insert-tests
# Conflicts: # package.json # yarn.lock
2 parents aa1c258 + fcb8818 commit 11e72f9

File tree

5 files changed

+711
-546
lines changed

5 files changed

+711
-546
lines changed

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
sudo: false
22
language: node_js
33
node_js:
4-
- stable
4+
- v10
5+
before_script:
6+
- nvm use v8
7+
- yarn --ignore-engines
58
script:
6-
- echo success
9+
- yarn lint
10+
- yarn test
711
after_success:
812
- npm run semantic-release
913
branches:

package.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"test:only": "cross-env NODE_ENV=test jest --updateSnapshot",
5252
"test:watch": "cross-env NODE_ENV=test jest --watch",
5353
"test:coverage": "cross-env NODE_ENV=test jest --collectCoverageFrom=\"src/**/*.js\" --coverage",
54-
"test:manual": "webpack-dev-server test/manual/src/index.js --config test/manual/webpack.config.js",
54+
"test:manual": "npm run build && webpack-dev-server test/manual/src/index.js --open --config test/manual/webpack.config.js",
5555
"pretest": "npm run lint",
5656
"test": "cross-env NODE_ENV=test npm run test:coverage",
5757
"defaults": "webpack-defaults",
@@ -72,44 +72,44 @@
7272
"webpack-sources": "^1.1.0"
7373
},
7474
"devDependencies": {
75-
"@babel/cli": "^7.7.5",
76-
"@babel/core": "^7.7.5",
77-
"@babel/preset-env": "^7.7.6",
78-
"@commitlint/cli": "^8.1.0",
79-
"@commitlint/config-conventional": "^8.1.0",
80-
"@webpack-contrib/defaults": "^5.0.2",
81-
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
82-
"babel-eslint": "^10.0.2",
83-
"babel-jest": "^24.8.0",
75+
"@babel/cli": "7.8.3",
76+
"@babel/core": "7.8.3",
77+
"@babel/preset-env": "7.8.3",
78+
"@commitlint/cli": "8.3.5",
79+
"@commitlint/config-conventional": "8.3.4",
80+
"@webpack-contrib/defaults": "5.1.1",
81+
"@webpack-contrib/eslint-config-webpack": "3.0.0",
82+
"babel-eslint": "10.0.3",
83+
"babel-jest": "24.9.0",
8484
"commitizen": "^4.0.3",
85-
"commitlint-azure-pipelines-cli": "^1.0.2",
86-
"cross-env": "^5.2.0",
87-
"css-loader": "^3.3.2",
85+
"commitlint-azure-pipelines-cli": "1.0.3",
86+
"cross-env": "5.2.1",
87+
"css-loader": "3.4.2",
8888
"cz-conventional-changelog": "^3.0.2",
89-
"del": "^4.1.1",
90-
"del-cli": "^1.1.0",
91-
"es-check": "^5.0.0",
92-
"eslint": "^6.7.2",
93-
"eslint-config-prettier": "^6.0.0",
94-
"eslint-plugin-import": "^2.19.1",
95-
"eslint-plugin-prettier": "^3.1.2",
89+
"del": "4.1.1",
90+
"del-cli": "1.1.0",
91+
"es-check": "5.1.0",
92+
"eslint": "6.8.0",
93+
"eslint-config-prettier": "6.9.0",
94+
"eslint-plugin-import": "2.19.1",
95+
"eslint-plugin-prettier": "3.1.2",
9696
"execa": "^4.0.0",
97-
"file-loader": "^4.0.0",
98-
"husky": "^3.0.0",
99-
"jest": "^24.8.0",
97+
"file-loader": "4.3.0",
98+
"husky": "3.1.0",
99+
"jest": "24.9.0",
100100
"jest-dev-server": "^4.4.0",
101-
"jest-junit": "^10.0.0",
101+
"jest-junit": "10.0.0",
102102
"jest-puppeteer": "^4.4.0",
103-
"lint-staged": "^9.5.0",
104-
"memfs": "^3.0.2",
105-
"npm-run-all": "^4.1.5",
106-
"prerender-loader": "^1.3.0",
107-
"prettier": "^1.19.1",
103+
"lint-staged": "9.5.0",
104+
"memfs": "3.0.3",
105+
"npm-run-all": "4.1.5",
106+
"prerender-loader": "1.3.0",
107+
"prettier": "1.19.1",
108108
"puppeteer": "^2.0.0",
109109
"serve": "^11.3.0",
110-
"standard-version": "^7.0.1",
111-
"webpack": "^4.41.5",
112-
"webpack-cli": "^3.3.6",
113-
"webpack-dev-server": "^3.7.2"
110+
"standard-version": "7.0.1",
111+
"webpack": "4.41.5",
112+
"webpack-cli": "3.3.10",
113+
"webpack-dev-server": "3.10.1"
114114
}
115115
}

renovate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["config:base"]
3+
}

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ class ExtractCssChunksPlugin {
382382
'}',
383383
])
384384
: '',
385-
`var insert = ${insert}; console.log('insert',insert)`,
385+
`var insert = ${insert};`,
386386
`if (typeof insert === 'function') { insert(linkTag); }`,
387387
`else { var target = document.querySelector(${insert}); target && insert === 'body' ? target && target.insertBefore(linkTag,target.firstChild) : target.appendChild(linkTag); } `,
388388
]),

0 commit comments

Comments
 (0)