Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/main css in main chunk #335

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Bugfix/main css in main chunk #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70be907
Update bootstrap plugin to take css path
KaneFreeman May 14, 2021
915b7c3
Accept null for main css path
KaneFreeman May 14, 2021
5211c1f
Move css outside of promise
KaneFreeman May 14, 2021
b9c0022
Move to top of async
KaneFreeman May 14, 2021
0b122d3
Update unit tests
KaneFreeman May 14, 2021
8801981
Fix unit tests
KaneFreeman May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/bootstrap-plugin/BootstrapPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export interface ShimModules {

export interface BootstrapPluginOptions {
entryPath: string;
cssPath: string | null;
shimModules: ShimModules[];
}

Expand All @@ -18,6 +19,7 @@ const shimModuleRegExp = /@dojo(\/|\\)framework(\/|\\)shim/;
export class BootstrapPlugin {
public flagMap: { [index: string]: boolean };
private _entryPath: string;
private _cssPath: string | null;
private _shimModules: ShimModules[];
private _defineConfiguration: { [index: string]: string } = {
__dojoframeworkshimIntersectionObserver: JSON.stringify('no-bootstrap'),
Expand All @@ -29,8 +31,9 @@ export class BootstrapPlugin {
};

constructor(options: BootstrapPluginOptions) {
const { shimModules, entryPath } = options;
const { shimModules, entryPath, cssPath } = options;
this._entryPath = entryPath;
this._cssPath = cssPath;
this._shimModules = shimModules;
this.flagMap = shimModules.reduce(
(flags, module) => {
Expand All @@ -42,6 +45,7 @@ export class BootstrapPlugin {
} as any
);
this._defineConfiguration.__MAIN_ENTRY = JSON.stringify(this._entryPath);
this._defineConfiguration.__MAIN_CSS_ENTRY = JSON.stringify(this._cssPath);
shimModules.forEach((shimModule) => {
this._defineConfiguration[`__${shimModule.module.replace(/(\/|@)/g, '')}`] = JSON.stringify(
shimModule.has.toLowerCase()
Expand Down
3 changes: 3 additions & 0 deletions src/bootstrap-plugin/async.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

__MAIN_CSS_ENTRY && import(/* webpackChunkName: "main" */ __MAIN_CSS_ENTRY);

var has = require('@dojo/framework/core/has');
var cldrLoader = require('../cldr/bootstrap').default;
require('./common');
Expand Down
161 changes: 161 additions & 0 deletions tests/unit/bootstrap-plugin/BootstrapPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ let normalReplacementStub = stub();

describe('bootstrap-plugin', () => {
beforeEach(() => {
defineStub.reset();
normalReplacementStub.reset();

mockModule = new MockModule('../../../src/bootstrap-plugin/BootstrapPlugin', require);
mockModule.dependencies(['wrapper-webpack-plugin']);

Expand Down Expand Up @@ -48,6 +51,163 @@ describe('bootstrap-plugin', () => {
const BootstrapPlugin = mockModule.getModuleUnderTest().default;
const bootstrapPlugin = new BootstrapPlugin({
entryPath: 'main',
cssPath: null,
shimModules: [
{
module: '@dojo/framework/shim/Foo',
has: 'foo'
},
{
module: '@dojo/framework/shim/Bar',
has: 'bar'
},
{
module: '@dojo/framework/shim/Baz',
has: 'baz'
}
]
});
bootstrapPlugin.apply(compiler);
runner['BootstrapPlugin']({
hooks: {
seal: {
tap: tapStub
}
},
modules: [
{
issuer: {
userRequest: path.normalize('foo/bar')
},
userRequest: path.normalize('foo/bar/@dojo/framework/shim/Foo')
},
{
issuer: {
userRequest: path.normalize('foo/bar/@dojo/webpack-contrib/bootstrap-plugin/async')
},
userRequest: path.normalize('foo/bar/@dojo/framework/shim/Bar')
},
{
issuer: {
userRequest: path.normalize('foo/bar')
},
userRequest: path.normalize('foo/bar/@dojo/framework/core/Bar')
},
{
issuer: {
userRequest: path.normalize('some/other/module')
},
userRequest: path.normalize(`foo/bar?modulePath='foo/bar.block'`)
}
]
});
runner['BootstrapPlugin']();

assert.deepEqual(bootstrapPlugin.flagMap, {
bar: false,
baz: false,
foo: true,
'build-blocks': true,
'no-bootstrap': true
});

assert.isTrue(wrapperStub.ctor.calledOnce);
const header = wrapperStub.ctor.firstCall.args[0].header;

assert.strictEqual(
header(),
`var shimFeatures = {"no-bootstrap":true,"foo":true,"bar":false,"baz":false,"build-blocks":true};
if (window.DojoHasEnvironment && window.DojoHasEnvironment.staticFeatures) {
Object.keys(window.DojoHasEnvironment.staticFeatures).forEach(function (key) {
shimFeatures[key] = window.DojoHasEnvironment.staticFeatures[key];
});
}
window.DojoHasEnvironment = { staticFeatures: shimFeatures };`
);

assert.isTrue(defineStub.calledOnce);
assert.deepEqual(defineStub.firstCall.args[0], {
__MAIN_CSS_ENTRY: 'null',
__MAIN_ENTRY: '"main"',
__dojoframeworkshimIntersectionObserver: '"no-bootstrap"',
__dojoframeworkshimWebAnimations: '"no-bootstrap"',
__dojoframeworkshimResizeObserver: '"no-bootstrap"',
__dojoframeworkshimfetch: '"no-bootstrap"',
__dojoframeworkshiminert: '"no-bootstrap"',
__dojoframeworkshimFoo: '"foo"',
__dojoframeworkshimBar: '"bar"',
__dojoBuildBlocks: '"build-blocks"',
__dojoframeworkshimBaz: '"baz"'
});
const [normalReplacementTest, normalReplaceCallback] = normalReplacementStub.firstCall.args;
const expectedTest = new RegExp('@dojo(/|\\\\)framework(/|\\\\)shim');
assert.strictEqual(normalReplacementTest.toString(), expectedTest.toString());
const bootstrapResource = {
resourceResolveData: {
context: {
issuer: path.normalize('foo/bar/@dojo/webpack-contrib/bootstrap-plugin/async')
}
},
request: path.normalize('foo!bar!@dojo/webpack-contrib/static-build-loader!resource'),
loaders: [
{
loader: 'foo'
},
{
loader: path.normalize('@dojo/webpack-contrib/static-build-loader')
}
]
};
normalReplaceCallback(bootstrapResource);
assert.deepEqual(bootstrapResource, {
resourceResolveData: {
context: { issuer: path.normalize('foo/bar/@dojo/webpack-contrib/bootstrap-plugin/async') }
},
request: 'foo!bar!resource',
loaders: [{ loader: 'foo' }]
});
const nonBootstrapResource = {
resourceResolveData: {
context: {
issuer: path.normalize('foo/bar/other')
}
},
request: path.normalize('foo!bar!@dojo/webpack-contrib/static-build-loader!resource'),
loaders: [
{
loader: 'foo'
},
{
loader: path.normalize('@dojo/webpack-contrib/static-build-loader')
}
]
};
normalReplaceCallback(nonBootstrapResource);
assert.deepEqual(nonBootstrapResource, {
resourceResolveData: {
context: {
issuer: path.normalize('foo/bar/other')
}
},
request: path.normalize('foo!bar!@dojo/webpack-contrib/static-build-loader!resource'),
loaders: [
{
loader: 'foo'
},
{
loader: path.normalize('@dojo/webpack-contrib/static-build-loader')
}
]
});
});

it('bootstrap with css', () => {
const wrapperStub = mockModule.getMock('wrapper-webpack-plugin');
wrapperStub.ctor.returns({ apply: () => {} });
const BootstrapPlugin = mockModule.getModuleUnderTest().default;
const bootstrapPlugin = new BootstrapPlugin({
entryPath: 'main',
cssPath: 'main.css',
shimModules: [
{
module: '@dojo/framework/shim/Foo',
Expand Down Expand Up @@ -123,6 +283,7 @@ window.DojoHasEnvironment = { staticFeatures: shimFeatures };`

assert.isTrue(defineStub.calledOnce);
assert.deepEqual(defineStub.firstCall.args[0], {
__MAIN_CSS_ENTRY: '"main.css"',
__MAIN_ENTRY: '"main"',
__dojoframeworkshimIntersectionObserver: '"no-bootstrap"',
__dojoframeworkshimWebAnimations: '"no-bootstrap"',
Expand Down