Skip to content

Commit 55feb89

Browse files
committed
changed tests to use a production build rather than source
1 parent 8bfaff0 commit 55feb89

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ docs
55
matter-doc-theme
66
build/matter-dev.js
77
build/matter-dev.min.js
8+
build/matter.dev.js
9+
build/matter.dev.min.js
810
demo/js/lib/matter-dev.js
911
demo/js/Examples.min.js
1012
examples/build

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
"serve": "webpack-dev-server --no-cache --mode development --config webpack.demo.config.js",
4545
"watch": "nodemon --watch webpack.demo.config.js --exec \"npm run serve\"",
4646
"build": "webpack --mode=production --no-hot --no-watch & webpack --mode=production --no-hot --no-watch --env.MINIMIZE",
47-
"build-alpha": "webpack --mode=production --env.ALPHA & webpack --mode=production --env.MINIMIZE --env.ALPHA",
47+
"build-alpha": "webpack --mode=production --no-hot --no-watch --env.KIND=alpha & webpack --mode=production --no-hot --no-watch --env.MINIMIZE --env.KIND=alpha",
48+
"build-dev": "webpack --mode=production --no-hot --no-watch --env.KIND=dev & webpack --mode=production --no-hot --no-watch --env.MINIMIZE --env.KIND=dev",
4849
"build-demo": "rm -rf ./demo/js && webpack --no-hot --no-watch --config webpack.demo.config.js --mode=production && webpack --no-hot --no-watch --config webpack.demo.config.js --mode=production --env.MINIMIZE",
4950
"lint": "eslint 'src/**/*.js' 'demo/src/**/*.js' 'examples/*.js' 'webpack.*.js'",
5051
"doc": "yuidoc --config yuidoc.json --project-version $npm_package_version",
@@ -53,7 +54,7 @@
5354
"test-all": "jest --no-cache",
5455
"test-save": "SAVE=true npm run test-node",
5556
"test-watch": "npm run test-node -- --watch",
56-
"test-node": "node --expose-gc node_modules/.bin/jest --no-cache --runInBand ./test/Examples.spec.js",
57+
"test-node": "npm run build-dev && node --expose-gc node_modules/.bin/jest --no-cache --runInBand ./test/Examples.spec.js",
5758
"test-browser": "node --expose-gc node_modules/.bin/jest --no-cache --runInBand ./test/Browser.spec.js",
5859
"changelog": "conventional-changelog -i CHANGELOG.md -s -r",
5960
"release": "npm version --no-git-tag-version",

test/ExampleWorker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const reset = M => {
2121

2222
const mock = require('mock-require');
2323
const { engineCapture } = require('./TestTools');
24-
const MatterDev = stubBrowserFeatures(require('../src/module/main'));
24+
const MatterDev = stubBrowserFeatures(require('../build/matter.dev'));
2525
const MatterBuild = stubBrowserFeatures(require('../build/matter'));
2626
const Example = require('../examples/index');
2727

test/TestTools.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ const logReport = (captures, version) => {
224224
}
225225
}
226226

227-
return `Output logs from ${color(version, colors.Yellow)} version on last run\n\n`
227+
return `Output logs from ${color(version, colors.Yellow)} build on last run\n\n`
228228
+ (report ? report : ' None\n');
229229
};
230230

webpack.config.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@ const execSync = require('child_process').execSync;
99

1010
module.exports = (env = {}) => {
1111
const minimize = env.MINIMIZE || false;
12-
const alpha = env.ALPHA || false;
12+
const kind = env.KIND || null;
1313
const sizeThreshold = minimize ? 100 * 1024 : 512 * 1024;
1414

1515
const commitHash = execSync('git rev-parse --short HEAD').toString().trim();
16-
const version = !alpha ? pkg.version : `${pkg.version}-alpha+${commitHash}`;
16+
const version = !kind ? pkg.version : `${pkg.version}-${kind}+${commitHash}`;
1717
const license = fs.readFileSync('LICENSE', 'utf8');
1818
const resolve = relativePath => path.resolve(__dirname, relativePath);
1919

20-
const alphaInfo = 'Experimental pre-release build.\n ';
2120
const banner =
2221
`${pkg.name} ${version} by @liabru
23-
${alpha ? alphaInfo : ''}${pkg.homepage}
22+
${kind ? 'Experimental pre-release build.\n ' : ''}${pkg.homepage}
2423
License ${pkg.license}${!minimize ? '\n\n' + license : ''}`;
2524

2625
return {
@@ -32,7 +31,7 @@ License ${pkg.license}${!minimize ? '\n\n' + license : ''}`;
3231
umdNamedDefine: true,
3332
globalObject: 'this',
3433
path: resolve('./build'),
35-
filename: `[name]${alpha ? '.alpha' : ''}${minimize ? '.min' : ''}.js`
34+
filename: `[name]${kind ? '.' + kind : ''}${minimize ? '.min' : ''}.js`
3635
},
3736
optimization: { minimize },
3837
performance: {

0 commit comments

Comments
 (0)